griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T103256 Viewport: Regression: Clipping Region is not working

Browse Source 
This was caused by a change in UBO name that wasn't propagated through
all usage, leading to missing UBO bind.
This commit is contained in:
Clément Foucault
2023-01-15 14:24:06 +01:00
parent 8b5d5cbf06
commit 87bb14ab5f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/draw/intern/shaders/common_view_clipping_lib.glsl
View File

@@ -7,12 +7,12 @@ void view_clipping_distances(vec3 wpos)
{
# ifdef USE_WORLD_CLIP_PLANES
vec4 pos_4d = vec4(wpos, 1.0);
gl_ClipDistance[0] = dot(drw_clipping[0], pos_4d);
gl_ClipDistance[1] = dot(drw_clipping[1], pos_4d);
gl_ClipDistance[2] = dot(drw_clipping[2], pos_4d);
gl_ClipDistance[3] = dot(drw_clipping[3], pos_4d);
gl_ClipDistance[4] = dot(drw_clipping[4], pos_4d);
gl_ClipDistance[5] = dot(drw_clipping[5], pos_4d);
gl_ClipDistance[0] = dot(drw_clipping_[0], pos_4d);
gl_ClipDistance[1] = dot(drw_clipping_[1], pos_4d);
gl_ClipDistance[2] = dot(drw_clipping_[2], pos_4d);
gl_ClipDistance[3] = dot(drw_clipping_[3], pos_4d);
gl_ClipDistance[4] = dot(drw_clipping_[4], pos_4d);
gl_ClipDistance[5] = dot(drw_clipping_[5], pos_4d);
# endif
}

2
source/blender/draw/intern/shaders/draw_view_info.hh
View File

@@ -79,7 +79,7 @@ GPU_SHADER_CREATE_INFO(draw_modelmat_instanced_attr)
GPU_SHADER_CREATE_INFO(drw_clipped)
/* TODO(fclem): Move to engine side. */
.uniform_buf(DRW_CLIPPING_UBO_SLOT, "vec4", "drw_clipping[6]", Frequency::PASS)
.uniform_buf(DRW_CLIPPING_UBO_SLOT, "vec4", "drw_clipping_[6]", Frequency::PASS)
.define("USE_WORLD_CLIP_PLANES");
/** \} */