BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Remove unused shader matrices. (#4723)

Browse Source
This commit is contained in:
lhofhansl 2016-11-04 10:12:45 -07:00 committed by est31
parent dde66a82ed
commit 6bb4347208
5 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/shaders/minimap_shader/opengl_vertex.glsl
View File

@ -1,6 +1,4 @@
uniform mat4 mWorldViewProj; uniform mat4 mWorldViewProj;
uniform mat4 mInvWorld;
uniform mat4 mTransWorld;
uniform mat4 mWorld; uniform mat4 mWorld;
void main(void) void main(void)

2
client/shaders/nodes_shader/opengl_vertex.glsl
View File

@ -1,6 +1,4 @@
uniform mat4 mWorldViewProj; uniform mat4 mWorldViewProj;
uniform mat4 mInvWorld;
uniform mat4 mTransWorld;
uniform mat4 mWorld; uniform mat4 mWorld;
uniform float dayNightRatio; uniform float dayNightRatio;

2
client/shaders/water_surface_shader/opengl_vertex.glsl
View File

@ -1,6 +1,4 @@
uniform mat4 mWorldViewProj; uniform mat4 mWorldViewProj;
uniform mat4 mInvWorld;
uniform mat4 mTransWorld;
uniform mat4 mWorld; uniform mat4 mWorld;
uniform float dayNightRatio; uniform float dayNightRatio;

2
client/shaders/wielded_shader/opengl_vertex.glsl
View File

@ -1,6 +1,4 @@
uniform mat4 mWorldViewProj; uniform mat4 mWorldViewProj;
uniform mat4 mInvWorld;
uniform mat4 mTransWorld;
uniform mat4 mWorld; uniform mat4 mWorld;
uniform float dayNightRatio; uniform float dayNightRatio;

16
src/shader.cpp
View File

@ -219,14 +219,6 @@ public:
video::IVideoDriver *driver = services->getVideoDriver(); video::IVideoDriver *driver = services->getVideoDriver();
sanity_check(driver); 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 // set clip matrix
core::matrix4 worldViewProj; core::matrix4 worldViewProj;
worldViewProj = driver->getTransform(video::ETS_PROJECTION); worldViewProj = driver->getTransform(video::ETS_PROJECTION);
@ -237,14 +229,6 @@ public:
else else
services->setVertexShaderConstant(worldViewProj.pointer(), 4, 4); 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 // set world matrix
core::matrix4 world = driver->getTransform(video::ETS_WORLD); core::matrix4 world = driver->getTransform(video::ETS_WORLD);
if(is_highlevel) if(is_highlevel)