fclem/blender
2
1
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

GPU: Shader Create Info GLSL-C++ stubs #3

Closed
Clément Foucault wants to merge 90 commits from create-info-cpp-macros into glsl-include
pull from: create-info-cpp-macros
merge into: fclem:glsl-include

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 90 Files Changed 158 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b2a56ca03 - Show all commits

4
source/blender/gpu/intern/gpu_shader_create_info.hh
View File

@ -148,8 +148,8 @@ namespace blender::gpu::shader {
# define FRAGMENT_SOURCE(filename) .fragment_source(filename)
# define COMPUTE_SOURCE(filename) .compute_source(filename)
# define DEFINE(name) .define(#name)
# define DEFINE_VALUE(name, value) .define(#name, #value)
# define DEFINE(name) .define(name)
# define DEFINE_VALUE(name, value) .define(name, value)
# define DO_STATIC_COMPILATION() .do_static_compilation(true)
# define AUTO_RESOURCE_LOCATION() .auto_resource_location(true)