Commit: be08d432cd4f7f0d7e2587b907954bf112baa824 Author: Jeroen Bakker Date: Mon Jan 17 12:54:17 2022 +0100 Branches: tmp-gpu-shader-descriptor-2 https://developer.blender.org/rBbe08d432cd4f7f0d7e2587b907954bf112baa824
Enabled migrated workbench shaders. =================================================================== M source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl M source/blender/gpu/CMakeLists.txt =================================================================== diff --git a/source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl index 9038aae533b..13265800cbb 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl @@ -3,12 +3,14 @@ #pragma BLENDER_REQUIRE(workbench_data_lib.glsl) #pragma BLENDER_REQUIRE(workbench_common_lib.glsl) +#ifndef USE_GPU_SHADER_CREATE_INFO layout(std140) uniform samples_block { vec4 samples_coords[512]; }; uniform sampler2D cavityJitter; +#endif /* From The Alchemy screen-space ambient obscurance algorithm * http://graphics.cs.williams.edu/papers/AlchemyHPG11/VV11AlchemyAO.pdf */ diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index a525986e1cd..7090f5096fe 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -402,7 +402,7 @@ list(APPEND INC ${CMAKE_CURRENT_BINARY_DIR}) set(SHADER_CREATE_INFOS #../draw/engines/workbench/shaders/workbench_effect_cavity_info.hh -#../draw/engines/workbench/shaders/workbench_prepass_info.hh +../draw/engines/workbench/shaders/workbench_prepass_info.hh ../draw/intern/shaders/draw_fullscreen_info.hh ../draw/intern/shaders/draw_view_info.hh ../draw/intern/shaders/draw_object_infos_info.hh _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs