DRW: Move CameraTexCoFactors to engine specific storage

This is part of the effor to simplify the View struct in order to implement
multiview rendering.

The CameraTexCoFactors being only valid for a single view, and being only
used in very few places, it make sense to move it to the engine side.

6 files changed, 0 insertions, 23 deletions

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 1752198c349..c65938fd8ce 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -683,8 +683,6 @@ const DRWView *DRW_view_get_active(void);
  * \note planes must be in world space.
  */
 void DRW_view_clip_planes_set(DRWView *view, float (*planes)[4], int plane_len);
-void DRW_view_camtexco_set(DRWView *view, float texco[4]);
-void DRW_view_camtexco_get(const DRWView *view, float r_texco[4]);
 
 /* For all getters, if view is NULL, default view is assumed. */
 
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 3272edef750..50ea27efba1 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -566,7 +566,6 @@ static void drw_manager_init(DRWManager *dst, GPUViewport *viewport, const int s
 
     dst->pixsize = rv3d->pixsize;
     dst->view_default = DRW_view_create(rv3d->viewmat, rv3d->winmat, NULL, NULL, NULL);
-    DRW_view_camtexco_set(dst->view_default, rv3d->viewcamtexcofac);
 
     if (dst->draw_ctx.sh_cfg == GPU_SHADER_CFG_CLIPPED) {
       int plane_len = (RV3D_LOCK_FLAGS(rv3d) & RV3D_BOXCLIP) ? 4 : 6;
diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc
index fc4e444e43e..1d678886380 100644
--- a/source/blender/draw/intern/draw_manager_data.cc
+++ b/source/blender/draw/intern/draw_manager_data.cc
@@ -2213,8 +2213,6 @@ DRWView *DRW_view_create(const float viewmat[4][4],
   view->visibility_fn = visibility_fn;
   view->parent = nullptr;
 
-  copy_v4_fl4(view->storage.viewcamtexcofac, 1.0f, 1.0f, 0.0f, 0.0f);
-
   if (DST.draw_ctx.evil_C && DST.draw_ctx.region) {
     int region_origin[2] = {DST.draw_ctx.region->winrct.xmin, DST.draw_ctx.region->winrct.ymin};
     wmWindow *win = CTX_wm_window(DST.draw_ctx.evil_C);
@@ -2357,16 +2355,6 @@ void DRW_view_clip_planes_set(DRWView *view, float (*planes)[4], int plane_len)
   }
 }
 
-void DRW_view_camtexco_set(DRWView *view, float texco[4])
-{
-  copy_v4_v4(view->storage.viewcamtexcofac, texco);
-}
-
-void DRW_view_camtexco_get(const DRWView *view, float r_texco[4])
-{
-  copy_v4_v4(r_texco, view->storage.viewcamtexcofac);
-}
-
 void DRW_view_frustum_corners_get(const DRWView *view, BoundBox *corners)
 {
   memcpy(corners, &view->frustum_corners, sizeof(view->frustum_corners));
diff --git a/source/blender/draw/intern/draw_shader_shared.h b/source/blender/draw/intern/draw_shader_shared.h
index 13f21323552..b8c2d8890a5 100644
--- a/source/blender/draw/intern/draw_shader_shared.h
+++ b/source/blender/draw/intern/draw_shader_shared.h
@@ -69,8 +69,6 @@ struct ViewInfos {
 
   float4 clip_planes[6];
   float4 viewvecs[2];
-  /* Should not be here. Not view dependent (only main view). */
-  float4 viewcamtexcofac;
 
   float2 viewport_size;
   float2 viewport_size_inverse;
@@ -94,7 +92,6 @@ BLI_STATIC_ASSERT_ALIGN(ViewInfos, 16)
 #  define ProjectionMatrixInverse drw_view.wininv
 #  define clipPlanes drw_view.clip_planes
 #  define ViewVecs drw_view.viewvecs
-#  define CameraTexCoFactors drw_view.viewcamtexcofac
 #endif
 
 /** \} */
diff --git a/source/blender/draw/intern/draw_view.cc b/source/blender/draw/intern/draw_view.cc
index bf3505c7645..3b16ea74a67 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();
-  /* Should not be used anymore. */
-  data_.viewcamtexcofac = float4(1.0f, 1.0f, 0.0f, 0.0f);
 
   data_.is_inverted = (is_negative_m4(view_mat.ptr()) == is_negative_m4(win_mat.ptr()));
 
diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl
index a7f8f858352..2382337e782 100644
--- a/source/blender/draw/intern/shaders/common_view_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_view_lib.glsl
@@ -21,9 +21,6 @@ layout(std140) uniform viewBlock
   /* View frustum corners [NDC(-1.0, -1.0, -1.0) & NDC(1.0, 1.0, 1.0)].
    * Fourth components are near and far values. */
   vec4 ViewVecs[2];
-
-  /* TODO: move it elsewhere. */
-  vec4 CameraTexCoFactors;
 };
 
 #endif /* USE_GPU_SHADER_CREATE_INFO */