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 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4f6865f6bd - Show all commits

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

@ -110,7 +110,8 @@ namespace blender::gpu::shader {
# define SUBPASS_IN(slot, type, name, rog) .subpass_in(slot, Type::type, #name, rog) # define SUBPASS_IN(slot, type, name, rog) .subpass_in(slot, Type::type, #name, rog)
# define FRAGMENT_OUT(slot, type, name) .fragment_out(slot, Type::type, #name) # define FRAGMENT_OUT(slot, type, name) .fragment_out(slot, Type::type, #name)
# define FRAGMENT_OUT_DUAL(slot, type, name, blend) .fragment_out(slot, Type::type, #name, blend) # define FRAGMENT_OUT_DUAL(slot, type, name, blend) \
.fragment_out(slot, Type::type, #name, DualBlend::blend)
# define FRAGMENT_OUT_ROG(slot, type, name, rog) \ # define FRAGMENT_OUT_ROG(slot, type, name, rog) \
.fragment_out(slot, Type::type, #name, DualBlend::NONE, rog) .fragment_out(slot, Type::type, #name, DualBlend::NONE, rog)
@ -157,7 +158,7 @@ namespace blender::gpu::shader {
/* TO REMOVE. */ /* TO REMOVE. */
# define METAL_BACKEND_ONLY() .metal_backend_only(true) # define METAL_BACKEND_ONLY() .metal_backend_only(true)
# define ADDITIONAL_INFO(info_name) .additional_info(info_name) # define ADDITIONAL_INFO(info_name) .additional_info(#info_name)
# define TYPEDEF_SOURCE(filename) .typedef_source(filename) # define TYPEDEF_SOURCE(filename) .typedef_source(filename)
# define MTL_MAX_TOTAL_THREADS_PER_THREADGROUP(value) \ # define MTL_MAX_TOTAL_THREADS_PER_THREADGROUP(value) \