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

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

@ -51,19 +51,26 @@ namespace blender::gpu::shader {
# define GPU_SHADER_INTERFACE_INFO(_interface, _inst_name) namespace _interface { # define GPU_SHADER_INTERFACE_INFO(_interface, _inst_name) namespace _interface {
# define GPU_SHADER_INTERFACE_END() } # define GPU_SHADER_INTERFACE_END() }
# define GPU_SHADER_CREATE_INFO(_info) namespace _info { # define GPU_SHADER_CREATE_INFO(_info) \
namespace _info { \
namespace gl_VertexShader { \
} \
namespace gl_FragmentShader { \
} \
namespace gl_ComputeShader { \
}
# define GPU_SHADER_CREATE_END() } # define GPU_SHADER_CREATE_END() }
# 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; \
using namespace _info; using namespace _info;
# define FRAGMENT_SHADER_CREATE_INFO(_info) \ # define FRAGMENT_SHADER_CREATE_INFO(_info) \
using namespace gl_FragmentShader; \ using namespace ::gl_FragmentShader; \
using namespace _info::gl_FragmentShader; \ using namespace _info::gl_FragmentShader; \
using namespace _info; using namespace _info;
# define COMPUTE_SHADER_CREATE_INFO(_info) \ # define COMPUTE_SHADER_CREATE_INFO(_info) \
using namespace gl_ComputeShader; \ using namespace ::gl_ComputeShader; \
using namespace _info::gl_ComputeShader; \ using namespace _info::gl_ComputeShader; \
using namespace _info; using namespace _info;