Skip to content

Commit 2b87808

Browse files
committed
Change cameraEffects shader to use screenSpace vertex shader
Also NUKE `u_ModelViewProjectionMatrix` and `u_TextureMatrix`, because they have no effect there.
1 parent c962a5c commit 2b87808

File tree

6 files changed

+5
-70
lines changed

6 files changed

+5
-70
lines changed

src.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ set(GLSLSOURCELIST
158158
${ENGINE_DIR}/renderer/glsl_source/vertexSkinning_vp.glsl
159159
${ENGINE_DIR}/renderer/glsl_source/blur_fp.glsl
160160
${ENGINE_DIR}/renderer/glsl_source/cameraEffects_fp.glsl
161-
${ENGINE_DIR}/renderer/glsl_source/cameraEffects_vp.glsl
162161
${ENGINE_DIR}/renderer/glsl_source/computeLight_fp.glsl
163162
${ENGINE_DIR}/renderer/glsl_source/contrast_fp.glsl
164163
${ENGINE_DIR}/renderer/glsl_source/debugShadowMap_fp.glsl

src/engine/renderer/gl_shader.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3048,13 +3048,11 @@ void GLShader_contrast::SetShaderProgramUniforms( ShaderProgramDescriptor *shade
30483048

30493049
GLShader_cameraEffects::GLShader_cameraEffects( GLShaderManager *manager ) :
30503050
GLShader( "cameraEffects", ATTR_POSITION | ATTR_TEXCOORD, manager,
3051-
false, "cameraEffects", "cameraEffects" ),
3051+
false, "screenSpace", "cameraEffects" ),
30523052
u_ColorMap3D( this ),
30533053
u_CurrentMap( this ),
30543054
u_GlobalLightFactor( this ),
30553055
u_ColorModulate( this ),
3056-
u_TextureMatrix( this ),
3057-
u_ModelViewProjectionMatrix( this ),
30583056
u_Tonemap( this ),
30593057
u_TonemapParms( this ),
30603058
u_TonemapExposure( this ),

src/engine/renderer/gl_shader.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4566,8 +4566,6 @@ class GLShader_cameraEffects :
45664566
public u_CurrentMap,
45674567
public u_GlobalLightFactor,
45684568
public u_ColorModulate,
4569-
public u_TextureMatrix,
4570-
public u_ModelViewProjectionMatrix,
45714569
public u_Tonemap,
45724570
public u_TonemapParms,
45734571
public u_TonemapExposure,

src/engine/renderer/glsl_source/cameraEffects_fp.glsl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ uniform vec4 u_ColorModulate;
3232
uniform float u_GlobalLightFactor; // 1 / tr.identityLight
3333
uniform float u_InverseGamma;
3434

35-
IN(smooth) vec2 var_TexCoords;
36-
3735
DECLARE_OUTPUT(vec4)
3836

3937
/* x: contrast

src/engine/renderer/glsl_source/cameraEffects_vp.glsl

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/engine/renderer/tr_backend.cpp

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3258,26 +3258,14 @@ static void ComputeTonemapParams( const float contrast, const float highlightsCo
32583258
) * darkAreaPointLDR );
32593259
}
32603260

3261-
void RB_CameraPostFX()
3262-
{
3263-
matrix_t ortho;
3264-
3261+
void RB_CameraPostFX() {
32653262
GLimp_LogComment( "--- RB_CameraPostFX ---\n" );
32663263

32673264
if ( ( backEnd.refdef.rdflags & RDF_NOWORLDMODEL ) ||
3268-
backEnd.viewParms.portalLevel > 0 )
3269-
{
3265+
backEnd.viewParms.portalLevel > 0 ) {
32703266
return;
32713267
}
32723268

3273-
// set 2D virtual screen size
3274-
GL_PushMatrix();
3275-
MatrixOrthogonalProjection( ortho, backEnd.viewParms.viewportX,
3276-
backEnd.viewParms.viewportX + backEnd.viewParms.viewportWidth,
3277-
backEnd.viewParms.viewportY, backEnd.viewParms.viewportY + backEnd.viewParms.viewportHeight,
3278-
-99999, 99999 );
3279-
GL_LoadProjectionMatrix( ortho );
3280-
32813269
GL_State( GLS_DEPTHTEST_DISABLE );
32823270
GL_Cull( cullType_t::CT_TWO_SIDED );
32833271

@@ -3306,18 +3294,11 @@ void RB_CameraPostFX()
33063294
GL_BindToTMU( 0, tr.currentRenderImage[backEnd.currentMainFBO] )
33073295
);
33083296

3309-
if ( glConfig2.colorGrading )
3310-
{
3297+
if ( glConfig2.colorGrading ) {
33113298
gl_cameraEffectsShader->SetUniform_ColorMap3DBindless( GL_BindToTMU( 3, tr.colorGradeImage ) );
33123299
}
33133300

3314-
// draw viewport
3315-
Tess_InstantQuad( *gl_cameraEffectsShader,
3316-
backEnd.viewParms.viewportX, backEnd.viewParms.viewportY,
3317-
backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportHeight );
3318-
3319-
// go back to 3D
3320-
GL_PopMatrix();
3301+
Tess_InstantScreenSpaceQuad();
33213302

33223303
GL_CheckErrors();
33233304
}

0 commit comments

Comments
 (0)