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

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

@ -129,9 +129,9 @@ namespace blender::gpu::shader {
.uniform_buf(slot, #type_name, #name, Frequency::freq)
# define STORAGE_BUF(slot, qualifiers, type_name, name) \
.storage_buf(slot, Qualifier::qualifiers, #type_name, #name)
.storage_buf(slot, Qualifier::qualifiers, STRINGIFY(type_name), #name)
# define STORAGE_BUF_FREQ(slot, qualifiers, type_name, name, freq) \
.storage_buf(slot, Qualifier::qualifiers, #type_name, #name, Frequency::freq)
.storage_buf(slot, Qualifier::qualifiers, STRINGIFY(type_name), #name, Frequency::freq)
# define SAMPLER(slot, type, name) .sampler(slot, ImageType::type, #name)
# define SAMPLER_FREQ(slot, type, name, freq) \
@ -242,11 +242,11 @@ namespace blender::gpu::shader {
# define PUSH_CONSTANT(type, name) const type name = {};
# define PUSH_CONSTANT_ARRAY(type, name, array_size) const type name[array_size] = {};
# define UNIFORM_BUF(slot, type_name, name) const type_name name;
# define UNIFORM_BUF_FREQ(slot, type_name, name, freq) const type_name name;
# define UNIFORM_BUF(slot, type_name, name) const type_name name = {};
# define UNIFORM_BUF_FREQ(slot, type_name, name, freq) const type_name name = {};
# define STORAGE_BUF(slot, qualifiers, type_name, name) qualifiers type_name name;
# define STORAGE_BUF_FREQ(slot, qualifiers, type_name, name, freq) qualifiers type_name name;
# define STORAGE_BUF(slot, qualifiers, type_name, name) qualifiers type_name name = {};
# define STORAGE_BUF_FREQ(slot, qualifiers, type_name, name, freq) qualifiers type_name name = {};
# define SAMPLER(slot, type, name) _##type(sampler) name;
# define SAMPLER_FREQ(slot, type, name, freq) _##type(sampler) name;