diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-08 21:13:24 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-05-08 21:13:32 +0300 |
| commit | f2f62b184c67f6b548da1cd9c022c9383e541bb0 (patch) | |
| tree | 12896f71f49dda76cc6c430c2cdb5ae454d58762 /source/blender/gpu | |
| parent | bb41626ab3de31f670fcbe3365b61064e899c87f (diff) | |
DRW: Remove WorldNormalMatrix
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_shader_interface.h | 1 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader_interface.c | 1 | ||||
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/gpu/GPU_shader_interface.h b/source/blender/gpu/GPU_shader_interface.h index 1b10de45cee..fc7d9e22ea3 100644 --- a/source/blender/gpu/GPU_shader_interface.h +++ b/source/blender/gpu/GPU_shader_interface.h @@ -45,7 +45,6 @@ typedef enum { GPU_UNIFORM_VIEWPROJECTION_INV, /* mat4 ViewProjectionMatrixInverse */ GPU_UNIFORM_NORMAL, /* mat3 NormalMatrix */ - GPU_UNIFORM_WORLDNORMAL, /* mat3 WorldNormalMatrix */ GPU_UNIFORM_CAMERATEXCO, /* vec4 CameraTexCoFactors */ GPU_UNIFORM_ORCO, /* vec3 OrcoTexCoFactors[] */ diff --git a/source/blender/gpu/intern/gpu_shader_interface.c b/source/blender/gpu/intern/gpu_shader_interface.c index 207a218b5d1..97dbb80d736 100644 --- a/source/blender/gpu/intern/gpu_shader_interface.c +++ b/source/blender/gpu/intern/gpu_shader_interface.c @@ -61,7 +61,6 @@ static const char *BuiltinUniform_name(GPUUniformBuiltin u) [GPU_UNIFORM_VIEWPROJECTION_INV] = "ViewProjectionMatrixInverse", [GPU_UNIFORM_NORMAL] = "NormalMatrix", - [GPU_UNIFORM_WORLDNORMAL] = "WorldNormalMatrix", [GPU_UNIFORM_CAMERATEXCO] = "CameraTexCoFactors", [GPU_UNIFORM_ORCO] = "OrcoTexCoFactors", diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index ca05a9b6238..f03e30b55f7 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -1,7 +1,6 @@ uniform mat4 ModelViewMatrix; uniform mat4 ModelViewMatrixInverse; -uniform mat3 NormalMatrix; #ifndef USE_ATTR uniform mat4 ModelMatrix; |