diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-06 03:18:19 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-06 03:18:56 +0300 |
| commit | 112c4345a3591d12b23fabb2129a5f809814ee93 (patch) | |
| tree | 220e67e06750558a63c1879115fde8e271d81df1 | |
| parent | a3f79499b280e84d7d08d107ff95032a4620ce41 (diff) | |
DRW: Add preprocessor error if including common_view_lib.glsl without draw_view
This avoid making include mistake and potentially detect areas that do
not really need common_view_lib.glsl.
| -rw-r--r-- | source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/shaders/common_view_lib.glsl | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh b/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh index f577ae197b4..e93f241ad3c 100644 --- a/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh +++ b/source/blender/draw/engines/workbench/shaders/infos/workbench_composite_info.hh @@ -13,7 +13,7 @@ GPU_SHADER_CREATE_INFO(workbench_composite) .fragment_out(0, Type::VEC4, "fragColor") .typedef_source("workbench_shader_shared.h") .fragment_source("workbench_composite_frag.glsl") - .additional_info("draw_fullscreen"); + .additional_info("draw_fullscreen", "draw_view"); /** \} */ diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl index 573ad046ea9..c1a65f6b261 100644 --- a/source/blender/draw/intern/shaders/common_view_lib.glsl +++ b/source/blender/draw/intern/shaders/common_view_lib.glsl @@ -1,5 +1,5 @@ /* Temporary until we fully make the switch. */ -#ifndef DRW_SHADER_SHARED_H +#ifndef USE_GPU_SHADER_CREATE_INFO # define DRW_RESOURCE_CHUNK_LEN 512 @@ -29,7 +29,13 @@ layout(std140) uniform viewBlock vec4 frustum_planes[6]; }; -#endif /* DRW_SHADER_SHARED_H */ +#endif /* USE_GPU_SHADER_CREATE_INFO */ + +#ifdef USE_GPU_SHADER_CREATE_INFO +# ifndef DRW_RESOURCE_CHUNK_LEN +# error "Missing draw_view additional create info on shader create info" +# endif +#endif #define ViewNear (ViewVecs[0].w) #define ViewFar (ViewVecs[1].w) |