Skip to content

Commit cfb929a

Browse files
illwieckzillwieckz
committed
renderer: drop LOG_GLSL_UNIFORMS and related GLimp_LogComment() calls
1 parent 68cfcb9 commit cfb929a

File tree

1 file changed

+0
-71
lines changed

1 file changed

+0
-71
lines changed

‎src/engine/renderer/gl_shader.h‎

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2626
#include "tr_local.h"
2727
#include <stdexcept>
2828

29-
#define LOG_GLSL_UNIFORMS 1
3029
#define USE_UNIFORM_FIREWALL 1
3130

3231
// *INDENT-OFF*
@@ -684,11 +683,6 @@ class GLUniform1i : protected GLUniform
684683
ASSERT_EQ( p, glState.currentProgram );
685684
}
686685

687-
#if defined( LOG_GLSL_UNIFORMS )
688-
GLIMP_LOGCOMMENT( "GLSL_SetUniform1i( %s, shader: %s, value: %d )",
689-
this->GetName(), _shader->GetName().c_str(), value );
690-
#endif
691-
692686
if ( _shader->UseMaterialSystem() && !_global ) {
693687
currentValue = value;
694688
return;
@@ -734,11 +728,6 @@ class GLUniform1ui : protected GLUniform {
734728
ASSERT_EQ( p, glState.currentProgram );
735729
}
736730

737-
#if defined( LOG_GLSL_UNIFORMS )
738-
GLIMP_LOGCOMMENT( "GLSL_SetUniform1i( %s, shader: %s, value: %d )",
739-
this->GetName(), _shader->GetName().c_str(), value );
740-
#endif
741-
742731
if ( _shader->UseMaterialSystem() && !_global ) {
743732
currentValue = value;
744733
return;
@@ -783,11 +772,6 @@ class GLUniform1Bool : protected GLUniform {
783772
ASSERT_EQ( p, glState.currentProgram );
784773
}
785774

786-
#if defined( LOG_GLSL_UNIFORMS )
787-
GLIMP_LOGCOMMENT( "GLSL_SetUniform1i( %s, shader: %s, value: %d )",
788-
this->GetName(), _shader->GetName().c_str(), value );
789-
#endif
790-
791775
if ( _shader->UseMaterialSystem() && !_global ) {
792776
currentValue = value;
793777
return;
@@ -835,11 +819,6 @@ class GLUniform1f : protected GLUniform
835819
ASSERT_EQ( p, glState.currentProgram );
836820
}
837821

838-
#if defined( LOG_GLSL_UNIFORMS )
839-
GLIMP_LOGCOMMENT( "GLSL_SetUniform1f( %s, shader: %s, value: %f )",
840-
this->GetName(), _shader->GetName().c_str(), value );
841-
#endif
842-
843822
if ( _shader->UseMaterialSystem() && !_global ) {
844823
currentValue = value;
845824
return;
@@ -889,11 +868,6 @@ class GLUniform1fv : protected GLUniform
889868
ASSERT_EQ( p, glState.currentProgram );
890869
}
891870

892-
#if defined( LOG_GLSL_UNIFORMS )
893-
GLIMP_LOGCOMMENT( "GLSL_SetUniform1fv( %s, shader: %s, numFloats: %d )",
894-
this->GetName(), _shader->GetName().c_str(), numFloats );
895-
#endif
896-
897871
if ( _shader->UseMaterialSystem() && !_global ) {
898872
memcpy( currentValue.data(), f, numFloats * sizeof( float ) );
899873
return;
@@ -929,11 +903,6 @@ class GLUniform2f : protected GLUniform
929903
ASSERT_EQ( p, glState.currentProgram );
930904
}
931905

932-
#if defined( LOG_GLSL_UNIFORMS )
933-
GLIMP_LOGCOMMENT( "GLSL_SetUniform2f( %s, shader: %s, value: [ %f, %f ] )",
934-
this->GetName(), _shader->GetName().c_str(), v[ 0 ], v[ 1 ] );
935-
#endif
936-
937906
if ( _shader->UseMaterialSystem() && !_global ) {
938907
Vector2Copy( v, currentValue );
939908
return;
@@ -986,11 +955,6 @@ class GLUniform3f : protected GLUniform
986955
ASSERT_EQ( p, glState.currentProgram );
987956
}
988957

989-
#if defined( LOG_GLSL_UNIFORMS )
990-
GLIMP_LOGCOMMENT( "GLSL_SetUniform3f( %s, shader: %s, value: [ %f, %f, %f ] )",
991-
this->GetName(), _shader->GetName().c_str(), v[ 0 ], v[ 1 ], v[ 2 ] );
992-
#endif
993-
994958
if ( _shader->UseMaterialSystem() && !_global ) {
995959
VectorCopy( v, currentValue );
996960
return;
@@ -1043,11 +1007,6 @@ class GLUniform4f : protected GLUniform
10431007
ASSERT_EQ( p, glState.currentProgram );
10441008
}
10451009

1046-
#if defined( LOG_GLSL_UNIFORMS )
1047-
GLIMP_LOGCOMMENT( "GLSL_SetUniform4f( %s, shader: %s, value: [ %f, %f, %f, %f ] )",
1048-
this->GetName(), _shader->GetName().c_str(), v[ 0 ], v[ 1 ], v[ 2 ], v[ 3 ] );
1049-
#endif
1050-
10511010
if ( _shader->UseMaterialSystem() && !_global ) {
10521011
Vector4Copy( v, currentValue );
10531012
return;
@@ -1097,11 +1056,6 @@ class GLUniform4fv : protected GLUniform
10971056
ASSERT_EQ( p, glState.currentProgram );
10981057
}
10991058

1100-
#if defined( LOG_GLSL_UNIFORMS )
1101-
GLIMP_LOGCOMMENT( "GLSL_SetUniform4fv( %s, shader: %s, numV: %d )",
1102-
this->GetName(), _shader->GetName().c_str(), numV );
1103-
#endif
1104-
11051059
if ( _shader->UseMaterialSystem() && !_global ) {
11061060
memcpy( currentValue.data(), v, numV * sizeof( vec4_t ) );
11071061
return;
@@ -1137,14 +1091,6 @@ class GLUniformMatrix4f : protected GLUniform
11371091
ASSERT_EQ( p, glState.currentProgram );
11381092
}
11391093

1140-
#if defined( LOG_GLSL_UNIFORMS )
1141-
GLIMP_LOGCOMMENT( "GLSL_SetUniformMatrix4f( %s, shader: %s, transpose: %d, "
1142-
"[ %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f ] )",
1143-
this->GetName(), _shader->GetName().c_str(), transpose,
1144-
m[ 0 ], m[ 1 ], m[ 2 ], m[ 3 ], m[ 4 ], m[ 5 ], m[ 6 ], m[ 7 ], m[ 8 ],
1145-
m[ 9 ], m[ 10 ], m[ 11 ], m[ 12 ], m[ 13 ], m[ 14 ], m[ 15 ] );
1146-
#endif
1147-
11481094
if ( _shader->UseMaterialSystem() && !_global ) {
11491095
MatrixCopy( m, currentValue );
11501096
return;
@@ -1190,13 +1136,6 @@ class GLUniformMatrix32f : protected GLUniform {
11901136
ASSERT_EQ( p, glState.currentProgram );
11911137
}
11921138

1193-
#if defined( LOG_GLSL_UNIFORMS )
1194-
GLIMP_LOGCOMMENT( "GLSL_SetUniformMatrix32f( %s, shader: %s, transpose: %d, "
1195-
"[ %f, %f, %f, %f, %f, %f ] )",
1196-
this->GetName(), _shader->GetName().c_str(), transpose,
1197-
m[0], m[1], m[2], m[3], m[4], m[5] );
1198-
#endif
1199-
12001139
if ( _shader->UseMaterialSystem() && !_global ) {
12011140
memcpy( currentValue, m, 6 * sizeof( float ) );
12021141
return;
@@ -1235,11 +1174,6 @@ class GLUniformMatrix4fv : protected GLUniform
12351174
ASSERT_EQ( p, glState.currentProgram );
12361175
}
12371176

1238-
#if defined( LOG_GLSL_UNIFORMS )
1239-
GLIMP_LOGCOMMENT( "GLSL_SetUniformMatrix4fv( %s, shader: %s, numMatrices: %d, transpose: %d )",
1240-
this->GetName(), _shader->GetName().c_str(), numMatrices, transpose );
1241-
#endif
1242-
12431177
if ( _shader->UseMaterialSystem() && !_global ) {
12441178
memcpy( currentValue.data(), m, numMatrices * sizeof( matrix_t ) );
12451179
return;
@@ -1274,11 +1208,6 @@ class GLUniformMatrix34fv : protected GLUniform
12741208
ASSERT_EQ( p, glState.currentProgram );
12751209
}
12761210

1277-
#if defined( LOG_GLSL_UNIFORMS )
1278-
GLIMP_LOGCOMMENT( "GLSL_SetUniformMatrix34fv( %s, shader: %s, numMatrices: %d, transpose: %d )",
1279-
this->GetName(), _shader->GetName().c_str(), numMatrices, transpose );
1280-
#endif
1281-
12821211
if ( _shader->UseMaterialSystem() && !_global ) {
12831212
memcpy( currentValue.data(), m, numMatrices * sizeof( matrix_t ) );
12841213
return;

0 commit comments

Comments
 (0)