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

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

@ -39,7 +39,6 @@
namespace blender::gpu::shader { namespace blender::gpu::shader {
#if defined(GLSL_CPP_STUBS) #if defined(GLSL_CPP_STUBS)
# error
# define GPU_SHADER_NAMED_INTERFACE_INFO(_interface, _inst_name) \ # define GPU_SHADER_NAMED_INTERFACE_INFO(_interface, _inst_name) \
namespace _interface { \ namespace _interface { \
struct { struct {
@ -48,7 +47,7 @@ namespace blender::gpu::shader {
_inst_name; \ _inst_name; \
} }
# define GPU_SHADER_INTERFACE_INFO(_interface, _inst_name) namespace _interface { # define GPU_SHADER_INTERFACE_INFO(_interface) namespace _interface {
# define GPU_SHADER_INTERFACE_END() } # define GPU_SHADER_INTERFACE_END() }
# define GPU_SHADER_CREATE_INFO(_info) \ # define GPU_SHADER_CREATE_INFO(_info) \