Skip to content

Commit 64f48dd

Browse files
VReaperVVReaperV
committed
Clean-up
1 parent 5e26f8f commit 64f48dd

File tree

6 files changed

+18
-26
lines changed

6 files changed

+18
-26
lines changed

‎src/engine/renderer/gl_shader.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,7 @@ GLuint GLShaderManager::SortUniforms( std::vector<GLUniform*>& uniforms ) {
21842184
auto iterNext = FindUniformForOffset( uniformQueue, structSize );
21852185
if ( iterNext == uniformQueue.end() ) {
21862186
// add 1 unit of padding
2187-
ASSERT( !_materialSystemUniforms.back()->_components); // array WriteToBuffer impls don't handle padding correctly
2187+
ASSERT( !uniforms.back()->_components ); // array WriteToBuffer impls don't handle padding correctly
21882188
++structSize;
21892189
++uniforms.back()->_std430Size;
21902190
} else {
@@ -3078,7 +3078,6 @@ GlobalUBOProxy::GlobalUBOProxy() :
30783078
u_ColorMap3D( this ),
30793079
u_DepthMap( this ),
30803080
u_PortalMap( this ),
3081-
u_FogMap( this ),
30823081
u_DepthTile1( this ),
30833082
u_DepthTile2( this ),
30843083
u_LightTiles( this ),

‎src/engine/renderer/gl_shader.h‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ class GLUniformSampler : protected GLUniform {
533533
ShaderProgramDescriptor* p = _shader->GetProgram();
534534

535535
if ( !_shader->UseMaterialSystem() ) {
536-
ASSERT_EQ( p, glState.currentProgram );
536+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
537537
}
538538

539539
return p->uniformLocations[_locationIndex];
@@ -631,7 +631,7 @@ class GLUniform1i : protected GLUniform
631631
return;
632632
}
633633

634-
ASSERT_EQ( p, glState.currentProgram );
634+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
635635

636636
#if defined( USE_UNIFORM_FIREWALL )
637637
int *firewall = ( int * ) &p->uniformFirewall[ _firewallIndex ];
@@ -675,7 +675,7 @@ class GLUniform1ui : protected GLUniform {
675675
return;
676676
}
677677

678-
ASSERT_EQ( p, glState.currentProgram );
678+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
679679

680680
#if defined( USE_UNIFORM_FIREWALL )
681681
uint* firewall = ( uint* ) &p->uniformFirewall[_firewallIndex];
@@ -718,7 +718,7 @@ class GLUniform1Bool : protected GLUniform {
718718
return;
719719
}
720720

721-
ASSERT_EQ( p, glState.currentProgram );
721+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
722722

723723
#if defined( USE_UNIFORM_FIREWALL )
724724
int* firewall = ( int* ) &p->uniformFirewall[_firewallIndex];
@@ -764,7 +764,7 @@ class GLUniform1f : protected GLUniform
764764
return;
765765
}
766766

767-
ASSERT_EQ( p, glState.currentProgram );
767+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
768768

769769
#if defined( USE_UNIFORM_FIREWALL )
770770
float *firewall = ( float * ) &p->uniformFirewall[ _firewallIndex ];
@@ -812,7 +812,7 @@ class GLUniform1fv : protected GLUniform
812812
return;
813813
}
814814

815-
ASSERT_EQ( p, glState.currentProgram );
815+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
816816

817817
glUniform1fv( p->uniformLocations[ _locationIndex ], numFloats, f );
818818
}
@@ -841,7 +841,7 @@ class GLUniform2f : protected GLUniform
841841
return;
842842
}
843843

844-
ASSERT_EQ( p, glState.currentProgram );
844+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
845845

846846
#if defined( USE_UNIFORM_FIREWALL )
847847
vec2_t *firewall = ( vec2_t * ) &p->uniformFirewall[ _firewallIndex ];
@@ -892,7 +892,7 @@ class GLUniform3f : protected GLUniform
892892
return;
893893
}
894894

895-
ASSERT_EQ( p, glState.currentProgram );
895+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
896896

897897
#if defined( USE_UNIFORM_FIREWALL )
898898
vec3_t *firewall = ( vec3_t * ) &p->uniformFirewall[ _firewallIndex ];
@@ -943,7 +943,7 @@ class GLUniform4f : protected GLUniform
943943
return;
944944
}
945945

946-
ASSERT_EQ( p, glState.currentProgram );
946+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
947947

948948
#if defined( USE_UNIFORM_FIREWALL )
949949
vec4_t *firewall = ( vec4_t * ) &p->uniformFirewall[ _firewallIndex ];
@@ -991,7 +991,7 @@ class GLUniform4fv : protected GLUniform
991991
return;
992992
}
993993

994-
ASSERT_EQ( p, glState.currentProgram );
994+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
995995

996996
glUniform4fv( p->uniformLocations[ _locationIndex ], numV, &v[ 0 ][ 0 ] );
997997
}
@@ -1025,7 +1025,7 @@ class GLUniformMatrix4f : protected GLUniform
10251025
return;
10261026
}
10271027

1028-
ASSERT_EQ( p, glState.currentProgram );
1028+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
10291029

10301030
#if defined( USE_UNIFORM_FIREWALL )
10311031
matrix_t *firewall = ( matrix_t * ) &p->uniformFirewall[ _firewallIndex ];
@@ -1069,7 +1069,7 @@ class GLUniformMatrix32f : protected GLUniform {
10691069
return;
10701070
}
10711071

1072-
ASSERT_EQ( p, glState.currentProgram );
1072+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
10731073

10741074
glUniformMatrix3x2fv( p->uniformLocations[_locationIndex], 1, transpose, m );
10751075
}
@@ -1101,7 +1101,7 @@ class GLUniformMatrix4fv : protected GLUniform
11011101
return;
11021102
}
11031103

1104-
ASSERT_EQ( p, glState.currentProgram );
1104+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
11051105

11061106
glUniformMatrix4fv( p->uniformLocations[ _locationIndex ], numMatrices, transpose, &m[ 0 ][ 0 ] );
11071107
}
@@ -1134,7 +1134,7 @@ class GLUniformMatrix34fv : protected GLUniform
11341134
return;
11351135
}
11361136

1137-
ASSERT_EQ( p, glState.currentProgram );
1137+
DAEMON_ASSERT_EQ( p, glState.currentProgram );
11381138

11391139
glUniformMatrix3x4fv( p->uniformLocations[ _locationIndex ], numMatrices, transpose, m );
11401140
}
@@ -3793,7 +3793,6 @@ class GlobalUBOProxy :
37933793
public u_ColorMap3D,
37943794
public u_DepthMap,
37953795
public u_PortalMap,
3796-
public u_FogMap,
37973796
public u_DepthTile1,
37983797
public u_DepthTile2,
37993798
public u_LightTiles,

‎src/engine/renderer/glsl_source/fogGlobal_fp.glsl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2525
#insert common
2626
#insert fogEquation_fp
2727

28+
#define DEPTHMAP_GLSL
29+
2830
uniform sampler2D u_DepthMap;
2931

3032
uniform colorPack u_Color;

‎src/engine/renderer/glsl_source/fogQuake3_fp.glsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2424

2525
#insert fogEquation_fp
2626

27-
#define FOGQUAKE3_GLSL
27+
#define DEPTHMAP_GLSL
2828

2929
uniform float u_FogEyeT;
3030

‎src/engine/renderer/glsl_source/material_fp.glsl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5252
sampler3D u_ColorMap3D = sampler3D( u_ColorMap3D_initial );
5353
#endif // !CAMERAEFFECTS_GLSL
5454

55-
#if defined(FOGQUAKE3_GLSL)
56-
sampler2D u_FogMap = sampler2D( u_FogMap_initial );
57-
#endif // !FOGQUAKE3_GLSL
58-
5955
#if defined(LIQUID_GLSL)
6056
sampler2D u_PortalMap = sampler2D( u_PortalMap_initial );
6157
#endif // !LIQUID_GLSL

‎src/engine/renderer/tr_bsp.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4663,10 +4663,6 @@ static void SetConstUniforms() {
46634663

46644664
globalUBOProxy->SetUniform_PortalMapBindless( GL_BindToTMU( 1, tr.portalRenderImage ) );
46654665

4666-
globalUBOProxy->SetUniform_FogMapBindless(
4667-
GL_BindToTMU( 0, tr.fogImage )
4668-
);
4669-
46704666
if ( glConfig.realtimeLighting ) {
46714667
globalUBOProxy->SetUniform_DepthTile1Bindless(
46724668
GL_BindToTMU( 0, tr.depthtile1RenderImage )

0 commit comments

Comments
 (0)