diff options
| author | lhofhansl <lhofhansl@yahoo.com> | 2016-11-04 10:12:45 -0700 |
|---|---|---|
| committer | est31 <est31@users.noreply.github.com> | 2016-11-04 18:12:45 +0100 |
| commit | 6bb43472082d8003a6cd140c1221c81005fdd752 (patch) | |
| tree | 7136b5f7947183f45b5c160c53f76b70f523eaac | |
| parent | dde66a82ed06c4887ce0e63ef5f0b8d3bce2ed74 (diff) | |
| download | minetest-6bb43472082d8003a6cd140c1221c81005fdd752.tar.gz minetest-6bb43472082d8003a6cd140c1221c81005fdd752.tar.bz2 minetest-6bb43472082d8003a6cd140c1221c81005fdd752.zip | |
Remove unused shader matrices. (#4723)
| -rw-r--r-- | client/shaders/minimap_shader/opengl_vertex.glsl | 2 | ||||
| -rw-r--r-- | client/shaders/nodes_shader/opengl_vertex.glsl | 2 | ||||
| -rw-r--r-- | client/shaders/water_surface_shader/opengl_vertex.glsl | 2 | ||||
| -rw-r--r-- | client/shaders/wielded_shader/opengl_vertex.glsl | 2 | ||||
| -rw-r--r-- | src/shader.cpp | 16 |
5 files changed, 0 insertions, 24 deletions
diff --git a/client/shaders/minimap_shader/opengl_vertex.glsl b/client/shaders/minimap_shader/opengl_vertex.glsl index 06df5a3cf..88f9356d5 100644 --- a/client/shaders/minimap_shader/opengl_vertex.glsl +++ b/client/shaders/minimap_shader/opengl_vertex.glsl @@ -1,6 +1,4 @@ uniform mat4 mWorldViewProj; -uniform mat4 mInvWorld; -uniform mat4 mTransWorld; uniform mat4 mWorld; void main(void) diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl index 28c5f197e..44c48cc4c 100644 --- a/client/shaders/nodes_shader/opengl_vertex.glsl +++ b/client/shaders/nodes_shader/opengl_vertex.glsl @@ -1,6 +1,4 @@ uniform mat4 mWorldViewProj; -uniform mat4 mInvWorld; -uniform mat4 mTransWorld; uniform mat4 mWorld; uniform float dayNightRatio; diff --git a/client/shaders/water_surface_shader/opengl_vertex.glsl b/client/shaders/water_surface_shader/opengl_vertex.glsl index 9b461f4c1..a930e7b8f 100644 --- a/client/shaders/water_surface_shader/opengl_vertex.glsl +++ b/client/shaders/water_surface_shader/opengl_vertex.glsl @@ -1,6 +1,4 @@ uniform mat4 mWorldViewProj; -uniform mat4 mInvWorld; -uniform mat4 mTransWorld; uniform mat4 mWorld; uniform float dayNightRatio; diff --git a/client/shaders/wielded_shader/opengl_vertex.glsl b/client/shaders/wielded_shader/opengl_vertex.glsl index c33b0a7d3..86c626896 100644 --- a/client/shaders/wielded_shader/opengl_vertex.glsl +++ b/client/shaders/wielded_shader/opengl_vertex.glsl @@ -1,6 +1,4 @@ uniform mat4 mWorldViewProj; -uniform mat4 mInvWorld; -uniform mat4 mTransWorld; uniform mat4 mWorld; uniform float dayNightRatio; diff --git a/src/shader.cpp b/src/shader.cpp index e13ab8df3..b0131c952 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -219,14 +219,6 @@ public: video::IVideoDriver *driver = services->getVideoDriver(); sanity_check(driver); - // set inverted world matrix - core::matrix4 invWorld = driver->getTransform(video::ETS_WORLD); - invWorld.makeInverse(); - if(is_highlevel) - services->setVertexShaderConstant("mInvWorld", invWorld.pointer(), 16); - else - services->setVertexShaderConstant(invWorld.pointer(), 0, 4); - // set clip matrix core::matrix4 worldViewProj; worldViewProj = driver->getTransform(video::ETS_PROJECTION); @@ -237,14 +229,6 @@ public: else services->setVertexShaderConstant(worldViewProj.pointer(), 4, 4); - // set transposed world matrix - core::matrix4 transWorld = driver->getTransform(video::ETS_WORLD); - transWorld = transWorld.getTransposed(); - if(is_highlevel) - services->setVertexShaderConstant("mTransWorld", transWorld.pointer(), 16); - else - services->setVertexShaderConstant(transWorld.pointer(), 8, 4); - // set world matrix core::matrix4 world = driver->getTransform(video::ETS_WORLD); if(is_highlevel) |