blender/blender
152
489
Fork 720
Code Issues 6.8k Pull Requests 893 Projects 18 Wiki Activity

GPU: Shader Builder CMake Fixes #115889

Merged
Jeroen Bakker merged 5 commits from Jeroen-Bakker/blender:gpu/shader-builder-cmake into main 2024-01-11 13:42:26 +01:00
Conversation 4 Commits 5 Files Changed 1 +18 -22
Jeroen Bakker commented 2023-12-07 12:24:31 +01:00
Member
Copy Link

This PR cleans up shader builder CMake files and fixes vulkan includes
that could not be found on all platforms.

  • Reduce code duplication
  • Use private var for MANIFEST on windows
  • Add system includes when compiling
This PR cleans up shader builder CMake files and fixes vulkan includes that could not be found on all platforms. * Reduce code duplication * Use private var for MANIFEST on windows * Add system includes when compiling
Jeroen Bakker added this to the 4.1 milestone 2023-12-07 12:24:31 +01:00
Jeroen Bakker added the
Module
Viewport & EEVEE
 label 2023-12-07 12:24:31 +01:00
Jeroen Bakker self-assigned this 2023-12-07 12:24:32 +01:00
Jeroen Bakker added 1 commit 2023-12-07 12:24:42 +01:00 
This PR cleansup shader builder building and fixes vulkan includes
that could not be found on all platforms.

* reduce code duplication
* use private var for MANIFEST on windows
* add system includes when compiling
Jeroen Bakker added 2 commits 2023-12-08 15:59:22 +01:00
Jeroen Bakker requested review from Clément Foucault 2023-12-08 16:03:45 +01:00
Jeroen Bakker requested review from Ray molenkamp 2023-12-08 16:03:52 +01:00
Jeroen Bakker added this to the Viewport & EEVEE project 2023-12-08 16:03:57 +01:00
Clément Foucault commented 2024-01-03 22:23:54 +01:00
Member
Copy Link

Is this still required? The builder seems to work fine now.

Is this still required? The builder seems to work fine now.
Clément Foucault commented 2024-01-03 22:24:15 +01:00
Member
Copy Link

Closed by accident

Closed by accident
Clément Foucault reopened this pull request 2024-01-03 22:24:17 +01:00
Ray molenkamp approved these changes 2024-01-03 22:33:18 +01:00
Ray molenkamp left a comment
Member
Copy Link

LGTM, accepted pending on the bots building this successfully.

Further cleanup can be done as the PUBLIC linking is a little odd, it's an executable, there can logically be no inheritance on this target. PRIVATE would be the correct one to use. which is used for the target_include_directories but not for the target_link_libraries (if this lands as is, fine with me, i'll clean it up in one of my future cmake cleanups)

LGTM, accepted pending on the bots building this successfully. Further cleanup can be done as the `PUBLIC` linking is a little odd, it's an executable, there can logically be no inheritance on this target. `PRIVATE` would be the correct one to use. which is used for the `target_include_directories` but not for the `target_link_libraries` (if this lands as is, fine with me, i'll clean it up in one of my future cmake cleanups)
Jeroen Bakker commented 2024-01-04 09:35:24 +01:00
Author
Member
Copy Link

This patch is still needed. It removes a TODO, and includes some changes Ray proposed to me in another patch and fixes vulkan includes on some systems. I still need to include the changes that Ray proposes in his comment above. Will be done next week.

This patch is still needed. It removes a TODO, and includes some changes Ray proposed to me in another patch and fixes vulkan includes on some systems. I still need to include the changes that Ray proposes in his comment above. Will be done next week.
Jeroen Bakker added 2 commits 2024-01-11 13:06:53 +01:00
Resolved code-review feedback
All checks were successful
buildbot/vexp-code-patch-lint Build done.
Details
buildbot/vexp-code-patch-linux-x86_64 Build done.
Details
buildbot/vexp-code-patch-darwin-arm64 Build done.
Details
buildbot/vexp-code-patch-windows-amd64 Build done.
Details
buildbot/vexp-code-patch-darwin-x86_64 Build done.
Details
buildbot/vexp-code-patch-coordinator Build done.
Details
a8ee20642a
Jeroen Bakker commented 2024-01-11 13:07:18 +01:00
Author
Member
Copy Link

@blender-bot build

@blender-bot build
Jeroen Bakker merged commit 69ac64df54 into main 2024-01-11 13:42:26 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
Clément Foucault
Ray molenkamp
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset System
Asset datablocks, libraries, browser and shelf

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
Backward and forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
Interest
Freestyle

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
ID Management

  
Interest
Images & Movies

  
Interest
Import Export

  
Interest
Line Art

  
Interest
Masking

  
Interest
Metal

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Motion Tracking

  
Interest
Nodes & Physics

  
Interest
OpenGL

  
Interest
Overlay

  
Interest
Overrides

  
Interest
Performance

  
Interest
Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds & Tests

  
Interest
Python API

  
Interest
Render & Cycles

  
Interest
Render Pipeline

  
Interest
Sculpt, Paint & Texture

  
Interest
Text Editor

  
Interest
Translations

  
Interest
Triaging

  
Interest
Undo

  
Interest
USD

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Interest
Video Sequencer

  
Interest
Viewport & EEVEE

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Wayland windowing on Unix

  
Interest
Workbench

  
Interest: X11

Xorg/X11 windowing

  
Legacy
Asset Browser Project

Archived

  
Legacy
Blender 2.8 Project

Archived

  
Legacy
Milestone 1: Basic, Local Asset Browser

Archived

  
Legacy
OpenGL Error

Archived

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Related to security, https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
Module
Grease Pencil

  
Module
Modeling

  
Module
Nodes & Physics

  
Module
Pipeline, Assets & IO

  
Module
Platforms, Builds & Tests

  
Module
Python API

  
Module
Render & Cycles

  
Module
Sculpt, Paint & Texture

  
Module
Triaging

  
Module
User Interface

  
Module
VFX & Video

  
Module
Viewport & EEVEE

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Severity
High

  
Severity
Low

  
Severity
Normal

  
Severity
Unbreak Now!

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Info from Developers

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Design

  
Type
Known Issue

  
Type
Patch

Archived

  
Type
Report

Archived

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Clear milestone
No items
No Milestone
4.1
Projects
Clear projects
No project
Viewport & EEVEE
Assignees
Clear assignees
No Assignees
Jeroen Bakker
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#115889
No description provided.
Delete Branch "Jeroen-Bakker/blender:gpu/shader-builder-cmake"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?