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

2
source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh
View File

@ -79,7 +79,7 @@ GPU_SHADER_CREATE_END()
prefix##_opaque_matcap, workbench_resolve_opaque_matcap, __VA_ARGS__) \ prefix##_opaque_matcap, workbench_resolve_opaque_matcap, __VA_ARGS__) \
WORKBENCH_CAVITY_VARIATIONS(prefix##_opaque_flat, workbench_resolve_opaque_flat, __VA_ARGS__) WORKBENCH_CAVITY_VARIATIONS(prefix##_opaque_flat, workbench_resolve_opaque_flat, __VA_ARGS__)
WORKBENCH_LIGHTING_VARIATIONS(workbench_resolve, workbench_composite); WORKBENCH_LIGHTING_VARIATIONS(workbench_resolve, workbench_composite)
#undef WORKBENCH_FINAL_VARIATION #undef WORKBENCH_FINAL_VARIATION
#undef WORKBENCH_CURVATURE_VARIATIONS #undef WORKBENCH_CURVATURE_VARIATIONS

2
source/blender/draw/engines/workbench/shaders/infos/workbench_prepass_info.hh
View File

@ -162,7 +162,7 @@ GPU_SHADER_CREATE_END()
WORKBENCH_PIPELINE_VARIATIONS(prefix##_curves, workbench_curves, __VA_ARGS__) \ WORKBENCH_PIPELINE_VARIATIONS(prefix##_curves, workbench_curves, __VA_ARGS__) \
WORKBENCH_PIPELINE_VARIATIONS(prefix##_ptcloud, workbench_pointcloud, __VA_ARGS__) WORKBENCH_PIPELINE_VARIATIONS(prefix##_ptcloud, workbench_pointcloud, __VA_ARGS__)
WORKBENCH_GEOMETRY_VARIATIONS(workbench_prepass, workbench_prepass); WORKBENCH_GEOMETRY_VARIATIONS(workbench_prepass, workbench_prepass)
#undef WORKBENCH_FINAL_VARIATION #undef WORKBENCH_FINAL_VARIATION
#undef WORKBENCH_CLIPPING_VARIATIONS #undef WORKBENCH_CLIPPING_VARIATIONS