From 20421ef9528c562a39b92e18d3e1f858df228953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 14 May 2019 00:48:17 +0200 Subject: Cleanup: DRW: Move ModelMatrix declaration to common_view_lib --- source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl | 5 ----- source/blender/draw/engines/eevee/shaders/prepass_vert.glsl | 3 --- source/blender/draw/engines/eevee/shaders/shadow_vert.glsl | 4 ---- .../draw/engines/gpencil/shaders/gpencil_edit_point_vert.glsl | 1 - source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl | 1 - source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl | 2 -- source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl | 1 - .../draw/engines/workbench/shaders/workbench_prepass_vert.glsl | 2 -- .../draw/engines/workbench/shaders/workbench_shadow_vert.glsl | 2 -- .../draw/engines/workbench/shaders/workbench_volume_frag.glsl | 3 --- .../draw/engines/workbench/shaders/workbench_volume_vert.glsl | 2 -- 11 files changed, 26 deletions(-) (limited to 'source/blender/draw/engines') diff --git a/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl b/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl index 4243d0ef870..0a2785bafca 100644 --- a/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl @@ -1,9 +1,4 @@ -#ifndef USE_ATTR -uniform mat4 ModelMatrix; -uniform mat4 ModelMatrixInverse; -#endif - #ifndef HAIR_SHADER in vec3 pos; in vec3 nor; diff --git a/source/blender/draw/engines/eevee/shaders/prepass_vert.glsl b/source/blender/draw/engines/eevee/shaders/prepass_vert.glsl index 7f154c9130a..fe274f59167 100644 --- a/source/blender/draw/engines/eevee/shaders/prepass_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/prepass_vert.glsl @@ -1,7 +1,4 @@ -uniform mat4 ModelMatrix; -uniform mat4 ModelMatrixInverse; - #ifdef CLIP_PLANES /* keep in sync with DRWManager.view_data */ layout(std140) uniform clip_block diff --git a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl index 4f59725fcf8..7dd9af310ed 100644 --- a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl @@ -1,8 +1,4 @@ -#ifndef USE_ATTR -uniform mat4 ModelMatrix; -#endif - in vec3 pos; in vec3 nor; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_edit_point_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_edit_point_vert.glsl index 12e7f3ee516..a1cfb2ae4ae 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_edit_point_vert.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_edit_point_vert.glsl @@ -1,4 +1,3 @@ -uniform mat4 ModelMatrix; in vec3 pos; in vec4 color; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl index 4517b68b5e6..eb452f4c660 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl @@ -1,4 +1,3 @@ -uniform mat4 ModelMatrix; in vec3 pos; in vec4 color; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl index 355d5ef1b0f..ef8b361373f 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_point_vert.glsl @@ -1,6 +1,4 @@ -uniform mat4 ModelMatrix; - uniform float pixsize; /* rv3d->pixsize */ uniform int keep_size; uniform float objscale; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl index 4e2ec784385..c7089f357f9 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_vert.glsl @@ -1,4 +1,3 @@ -uniform mat4 ModelMatrix; uniform float pixsize; /* rv3d->pixsize */ uniform int keep_size; diff --git a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl index 2955bcb9cca..5d4153999c0 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_prepass_vert.glsl @@ -1,5 +1,3 @@ -uniform mat4 ModelMatrix; -uniform mat4 ModelMatrixInverse; #ifndef HAIR_SHADER in vec3 pos; diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl index 85145a2dcdc..e07f87525e2 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_vert.glsl @@ -1,7 +1,5 @@ #define INFINITE 1000.0 -uniform mat4 ModelMatrix; - uniform vec3 lightDirection = vec3(0.57, 0.57, -0.57); uniform float lightDistance = 1e4; diff --git a/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl index cef405d12d3..848cd49bf53 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_volume_frag.glsl @@ -1,7 +1,4 @@ -uniform mat4 ModelMatrix; -uniform mat4 ModelMatrixInverse; - uniform vec3 OrcoTexCoFactors[2]; uniform sampler2D depthBuffer; diff --git a/source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl b/source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl index 1834173fee9..6f0bb56fafd 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_volume_vert.glsl @@ -1,6 +1,4 @@ -uniform mat4 ModelMatrix; - uniform vec3 OrcoTexCoFactors[2]; uniform float slicePosition; uniform int sliceAxis; /* -1 is no slice, 0 is X, 1 is Y, 2 is Z. */ -- cgit v1.2.3