DRW: Split ViewProjectionMatrix in order to increase precisiontmp-drw-split-matrix

This also removes the need to compute the persmat and saves some memory
from the `ViewInfos` struct. This is needed to allow multiview support.

Initial testing found no major performance regression during vertex
heavy workload.

Differential Revision: https://developer.blender.org/D16125

25 files changed, 51 insertions, 49 deletions

diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl
index c9af2753baa..1c32a5975be 100644
--- a/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl
@@ -39,6 +39,6 @@ void main()
   vec3 screen_pos = screen_vecs[0] * quadCoord.x + screen_vecs[1] * quadCoord.y;
   ws_location += screen_pos * sphere_size;
 
-  gl_Position = ViewProjectionMatrix * vec4(ws_location, 1.0);
+  gl_Position = ProjectionMatrix * (ViewMatrix * vec4(ws_location, 1.0));
   gl_Position.z += 0.0001; /* Small bias to let the icon draw without zfighting */
 }
diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl
index 6fefe1319bd..c296d901880 100644
--- a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl
@@ -42,6 +42,6 @@ void main()
   vec3 screen_pos = screen_vecs[0] * quadCoord.x + screen_vecs[1] * quadCoord.y;
   ws_cell_location += screen_pos * sphere_size;
 
-  gl_Position = ViewProjectionMatrix * vec4(ws_cell_location, 1.0);
+  gl_Position = ProjectionMatrix * (ViewMatrix * vec4(ws_cell_location, 1.0));
   gl_Position.z += 0.0001; /* Small bias to let the icon draw without zfighting */
 }
diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_lib.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_lib.glsl
index e1035af37be..6c1a95bba49 100644
--- a/source/blender/draw/engines/eevee/shaders/lightprobe_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/lightprobe_lib.glsl
@@ -203,7 +203,7 @@ vec3 probe_evaluate_planar(int id, PlanarData pd, vec3 P, vec3 N, vec3 V, float
   vec3 ref_pos = point_on_plane + proj_ref;
 
   /* Reproject to find texture coords. */
-  vec4 refco = ViewProjectionMatrix * vec4(ref_pos, 1.0);
+  vec4 refco = ProjectionMatrix * (ViewMatrix * vec4(ref_pos, 1.0));
   refco.xy /= refco.w;
 
   /* TODO: If we support non-ssr planar reflection, we should blur them with gaussian
diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_frag.glsl
index 0a53abcb04a..fff3209bb8a 100644
--- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_frag.glsl
@@ -10,7 +10,7 @@ out vec4 FragColor;
 
 void main()
 {
-  vec4 refco = ViewProjectionMatrix * vec4(worldPosition, 1.0);
+  vec4 refco = ProjectionMatrix * (ViewMatrix * vec4(worldPosition, 1.0));
   refco.xy /= refco.w;
   FragColor = vec4(
       textureLod(probePlanars, vec3(refco.xy * vec2(-0.5, 0.5) + 0.5, float(probeIdx)), 0.0).rgb,
diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl
index 6759c060259..9c79fd4c939 100644
--- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl
@@ -12,6 +12,6 @@ flat out int probeIdx;
 void main()
 {
   worldPosition = (probe_mat * vec4(-pos.x, pos.y, 0.0, 1.0)).xyz;
-  gl_Position = ViewProjectionMatrix * vec4(worldPosition, 1.0);
+  gl_Position = ProjectionMatrix * (ViewMatrix * vec4(worldPosition, 1.0));
   probeIdx = probe_id;
 }
diff --git a/source/blender/draw/engines/eevee/shaders/object_motion_vert.glsl b/source/blender/draw/engines/eevee/shaders/object_motion_vert.glsl
index ef96bcbaedb..9dab04006a8 100644
--- a/source/blender/draw/engines/eevee/shaders/object_motion_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/object_motion_vert.glsl
@@ -52,8 +52,8 @@ void main()
   /* Use jittered projmatrix to be able to match exact sample depth (depth equal test).
    * Note that currModelMatrix needs to also be equal to ModelMatrix for the samples to match. */
 #ifndef HAIR
-  gl_Position = ViewProjectionMatrix * vec4(currWorldPos, 1.0);
+  gl_Position = ProjectionMatrix * (ViewMatrix * vec4(currWorldPos, 1.0));
 #else
-  gl_Position = ViewProjectionMatrix * vec4(wpos, 1.0);
+  gl_Position = ProjectionMatrix * (ViewMatrix * vec4(wpos, 1.0));
 #endif
 }
diff --git a/source/blender/draw/engines/eevee/shaders/surface_lib.glsl b/source/blender/draw/engines/eevee/shaders/surface_lib.glsl
index 69762027643..ac7519195c0 100644
--- a/source/blender/draw/engines/eevee/shaders/surface_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/surface_lib.glsl
@@ -181,7 +181,7 @@ vec3 coordinate_screen(vec3 P)
   window.xy = window.xy * CameraTexCoFactors.xy + CameraTexCoFactors.zw;
 
 #else /* MESH */
-  window.xy = project_point(ViewProjectionMatrix, P).xy * 0.5 + 0.5;
+  window.xy = project_point(ProjectionMatrix, transform_point(ViewMatrix, P)).xy * 0.5 + 0.5;
   window.xy = window.xy * CameraTexCoFactors.xy + CameraTexCoFactors.zw;
 #endif
   return window;
diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_frag.glsl b/source/blender/draw/engines/eevee/shaders/volumetric_frag.glsl
index 9ed21fc0bf5..eebcf56de28 100644
--- a/source/blender/draw/engines/eevee/shaders/volumetric_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/volumetric_frag.glsl
@@ -52,7 +52,7 @@ vec3 coordinate_camera(vec3 P)
 vec3 coordinate_screen(vec3 P)
 {
   vec3 window = vec3(0.0);
-  window.xy = project_point(ViewProjectionMatrix, P).xy * 0.5 + 0.5;
+  window.xy = project_point(ProjectionMatrix, transform_point(ViewMatrix, P)).xy * 0.5 + 0.5;
   window.xy = window.xy * CameraTexCoFactors.xy + CameraTexCoFactors.zw;
   return window;
 }
diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_lib.glsl b/source/blender/draw/engines/eevee/shaders/volumetric_lib.glsl
index 777e48fde34..07b817d1713 100644
--- a/source/blender/draw/engines/eevee/shaders/volumetric_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/volumetric_lib.glsl
@@ -117,7 +117,7 @@ vec3 light_volume_light_vector(LightData ld, vec3 P)
 vec3 participating_media_extinction(vec3 wpos, sampler3D volume_extinction)
 {
   /* Waiting for proper volume shadowmaps and out of frustum shadow map. */
-  vec3 ndc = project_point(ViewProjectionMatrix, wpos);
+  vec3 ndc = project_point(ProjectionMatrix, transform_point(ViewMatrix, wpos));
   vec3 volume_co = ndc_to_volume(ndc * 0.5 + 0.5);
 
   /* Let the texture be clamped to edge. This reduce visual glitches. */
@@ -147,12 +147,15 @@ vec3 light_volume_shadow(LightData ld, vec3 ray_wpos, vec4 l_vector, sampler3D v
 
   if (ld.l_type == SUN) {
     /* For sun light we scan the whole frustum. So we need to get the correct endpoints. */
-    vec3 ndcP = project_point(ViewProjectionMatrix, ray_wpos);
-    vec3 ndcL = project_point(ViewProjectionMatrix, ray_wpos + l_vector.xyz) - ndcP;
+    vec3 ndcP = project_point(ProjectionMatrix, transform_point(ViewMatrix, ray_wpos));
+    vec3 ndcL = project_point(ProjectionMatrix,
+                              transform_point(ViewMatrix, ray_wpos + l_vector.xyz)) -
+                ndcP;
 
     vec3 frustum_isect = ndcP + ndcL * line_unit_box_intersect_dist_safe(ndcP, ndcL);
 
-    L = project_point(ViewProjectionMatrixInverse, frustum_isect) - ray_wpos;
+    vec4 L_hom = ViewMatrixInverse * (ProjectionMatrixInverse * vec4(frustum_isect, 1.0));
+    L = (L_hom.xyz / L_hom.w) - ray_wpos;
     L /= volShadowSteps;
     dd = length(L);
   }
diff --git a/source/blender/draw/engines/eevee/shaders/world_vert.glsl b/source/blender/draw/engines/eevee/shaders/world_vert.glsl
index 29892a7ffb4..837dca4ad08 100644
--- a/source/blender/draw/engines/eevee/shaders/world_vert.glsl
+++ b/source/blender/draw/engines/eevee/shaders/world_vert.glsl
@@ -17,7 +17,7 @@ void main()
 
   gl_Position = vec4(pos, 1.0, 1.0);
   viewPosition = project_point(ProjectionMatrixInverse, vec3(pos, 0.0));
-  worldPosition = project_point(ViewProjectionMatrixInverse, vec3(pos, 0.0));
+  worldPosition = transform_point(ViewMatrixInverse, viewPosition);
   /* Not usable. */
   viewNormal = vec3(0.0);
   worldNormal = vec3(0.0);
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_nodetree_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_nodetree_lib.glsl
index dd047709afd..9422cb726b7 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_nodetree_lib.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_nodetree_lib.glsl
@@ -344,7 +344,7 @@ vec3 coordinate_screen(vec3 P)
   }
   else {
     /* TODO(fclem): Actual camera transform. */
-    window.xy = project_point(ViewProjectionMatrix, P).xy * 0.5 + 0.5;
+    window.xy = project_point(ProjectionMatrix, transform_point(ViewMatrix, P)).xy * 0.5 + 0.5;
     window.xy = window.xy * CameraTexCoFactors.xy + CameraTexCoFactors.zw;
   }
   return window;
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
index 2fca8b69183..07e14fd7bef 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_depth_merge_vert.glsl
@@ -5,5 +5,5 @@ void main()
   int v = gl_VertexID % 3;
   float x = -1.0 + float((v & 1) << 2);
   float y = -1.0 + float((v & 2) << 1);
-  gl_Position = drw_view.persmat * (model_matrix * vec4(x, y, 0.0, 1.0));
+  gl_Position = drw_view.winmat * (drw_view.viewmat * (model_matrix * vec4(x, y, 0.0, 1.0)));
 }
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl
index 4d21ffd96b5..17aed643224 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_envelope_solid_vert.glsl
@@ -38,5 +38,5 @@ void main()
   view_clipping_distances(sp);
 
   vec4 pos_4d = vec4(sp, 1.0);
-  gl_Position = drw_view.persmat * pos_4d;
+  gl_Position = drw_view.winmat * (drw_view.viewmat * pos_4d);
 }
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl
index 68f7e75673f..2b5605c85d3 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_armature_shape_solid_vert.glsl
@@ -25,7 +25,7 @@ void main()
   finalColor.a = 1.0;
 
   vec4 world_pos = model_mat * vec4(pos, 1.0);
-  gl_Position = drw_view.persmat * world_pos;
+  gl_Position = drw_view.winmat * (drw_view.viewmat * world_pos);
 
   view_clipping_distances(world_pos.xyz);
 }
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl
index 76a944c6987..caca123a0c2 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_skin_root_vert.glsl
@@ -9,7 +9,7 @@ void main()
   vec3 up = normalize(imat * screenVecs[1].xyz);
   vec3 screen_pos = (right * pos.x + up * pos.z) * size;
   vec4 pos_4d = ModelMatrix * vec4(local_pos + screen_pos, 1.0);
-  gl_Position = drw_view.persmat * pos_4d;
+  gl_Position = drw_view.winmat * (drw_view.viewmat * pos_4d);
   /* Manual stipple: one segment out of 2 is transparent. */
   finalColor = ((gl_VertexID & 1) == 0) ? colorSkinRoot : vec4(0.0);
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl
index b43b1eb4a52..6a027f94f49 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_grid_vert.glsl
@@ -39,5 +39,5 @@ void main()
     local_pos.z = clamp(local_pos.z, -1.0, 0.0);
   }
 
-  gl_Position = drw_view.persmat * vec4(real_pos, 1.0);
+  gl_Position = drw_view.winmat * (drw_view.viewmat * vec4(real_pos, 1.0));
 }
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl
index e6281f75b8f..50c24de0838 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert.glsl
@@ -18,7 +18,7 @@ vec2 proj(vec4 pos)
 
 void main()
 {
-  gl_Position = drw_view.persmat * vec4(pos, 1.0);
+  gl_Position = drw_view.winmat * (drw_view.viewmat * vec4(pos, 1.0));
 
   interp.ss_pos = proj(gl_Position);
 
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert_no_geom.glsl b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert_no_geom.glsl
index 89878a63c4b..c83e7f095a7 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert_no_geom.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_line_vert_no_geom.glsl
@@ -108,8 +108,8 @@ void main()
   vec3 in_pos0 = vertex_fetch_attribute(base_vertex_id, pos, vec3);
   vec3 in_pos1 = vertex_fetch_attribute(base_vertex_id + 1, pos, vec3);
 
-  vec4 out_pos0 = ViewProjectionMatrix * vec4(in_pos0, 1.0);
-  vec4 out_pos1 = ViewProjectionMatrix * vec4(in_pos1, 1.0);
+  vec4 out_pos0 = ProjectionMatrix * (ViewMatrix * vec4(in_pos0, 1.0));
+  vec4 out_pos1 = ProjectionMatrix * (ViewMatrix * vec4(in_pos1, 1.0));
 
   /* Final calculations required for Geometry Shader alternative.
    * We need to calculate values for each vertex position to correctly determine the final output
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl
index 70892954cd8..7305d00c052 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_motion_path_point_vert.glsl
@@ -9,7 +9,7 @@
 
 void main()
 {
-  gl_Position = drw_view.persmat * vec4(pos, 1.0);
+  gl_Position = drw_view.winmat * (drw_view.viewmat * vec4(pos, 1.0));
   gl_PointSize = float(pointSize + 2);
 
   int frame = gl_VertexID + cacheStart;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl
index 92be9ec3bcb..a575d42231e 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_frag.glsl
@@ -25,7 +25,7 @@ void main()
     bool is_persp = drw_view.winmat[3][3] == 0.0;
     vec2 uvs = vec2(gl_FragCoord.xy) * drw_view.viewport_size_inverse;
     vec3 pos_ndc = vec3(uvs, gl_FragCoord.z) * 2.0 - 1.0;
-    vec4 pos_world = drw_view.persinv * vec4(pos_ndc, 1.0);
+    vec4 pos_world = drw_view.viewinv * (drw_view.wininv * vec4(pos_ndc, 1.0));
     vec3 pos = pos_world.xyz / pos_world.w;
 
     vec3 ray_ori = pos;
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index 67d0f79b83e..056f93d5d77 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -442,6 +442,9 @@ struct DRWView {
   struct DRWView *parent;
 
   ViewInfos storage;
+
+  float4x4 persmat;
+  float4x4 persinv;
   /** Number of active clip planes. */
   int clip_planes_len;
   /** Does culling result needs to be updated. */
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index eb05e03402c..afd1ee35cef 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -666,7 +666,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob)
   drw_call_calc_orco(ob, ob_infos->orcotexfac);
   /* Random float value. */
   uint random = (DST.dupli_source) ?
-                     DST.dupli_source->random_id :
+                    DST.dupli_source->random_id :
                      /* TODO(fclem): this is rather costly to do at runtime. Maybe we can
                       * put it in ob->runtime and make depsgraph ensure it is up to date. */
                      BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0);
@@ -2073,18 +2073,20 @@ static void draw_frustum_bound_sphere_calc(const BoundBox *bbox,
   }
 }
 
-static void draw_view_matrix_state_update(ViewInfos *storage,
+static void draw_view_matrix_state_update(DRWView *view,
                                           const float viewmat[4][4],
                                           const float winmat[4][4])
 {
+  ViewInfos *storage = &view->storage;
+
   copy_m4_m4(storage->viewmat, viewmat);
   invert_m4_m4(storage->viewinv, storage->viewmat);
 
   copy_m4_m4(storage->winmat, winmat);
   invert_m4_m4(storage->wininv, storage->winmat);
 
-  mul_m4_m4m4(storage->persmat, winmat, viewmat);
-  invert_m4_m4(storage->persinv, storage->persmat);
+  mul_m4_m4m4(view->persmat, winmat, viewmat);
+  invert_m4_m4(view->persinv, view->persmat);
 
   const bool is_persp = (winmat[3][3] == 0.0f);
 
@@ -2198,7 +2200,7 @@ void DRW_view_update_sub(DRWView *view, const float viewmat[4][4], const float w
   view->is_dirty = true;
   view->is_inverted = (is_negative_m4(viewmat) == is_negative_m4(winmat));
 
-  draw_view_matrix_state_update(&view->storage, viewmat, winmat);
+  draw_view_matrix_state_update(view, viewmat, winmat);
 }
 
 void DRW_view_update(DRWView *view,
@@ -2215,7 +2217,7 @@ void DRW_view_update(DRWView *view,
   view->is_dirty = true;
   view->is_inverted = (is_negative_m4(viewmat) == is_negative_m4(winmat));
 
-  draw_view_matrix_state_update(&view->storage, viewmat, winmat);
+  draw_view_matrix_state_update(view, viewmat, winmat);
 
   /* Prepare frustum culling. */
 
@@ -2256,7 +2258,7 @@ void DRW_view_update(DRWView *view,
   }
 
   draw_frustum_boundbox_calc(viewinv, winmat, &view->frustum_corners);
-  draw_frustum_culling_planes_calc(view->storage.persmat, view->frustum_planes);
+  draw_frustum_culling_planes_calc(view->persmat, view->frustum_planes);
   draw_frustum_bound_sphere_calc(
       &view->frustum_corners, viewinv, winmat, wininv, &view->frustum_bsphere);
 
@@ -2371,8 +2373,7 @@ void DRW_view_winmat_get(const DRWView *view, float mat[4][4], bool inverse)
 void DRW_view_persmat_get(const DRWView *view, float mat[4][4], bool inverse)
 {
   view = (view) ? view : DST.view_default;
-  const ViewInfos *storage = &view->storage;
-  copy_m4_m4(mat, (inverse) ? storage->persinv : storage->persmat);
+  copy_m4_m4(mat, (inverse) ? view->persinv : view->persmat);
 }
 
 /** \} */
diff --git a/source/blender/draw/intern/draw_shader_shared.h b/source/blender/draw/intern/draw_shader_shared.h
index bedbedcf438..7d197389d85 100644
--- a/source/blender/draw/intern/draw_shader_shared.h
+++ b/source/blender/draw/intern/draw_shader_shared.h
@@ -52,8 +52,6 @@ typedef enum eObjectInfoFlag eObjectInfoFlag;
 
 struct ViewInfos {
   /* View matrices */
-  float4x4 persmat;
-  float4x4 persinv;
   float4x4 viewmat;
   float4x4 viewinv;
   float4x4 winmat;
@@ -86,8 +84,6 @@ BLI_STATIC_ASSERT_ALIGN(ViewInfos, 16)
 /* Do not override old definitions if the shader uses this header but not shader info. */
 #ifdef USE_GPU_SHADER_CREATE_INFO
 /* TODO(@fclem): Mass rename. */
-#  define ViewProjectionMatrix drw_view.persmat
-#  define ViewProjectionMatrixInverse drw_view.persinv
 #  define ViewMatrix drw_view.viewmat
 #  define ViewMatrixInverse drw_view.viewinv
 #  define ProjectionMatrix drw_view.winmat
diff --git a/source/blender/draw/intern/draw_view.cc b/source/blender/draw/intern/draw_view.cc
index cb0e1370c28..1e739cf0871 100644
--- a/source/blender/draw/intern/draw_view.cc
+++ b/source/blender/draw/intern/draw_view.cc
@@ -21,8 +21,6 @@ void View::sync(const float4x4 &view_mat, const float4x4 &win_mat)
   data_.viewinv = view_mat.inverted();
   data_.winmat = win_mat;
   data_.wininv = win_mat.inverted();
-  data_.persmat = data_.winmat * data_.viewmat;
-  data_.persinv = data_.persmat.inverted();
   /* Should not be used anymore. */
   data_.viewcamtexcofac = float4(1.0f, 1.0f, 0.0f, 0.0f);
 
@@ -83,7 +81,8 @@ void View::frustum_boundbox_calc(BoundBox &bbox)
 
 void View::frustum_culling_planes_calc()
 {
-  planes_from_projmat(data_.persmat.ptr(),
+  float4x4 persmat = data_.winmat * data_.viewmat;
+  planes_from_projmat(persmat.ptr(),
                       data_.frustum_planes[0],
                       data_.frustum_planes[5],
                       data_.frustum_planes[1],
@@ -298,7 +297,8 @@ void View::compute_visibility(ObjectBoundsBuf &bounds, uint resource_len, bool d
   }
 #ifdef DEBUG
   if (debug_freeze) {
-    drw_debug_matrix_as_bbox(data_freeze_.persinv, float4(0, 1, 0, 1));
+    float4x4 persmat = data_freeze_.winmat * data_freeze_.viewmat;
+    drw_debug_matrix_as_bbox(persmat.inverted(), float4(0, 1, 0, 1));
   }
 #endif
   frozen_ = debug_freeze;
diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl
index 6521476c3a7..46f16a9ca40 100644
--- a/source/blender/draw/intern/shaders/common_view_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_view_lib.glsl
@@ -11,9 +11,6 @@
 /* keep in sync with DRWManager.view_data */
 layout(std140) uniform viewBlock
 {
-  /* Same order as DRWViewportMatrixType */
-  mat4 ViewProjectionMatrix;
-  mat4 ViewProjectionMatrixInverse;
   mat4 ViewMatrix;
   mat4 ViewMatrixInverse;
   mat4 ProjectionMatrix;
@@ -61,8 +58,9 @@ vec3 cameraVec(vec3 P)
 /* TODO move to overlay engine. */
 float mul_project_m4_v3_zfac(in vec3 co)
 {
-  return pixelFac * ((ViewProjectionMatrix[0][3] * co.x) + (ViewProjectionMatrix[1][3] * co.y) +
-                     (ViewProjectionMatrix[2][3] * co.z) + ViewProjectionMatrix[3][3]);
+  vec3 vP = (ViewMatrix * vec4(co, 1.0)).xyz;
+  return pixelFac * ((ProjectionMatrix[0][3] * vP.x) + (ProjectionMatrix[1][3] * vP.y) +
+                     (ProjectionMatrix[2][3] * vP.z) + ProjectionMatrix[3][3]);
 }
 #endif
 
@@ -267,13 +265,14 @@ uniform mat4 ModelMatrixInverse;
 #define normal_world_to_view(n) (mat3(ViewMatrix) * n)
 #define normal_view_to_world(n) (mat3(ViewMatrixInverse) * n)
 
-#define point_object_to_ndc(p) (ViewProjectionMatrix * vec4((ModelMatrix * vec4(p, 1.0)).xyz, 1.0))
+#define point_object_to_ndc(p) \
+  (ProjectionMatrix * (ViewMatrix * vec4((ModelMatrix * vec4(p, 1.0)).xyz, 1.0)))
 #define point_object_to_view(p) ((ViewMatrix * vec4((ModelMatrix * vec4(p, 1.0)).xyz, 1.0)).xyz)
 #define point_object_to_world(p) ((ModelMatrix * vec4(p, 1.0)).xyz)
 #define point_view_to_ndc(p) (ProjectionMatrix * vec4(p, 1.0))
 #define point_view_to_object(p) ((ModelMatrixInverse * (ViewMatrixInverse * vec4(p, 1.0))).xyz)
 #define point_view_to_world(p) ((ViewMatrixInverse * vec4(p, 1.0)).xyz)
-#define point_world_to_ndc(p) (ViewProjectionMatrix * vec4(p, 1.0))
+#define point_world_to_ndc(p) (ProjectionMatrix * (ViewMatrix * vec4(p, 1.0)))
 #define point_world_to_object(p) ((ModelMatrixInverse * vec4(p, 1.0)).xyz)
 #define point_world_to_view(p) ((ViewMatrix * vec4(p, 1.0)).xyz)