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

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

@ -40,12 +40,205 @@ namespace blender::gpu::shader {
/* Helps intellisense / auto-completion. */ /* Helps intellisense / auto-completion. */
#ifndef GPU_SHADER_CREATE_INFO #ifndef GPU_SHADER_CREATE_INFO
# define GPU_SHADER_INTERFACE_INFO(_interface, _inst_name) \ # define GPU_SHADER_NAMED_INTERFACE_INFO(_interface, _inst_name) \
StageInterfaceInfo _interface(#_interface, _inst_name); \ StageInterfaceInfo _interface(#_interface, _inst_name); \
_interface _interface
# define GPU_SHADER_INTERFACE_INFO(_interface) \
StageInterfaceInfo _interface(#_interface); \
_interface
# define GPU_SHADER_CREATE_INFO(_info) \ # define GPU_SHADER_CREATE_INFO(_info) \
ShaderCreateInfo _info(#_info); \ ShaderCreateInfo _info(#_info); \
_info _info
# define GPU_SHADER_NAMED_INTERFACE_END(_inst_name) ;
# define GPU_SHADER_INTERFACE_END ;
# define GPU_SHADER_CREATE_END ;
#elif defined(GLSL_CPP_STUBS)
# define GPU_SHADER_NAMED_INTERFACE_INFO(_interface, _inst_name) \
namespace _interface { \
struct {
# define GPU_SHADER_NAMED_INTERFACE_END(_inst_name) \
} \
_inst_name; \
}
# define GPU_SHADER_INTERFACE_INFO(_interface, _inst_name) namespace _interface {
# define GPU_SHADER_INTERFACE_END }
# define GPU_SHADER_CREATE_INFO(_info) namespace _info {
# define GPU_SHADER_CREATE_END }
#endif
#ifdef GPU_CREATE_INFO_RUNTIME_IMPL
# define SMOOTH(type, name) .smooth(type, name)
# define FLAT(type, name) .flat(type, name)
# define NO_PERSPECTIVE(type, name) .no_perspective(type, name)
/* LOCAL_GROUP_SIZE(int size_x, int size_y = -1, int size_z = -1) */
# define LOCAL_GROUP_SIZE(...) .local_group_size(__VA_ARGS__)
# define VERTEX_IN(slot, type, name) .vertex_in(slot, Type::##type, #name)
# define VERTEX_OUT(stage_interface) .vertex_out(stage_interface)
/* TO REMOVE. */
# define GEOMETRY_LAYOUT(...) .geometry_layout(__VA_ARGS__)
# define GEOMETRY_OUT(stage_interface) .geometry_out(stage_interface)
# 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_DUAL(slot, type, name, blend) \
.fragment_out(slot, Type::##type, #name, blend)
# define FRAGMENT_OUT_ROG(slot, type, name, rog) \
.fragment_out(slot, Type::##type, #name, DualBlend::NONE, rog)
# define EARLY_FRAGMENT_TEST(enable) .early_fragment_test(enable)
# define DEPTH_WRITE(value) .depth_write(value)
# define SPECIALIZATION_CONSTANT(type, name, default_value) \
.specialization_constant(Type::##type, #name, default_value)
# define PUSH_CONSTANT(type, name, array_size) .push_constant(Type::##type, #name, array_size)
# define UNIFORM_BUF(slot, type_name, name, freq) .uniform_buf(slot, #type_name, #name)
# define UNIFORM_BUF_FREQ(slot, type_name, name, freq) \
.uniform_buf(slot, #type_name, #name, Frequency::##freq)
# define STORAGE_BUF(slot, qualifiers, type_name, name) \
.storage_buf(slot, Qualifier::##qualifiers, #type_name, #name, freq)
# define STORAGE_BUF_FREQ(slot, qualifiers, type_name, name, freq) \
.storage_buf(slot, Qualifier::##qualifiers, #type_name, #name, Frequency::##freq)
# define SAMPLER(slot, type, name) .sampler(slot, ImageType::##type, #name)
# define SAMPLER_FREQ(slot, type, name, freq) \
.sampler(slot, ImageType::##type, #name, Frequency::##freq)
# define IMAGE(slot, format, qualifiers, type, name) \
.image(slot, format, Qualifier::##qualifiers, ImageType::##type, #name)
# define IMAGE_FREQ(slot, format, qualifiers, type, name, freq) \
.image(slot, format, Qualifier::##qualifiers, ImageType::##type, #name, Frequency::##freq)
# define BUILTINS(builtin) .builtins(builtin)
# define VERTEX_SOURCE(filename) .vertex_source(filename)
# define GEOMETRY_SOURCE(filename) .geometry_source(filename)
# define FRAGMENT_SOURCE(filename) .fragment_source(filename)
# define COMPUTE_SOURCE(filename) .compute_source(filename)
# define DEFINE(name) .define(#name)
# define DEFINE_VALUE(name, value) .define(#name, #value)
# define DO_STATIC_COMPILATION() .do_static_compilation(true)
# define AUTO_RESOURCE_LOCATION() .auto_resource_location(true)
/* TO REMOVE. */
# define METAL_BACKEND_ONLY() .metal_backend_only(true)
# define ADDITIONAL_INFO(info_name) .additional_info(info_name)
# define TYPEDEF_SOURCE(filename) .typedef_source(filename)
# define MTL_MAX_TOTAL_THREADS_PER_THREADGROUP(value) \
.mtl_max_total_threads_per_threadgroup(value)
#else
# define READ const
# define WRITE
# define READ_WRITE
# define _FLOAT_BUFFER(T) T##Buffer
# define _FLOAT_1D(T) T##1D
# define _FLOAT_1D_ARRAY(T) T##1DArray
# define _FLOAT_2D(T) T##2D
# define _FLOAT_2D_ARRAY(T) T##2DArray
# define _FLOAT_3D(T) T##3D
# define _FLOAT_CUBE(T) T##Cube
# define _FLOAT_CUBE_ARRAY(T) T##CubeArray
# define _INT_BUFFER(T) i##T##Buffer
# define _INT_1D(T) i##T##1D
# define _INT_1D_ARRAY(T) i##T##1DArray
# define _INT_2D(T) i##T##2D
# define _INT_2D_ARRAY(T) i##T##2DArray
# define _INT_3D(T) i##T##3D
# define _INT_CUBE(T) i##T##Cube
# define _INT_CUBE_ARRAY(T) i##T##CubeArray
# define _UINT_BUFFER(T) u##T##Buffer
# define _UINT_1D(T) u##T##1D
# define _UINT_1D_ARRAY(T) u##T##1DArray
# define _UINT_2D(T) u##T##2D
# define _UINT_2D_ARRAY(T) u##T##2DArray
# define _UINT_3D(T) u##T##3D
# define _UINT_CUBE(T) u##T##Cube
# define _UINT_CUBE_ARRAY(T) u##T##CubeArray
# define _SHADOW_2D(T) T##2DShadow
# define _SHADOW_2D_ARRAY(T) T##2DArrayShadow
# define _SHADOW_CUBE(T) T##CubeShadow
# define _SHADOW_CUBE_ARRAY(T) T##CubeArrayShadow
# define _DEPTH_2D(T) T##2D
# define _DEPTH_2D_ARRAY(T) T##2DArray
# define _DEPTH_CUBE(T) T##Cube
# define _DEPTH_CUBE_ARRAY(T) T##CubeArray
# define SMOOTH(type, name) type name = {};
# define FLAT(type, name) type name = {};
# define NO_PERSPECTIVE(type, name) type name = {};
/* LOCAL_GROUP_SIZE(int size_x, int size_y = -1, int size_z = -1) */
# define LOCAL_GROUP_SIZE(...)
# define VERTEX_IN(slot, type, name) const type name = {};
# define VERTEX_OUT(stage_interface) using namespace stage_interface;
/* TO REMOVE. */
# define GEOMETRY_LAYOUT(...)
# define GEOMETRY_OUT(stage_interface) using namespace stage_interface;
# define SUBPASS_IN(slot, type, name, rog) const type name = {};
# define FRAGMENT_OUT(slot, type, name) type name;
# define FRAGMENT_OUT_DUAL(slot, type, name, blend) type name;
# define FRAGMENT_OUT_ROG(slot, type, name, rog) type name;
# define EARLY_FRAGMENT_TEST(enable)
# define DEPTH_WRITE(value)
# define SPECIALIZATION_CONSTANT(type, name, default_value) constexpr type name = {};
# define PUSH_CONSTANT(type, name, array_size) const type name = {};
# define UNIFORM_BUF(slot, type_name, name, freq) 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 SAMPLER(slot, type, name) _##type(sampler) name;
# define SAMPLER_FREQ(slot, type, name, freq) _##type(sampler) name;
# define IMAGE(slot, format, qualifiers, type, name) qualifiers _##type(image) name;
# define IMAGE_FREQ(slot, format, qualifiers, type, name, freq) qualifiers _##type(image) name;
# define BUILTINS(builtin)
# define VERTEX_SOURCE(filename)
# define GEOMETRY_SOURCE(filename)
# define FRAGMENT_SOURCE(filename)
# define COMPUTE_SOURCE(filename)
# define DEFINE(name)
# define DEFINE_VALUE(name, value)
# define DO_STATIC_COMPILATION()
# define AUTO_RESOURCE_LOCATION()
/* TO REMOVE. */
# define METAL_BACKEND_ONLY()
# define ADDITIONAL_INFO(info_name) using namespace info_name;
# define TYPEDEF_SOURCE(filename)
# define MTL_MAX_TOTAL_THREADS_PER_THREADGROUP(value) \
.mtl_max_total_threads_per_threadgroup(value)
#endif #endif
/* All of these functions is a bit out of place */ /* All of these functions is a bit out of place */
@ -326,7 +519,7 @@ struct StageInterfaceInfo {
/** List of all members of the interface. */ /** List of all members of the interface. */
Vector<InOut> inouts; Vector<InOut> inouts;
StageInterfaceInfo(const char *name_, const char *instance_name_) StageInterfaceInfo(const char *name_, const char *instance_name_ = "")
: name(name_), instance_name(instance_name_){}; : name(name_), instance_name(instance_name_){};
~StageInterfaceInfo(){}; ~StageInterfaceInfo(){};