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

61
source/blender/draw/engines/workbench/shaders/infos/workbench_shadow_info.hh
View File

@ -69,34 +69,49 @@ GPU_SHADER_CREATE_INFO(workbench_shadow_debug)
#define WORKBENCH_SHADOW_VARIATIONS(common, prefix, suffix, ...) \ #define WORKBENCH_SHADOW_VARIATIONS(common, prefix, suffix, ...) \
GPU_SHADER_CREATE_INFO(prefix##_pass_manifold_no_caps##suffix) \ GPU_SHADER_CREATE_INFO(prefix##_pass_manifold_no_caps##suffix) \
.define("SHADOW_PASS") \ DEFINE("SHADOW_PASS") \
.vertex_source("workbench_shadow_vert.glsl") ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \ VERTEX_SOURCE("workbench_shadow_vert.glsl") \
.do_static_compilation(true); \ ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \
DO_STATIC_COMPILATION() \
GPU_SHADER_CREATE_END() \
\
GPU_SHADER_CREATE_INFO(prefix##_pass_no_manifold_no_caps##suffix) \ GPU_SHADER_CREATE_INFO(prefix##_pass_no_manifold_no_caps##suffix) \
.define("SHADOW_PASS") \ DEFINE("SHADOW_PASS") \
.define("DOUBLE_MANIFOLD") \ DEFINE("DOUBLE_MANIFOLD") \
.vertex_source("workbench_shadow_vert.glsl") ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \ VERTEX_SOURCE("workbench_shadow_vert.glsl") \
.do_static_compilation(true); \ ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \
DO_STATIC_COMPILATION() \
GPU_SHADER_CREATE_END() \
\
GPU_SHADER_CREATE_INFO(prefix##_fail_manifold_caps##suffix) \ GPU_SHADER_CREATE_INFO(prefix##_fail_manifold_caps##suffix) \
.define("SHADOW_FAIL") \ DEFINE("SHADOW_FAIL") \
.vertex_source("workbench_shadow_caps_vert.glsl") \ VERTEX_SOURCE("workbench_shadow_caps_vert.glsl") \
ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \ ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \
.do_static_compilation(true); \ DO_STATIC_COMPILATION() \
GPU_SHADER_CREATE_END() \
\
GPU_SHADER_CREATE_INFO(prefix##_fail_manifold_no_caps##suffix) \ GPU_SHADER_CREATE_INFO(prefix##_fail_manifold_no_caps##suffix) \
.define("SHADOW_FAIL") \ DEFINE("SHADOW_FAIL") \
.vertex_source("workbench_shadow_vert.glsl") ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \ VERTEX_SOURCE("workbench_shadow_vert.glsl") \
.do_static_compilation(true); \ ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \
DO_STATIC_COMPILATION() \
GPU_SHADER_CREATE_END() \
\
GPU_SHADER_CREATE_INFO(prefix##_fail_no_manifold_caps##suffix) \ GPU_SHADER_CREATE_INFO(prefix##_fail_no_manifold_caps##suffix) \
.define("SHADOW_FAIL") \ DEFINE("SHADOW_FAIL") \
.define("DOUBLE_MANIFOLD") \ DEFINE("DOUBLE_MANIFOLD") \
.vertex_source("workbench_shadow_caps_vert.glsl") \ VERTEX_SOURCE("workbench_shadow_caps_vert.glsl") \
ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \ ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \
.do_static_compilation(true); \ DO_STATIC_COMPILATION() \
GPU_SHADER_CREATE_END() \
\
GPU_SHADER_CREATE_INFO(prefix##_fail_no_manifold_no_caps##suffix) \ GPU_SHADER_CREATE_INFO(prefix##_fail_no_manifold_no_caps##suffix) \
.define("SHADOW_FAIL") \ DEFINE("SHADOW_FAIL") \
.define("DOUBLE_MANIFOLD") \ DEFINE("DOUBLE_MANIFOLD") \
.vertex_source("workbench_shadow_vert.glsl") ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \ VERTEX_SOURCE("workbench_shadow_vert.glsl") \
.do_static_compilation(true); ADDITIONAL_INFO_EXPAND(common, __VA_ARGS__) \
DO_STATIC_COMPILATION() \
GPU_SHADER_CREATE_END()
WORKBENCH_SHADOW_VARIATIONS(workbench_shadow_common, workbench_shadow, , workbench_shadow_no_debug) WORKBENCH_SHADOW_VARIATIONS(workbench_shadow_common, workbench_shadow, , workbench_shadow_no_debug)