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 +11
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6e3c1b27c8 - Show all commits

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

@ -61,6 +61,7 @@ namespace blender::gpu::shader {
} }
# define GPU_SHADER_CREATE_END() } # define GPU_SHADER_CREATE_END() }
# define SHADER_LIBRARY_CREATE_INFO(_info) using namespace _info;
# define VERTEX_SHADER_CREATE_INFO(_info) \ # define VERTEX_SHADER_CREATE_INFO(_info) \
using namespace ::gl_VertexShader; \ using namespace ::gl_VertexShader; \
using namespace _info::gl_VertexShader; \ using namespace _info::gl_VertexShader; \

5
source/blender/gpu/shaders/metal/mtl_shader_defines.msl
View File

@ -2549,3 +2549,8 @@ mat3x4 MAT3x4(mat2 m)
#define bool3_array(...) { __VA_ARGS__ } #define bool3_array(...) { __VA_ARGS__ }
#define bool4_array(...) { __VA_ARGS__ } #define bool4_array(...) { __VA_ARGS__ }
/* clang-format on */ /* clang-format on */
#define SHADER_LIBRARY_CREATE_INFO(a)
#define VERTEX_SHADER_CREATE_INFO(a)
#define FRAGMENT_SHADER_CREATE_INFO(a)
#define COMPUTE_SHADER_CREATE_INFO(a)

5
source/blender/gpu/shaders/opengl/glsl_shader_defines.glsl
View File

@ -121,3 +121,8 @@ bool is_zero(vec4 A)
#define bool2_array bool2[] #define bool2_array bool2[]
#define bool3_array bool3[] #define bool3_array bool3[]
#define bool4_array bool4[] #define bool4_array bool4[]
#define SHADER_LIBRARY_CREATE_INFO(a)
#define VERTEX_SHADER_CREATE_INFO(a)
#define FRAGMENT_SHADER_CREATE_INFO(a)
#define COMPUTE_SHADER_CREATE_INFO(a)