DRW: Remove WorldNormalMatrix

3 files changed, 2 insertions, 20 deletions

diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index 4d74a95bf20..496e5b785bf 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@ -104,7 +104,6 @@ enum {
   DRW_CALL_MODELVIEWINVERSE = (1 << 2),
   DRW_CALL_MODELVIEWPROJECTION = (1 << 3),
   DRW_CALL_NORMALVIEW = (1 << 4),
-  DRW_CALL_NORMALWORLD = (1 << 6),
   DRW_CALL_ORCOTEXFAC = (1 << 7),
   DRW_CALL_OBJECTINFO = (1 << 8),
 };
@@ -126,8 +125,7 @@ typedef struct DRWCallState {
   float modelviewinverse[4][4];
   float modelviewprojection[4][4];
   float normalview[3][3];
-  float normalworld[3][3]; /* Not view dependent */
-  float orcotexfac[2][3];  /* Not view dependent */
+  float orcotexfac[2][3]; /* Not view dependent */
   float objectinfo[2];
 } DRWCallState;
 
@@ -258,7 +256,6 @@ struct DRWShadingGroup {
   int modelviewinverse;
   int modelviewprojection;
   int normalview;
-  int normalworld;
   int orcotexfac;
   int callid;
   int objectinfo;
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index b7225275d72..deabffdaa0d 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -838,7 +838,6 @@ static void drw_shgroup_init(DRWShadingGroup *shgroup, GPUShader *shader)
   shgroup->modelviewinverse = GPU_shader_get_builtin_uniform(shader, GPU_UNIFORM_MODELVIEW_INV);
   shgroup->modelviewprojection = GPU_shader_get_builtin_uniform(shader, GPU_UNIFORM_MVP);
   shgroup->normalview = GPU_shader_get_builtin_uniform(shader, GPU_UNIFORM_NORMAL);
-  shgroup->normalworld = GPU_shader_get_builtin_uniform(shader, GPU_UNIFORM_WORLDNORMAL);
   shgroup->orcotexfac = GPU_shader_get_builtin_uniform(shader, GPU_UNIFORM_ORCO);
   shgroup->objectinfo = GPU_shader_get_builtin_uniform(shader, GPU_UNIFORM_OBJECT_INFO);
   shgroup->callid = GPU_shader_get_builtin_uniform(shader, GPU_UNIFORM_CALLID);
@@ -859,9 +858,6 @@ static void drw_shgroup_init(DRWShadingGroup *shgroup, GPUShader *shader)
   if (shgroup->normalview > -1) {
     shgroup->matflag |= DRW_CALL_NORMALVIEW;
   }
-  if (shgroup->normalworld > -1) {
-    shgroup->matflag |= DRW_CALL_NORMALWORLD;
-  }
   if (shgroup->orcotexfac > -1) {
     shgroup->matflag |= DRW_CALL_ORCOTEXFAC;
   }
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index f98c2cb1025..51ec38088c3 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -806,13 +806,6 @@ static void draw_matrices_model_prepare(DRWCallState *st)
     invert_m3(st->normalview);
     transpose_m3(st->normalview);
   }
-  /* Non view dependent */
-  if (st->matflag & DRW_CALL_NORMALWORLD) {
-    copy_m3_m4(st->normalworld, st->model);
-    invert_m3(st->normalworld);
-    transpose_m3(st->normalworld);
-    st->matflag &= ~DRW_CALL_NORMALWORLD;
-  }
 }
 
 static void draw_geometry_prepare(DRWShadingGroup *shgroup, DRWCall *call)
@@ -847,10 +840,6 @@ static void draw_geometry_prepare(DRWShadingGroup *shgroup, DRWCall *call)
       GPU_shader_uniform_vector(
           shgroup->shader, shgroup->normalview, 9, 1, (float *)state->normalview);
     }
-    if (shgroup->normalworld != -1) {
-      GPU_shader_uniform_vector(
-          shgroup->shader, shgroup->normalworld, 9, 1, (float *)state->normalworld);
-    }
     if (shgroup->objectinfo != -1) {
       float objectinfo[4];
       objectinfo[0] = state->objectinfo[0];
@@ -865,7 +854,7 @@ static void draw_geometry_prepare(DRWShadingGroup *shgroup, DRWCall *call)
     }
   }
   else {
-    BLI_assert((shgroup->normalview == -1) && (shgroup->normalworld == -1));
+    BLI_assert((shgroup->normalview == -1));
     /* For instancing and batching. */
     float unitmat[4][4];
     unit_m4(unitmat);