diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-10-07 01:06:27 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-10-07 13:43:10 +0300 |
| commit | a945cf4d0fc38f3c84747767612ad1d748ceb2a0 (patch) | |
| tree | 72aa5ff66b79168506cb9542d0144d42c10dd1d4 /source/blender/draw/engines | |
| parent | 223f970407666828922616f1646768433ab7e7a0 (diff) | |
DRW: Move clipping planes to their own UBO
This is part of the effor to simplify the View struct in order to implement
multiview rendering.
Diffstat (limited to 'source/blender/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh | 2 | ||||
| -rw-r--r-- | source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh b/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh index ee22362e0d4..9936a7bdf99 100644 --- a/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh +++ b/source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh @@ -26,7 +26,7 @@ GPU_SHADER_CREATE_INFO(gpencil_geometry) .sampler(1, ImageType::FLOAT_2D, "gpStrokeTexture") .sampler(2, ImageType::DEPTH_2D, "gpSceneDepthTexture") .sampler(3, ImageType::FLOAT_2D, "gpMaskTexture") - .uniform_buf(2, "gpMaterial", "materials[GPENCIL_MATERIAL_BUFFER_LEN]", Frequency::BATCH) + .uniform_buf(4, "gpMaterial", "materials[GPENCIL_MATERIAL_BUFFER_LEN]", Frequency::BATCH) .uniform_buf(3, "gpLight", "lights[GPENCIL_LIGHT_BUFFER_LEN]", Frequency::BATCH) /* Per Object */ .push_constant(Type::VEC3, "gpNormal") diff --git a/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh b/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh index 690d12b7020..4874f251d67 100644 --- a/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh +++ b/source/blender/draw/engines/overlay/shaders/infos/overlay_extra_info.hh @@ -110,12 +110,12 @@ GPU_SHADER_CREATE_INFO(overlay_extra_wire) GPU_SHADER_CREATE_INFO(overlay_extra_wire_select) .do_static_compilation(true) .define("SELECT_EDGES") - .additional_info("overlay_extra_wire", "drw_clipped"); + .additional_info("overlay_extra_wire"); GPU_SHADER_CREATE_INFO(overlay_extra_wire_object) .do_static_compilation(true) .define("OBJECT_WIRE") - .additional_info("overlay_extra_wire", "drw_clipped"); + .additional_info("overlay_extra_wire"); GPU_SHADER_CREATE_INFO(overlay_extra_wire_select_clipped) .do_static_compilation(true) |