diff --git a/src/engine/renderer/Material.cpp b/src/engine/renderer/Material.cpp index 796d72b908..f28352b6a8 100644 --- a/src/engine/renderer/Material.cpp +++ b/src/engine/renderer/Material.cpp @@ -183,7 +183,7 @@ static void ComputeDynamics( shaderStage_t* pStage ) { pStage->dynamic = pStage->dynamic || pStage->alphaExp.numOps || pStage->alphaTestExp.numOps; pStage->dynamic = pStage->dynamic || pStage->rgbExp.numOps || pStage->redExp.numOps || pStage->greenExp.numOps || pStage->blueExp.numOps; pStage->dynamic = pStage->dynamic || pStage->deformMagnitudeExp.numOps; - pStage->dynamic = pStage->dynamic || pStage->depthScaleExp.numOps || pStage->etaExp.numOps || pStage->etaDeltaExp.numOps + pStage->dynamic = pStage->dynamic || pStage->depthScaleExp.numOps || pStage->fogDensityExp.numOps || pStage->fresnelBiasExp.numOps || pStage->fresnelPowerExp.numOps || pStage->fresnelScaleExp.numOps || pStage->normalIntensityExp.numOps || pStage->refractionIndexExp.numOps; @@ -1138,8 +1138,6 @@ void BindShaderSkybox( Material* material ) { gl_skyboxShaderMaterial->BindProgram( material->deformIndex ); // Set shader uniforms. - gl_skyboxShaderMaterial->SetUniform_ViewOrigin( backEnd.viewParms.orientation.origin ); - gl_skyboxShaderMaterial->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix ); gl_skyboxShaderMaterial->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[glState.stackIndex] ); } @@ -1156,7 +1154,6 @@ void BindShaderHeatHaze( Material* material ) { gl_heatHazeShaderMaterial->BindProgram( material->deformIndex ); // Set shader uniforms. - gl_heatHazeShaderMaterial->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix ); gl_heatHazeShaderMaterial->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[glState.stackIndex] ); gl_heatHazeShaderMaterial->SetUniform_ModelViewMatrixTranspose( glState.modelViewMatrix[glState.stackIndex] ); diff --git a/src/engine/renderer/gl_shader.cpp b/src/engine/renderer/gl_shader.cpp index 2e12af82d7..85bcee317d 100644 --- a/src/engine/renderer/gl_shader.cpp +++ b/src/engine/renderer/gl_shader.cpp @@ -2578,7 +2578,6 @@ GLShader_shadowFill::GLShader_shadowFill( GLShaderManager *manager ) : GLShader( "shadowFill", ATTR_POSITION | ATTR_TEXCOORD | ATTR_QTANGENT, manager ), u_ColorMap( this ), u_TextureMatrix( this ), - u_ViewOrigin( this ), u_AlphaThreshold( this ), u_LightOrigin( this ), u_LightRadius( this ), @@ -2658,11 +2657,9 @@ GLShader_skybox::GLShader_skybox( GLShaderManager *manager ) : u_ColorMapCube( this ), u_CloudMap( this ), u_TextureMatrix( this ), - u_ViewOrigin( this ), u_CloudHeight( this ), u_UseCloudMap( this ), u_AlphaThreshold( this ), - u_ModelMatrix( this ), u_ModelViewProjectionMatrix( this ) { } @@ -2678,11 +2675,9 @@ GLShader_skyboxMaterial::GLShader_skyboxMaterial( GLShaderManager* manager ) : u_ColorMapCube( this ), u_CloudMap( this ), u_TextureMatrix( this ), - u_ViewOrigin( this ), u_CloudHeight( this ), u_UseCloudMap( this ), u_AlphaThreshold( this ), - u_ModelMatrix( this ), u_ModelViewProjectionMatrix( this ) {} @@ -2733,13 +2728,10 @@ GLShader_fogGlobal::GLShader_fogGlobal( GLShaderManager *manager ) : GLShader( "fogGlobal", ATTR_POSITION, manager ), u_ColorMap( this ), u_DepthMap( this ), - u_ViewOrigin( this ), - u_ViewMatrix( this ), u_ModelViewProjectionMatrix( this ), u_UnprojectMatrix( this ), u_Color( this ), - u_FogDistanceVector( this ), - u_FogDepthVector( this ) + u_FogDistanceVector( this ) { } @@ -2755,15 +2747,10 @@ GLShader_heatHaze::GLShader_heatHaze( GLShaderManager *manager ) : u_NormalMap( this ), u_HeightMap( this ), u_TextureMatrix( this ), - u_ViewOrigin( this ), - u_ViewUp( this ), u_DeformMagnitude( this ), - u_ModelMatrix( this ), u_ModelViewProjectionMatrix( this ), u_ModelViewMatrixTranspose( this ), u_ProjectionMatrixTranspose( this ), - u_ColorModulate( this ), - u_Color( this ), u_Bones( this ), u_NormalScale( this ), u_VertexInterpolation( this ), @@ -2786,16 +2773,11 @@ GLShader_heatHazeMaterial::GLShader_heatHazeMaterial( GLShaderManager* manager ) u_NormalMap( this ), u_HeightMap( this ), u_TextureMatrix( this ), - u_ViewOrigin( this ), - u_ViewUp( this ), u_DeformEnable( this ), u_DeformMagnitude( this ), - u_ModelMatrix( this ), u_ModelViewProjectionMatrix( this ), u_ModelViewMatrixTranspose( this ), u_ProjectionMatrixTranspose( this ), - u_ColorModulate( this ), - u_Color( this ), u_NormalScale( this ), GLDeformStage( this ) { @@ -2862,7 +2844,6 @@ GLShader_cameraEffects::GLShader_cameraEffects( GLShaderManager *manager ) : u_ColorModulate( this ), u_TextureMatrix( this ), u_ModelViewProjectionMatrix( this ), - u_DeformMagnitude( this ), u_InverseGamma( this ) { } diff --git a/src/engine/renderer/gl_shader.h b/src/engine/renderer/gl_shader.h index c119c872a6..a37c015da4 100644 --- a/src/engine/renderer/gl_shader.h +++ b/src/engine/renderer/gl_shader.h @@ -4240,7 +4240,6 @@ class GLShader_shadowFill : public GLShader, public u_ColorMap, public u_TextureMatrix, - public u_ViewOrigin, public u_AlphaThreshold, public u_LightOrigin, public u_LightRadius, @@ -4311,11 +4310,9 @@ class GLShader_skybox : public u_ColorMapCube, public u_CloudMap, public u_TextureMatrix, - public u_ViewOrigin, public u_CloudHeight, public u_UseCloudMap, public u_AlphaThreshold, - public u_ModelMatrix, public u_ModelViewProjectionMatrix { public: @@ -4328,11 +4325,9 @@ class GLShader_skyboxMaterial : public u_ColorMapCube, public u_CloudMap, public u_TextureMatrix, - public u_ViewOrigin, public u_CloudHeight, public u_UseCloudMap, public u_AlphaThreshold, - public u_ModelMatrix, public u_ModelViewProjectionMatrix { public: GLShader_skyboxMaterial( GLShaderManager* manager ); @@ -4378,13 +4373,10 @@ class GLShader_fogGlobal : public GLShader, public u_ColorMap, public u_DepthMap, - public u_ViewOrigin, - public u_ViewMatrix, public u_ModelViewProjectionMatrix, public u_UnprojectMatrix, public u_Color, - public u_FogDistanceVector, - public u_FogDepthVector + public u_FogDistanceVector { public: GLShader_fogGlobal( GLShaderManager *manager ); @@ -4397,15 +4389,10 @@ class GLShader_heatHaze : public u_NormalMap, public u_HeightMap, public u_TextureMatrix, - public u_ViewOrigin, - public u_ViewUp, public u_DeformMagnitude, - public u_ModelMatrix, public u_ModelViewProjectionMatrix, public u_ModelViewMatrixTranspose, public u_ProjectionMatrixTranspose, - public u_ColorModulate, - public u_Color, public u_Bones, public u_NormalScale, public u_VertexInterpolation, @@ -4424,16 +4411,11 @@ class GLShader_heatHazeMaterial : public u_NormalMap, public u_HeightMap, public u_TextureMatrix, - public u_ViewOrigin, - public u_ViewUp, public u_DeformEnable, public u_DeformMagnitude, - public u_ModelMatrix, public u_ModelViewProjectionMatrix, public u_ModelViewMatrixTranspose, public u_ProjectionMatrixTranspose, - public u_ColorModulate, - public u_Color, public u_NormalScale, public GLDeformStage { @@ -4490,7 +4472,6 @@ class GLShader_cameraEffects : public u_ColorModulate, public u_TextureMatrix, public u_ModelViewProjectionMatrix, - public u_DeformMagnitude, public u_InverseGamma { public: diff --git a/src/engine/renderer/glsl_source/depthtile1_fp.glsl b/src/engine/renderer/glsl_source/depthtile1_fp.glsl index b8f4db2e53..31798e0582 100644 --- a/src/engine/renderer/glsl_source/depthtile1_fp.glsl +++ b/src/engine/renderer/glsl_source/depthtile1_fp.glsl @@ -37,8 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. uniform sampler2D u_DepthMap; IN(flat) vec3 unprojectionParams; -uniform vec3 u_zFar; - const vec2 pixelScale = 1 / r_FBufSize; DECLARE_OUTPUT(vec4) diff --git a/src/engine/renderer/glsl_source/fogGlobal_fp.glsl b/src/engine/renderer/glsl_source/fogGlobal_fp.glsl index ad05524a9a..da3ac5299d 100644 --- a/src/engine/renderer/glsl_source/fogGlobal_fp.glsl +++ b/src/engine/renderer/glsl_source/fogGlobal_fp.glsl @@ -25,11 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA uniform sampler2D u_ColorMap; // fog texture uniform sampler2D u_DepthMap; -uniform vec3 u_ViewOrigin; uniform vec4 u_FogDistanceVector; -uniform vec4 u_FogDepthVector; uniform vec4 u_Color; -uniform mat4 u_ViewMatrix; uniform mat4 u_UnprojectMatrix; #if __VERSION__ > 120 diff --git a/src/engine/renderer/glsl_source/fogQuake3_vp.glsl b/src/engine/renderer/glsl_source/fogQuake3_vp.glsl index 6e8a66774c..a8d798ed3b 100644 --- a/src/engine/renderer/glsl_source/fogQuake3_vp.glsl +++ b/src/engine/renderer/glsl_source/fogQuake3_vp.glsl @@ -26,8 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #insert vertexSkinning_vp #insert vertexAnimation_vp -uniform vec3 u_ViewOrigin; - uniform float u_Time; uniform vec4 u_ColorModulate; diff --git a/src/engine/renderer/glsl_source/heatHaze_fp.glsl b/src/engine/renderer/glsl_source/heatHaze_fp.glsl index f9415173ee..3cbf6462e2 100644 --- a/src/engine/renderer/glsl_source/heatHaze_fp.glsl +++ b/src/engine/renderer/glsl_source/heatHaze_fp.glsl @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define HEATHAZE_GLSL uniform sampler2D u_CurrentMap; -uniform float u_AlphaThreshold; #if defined(USE_MATERIAL_SYSTEM) uniform float u_DeformEnable; diff --git a/src/engine/renderer/glsl_source/reflection_CB_fp.glsl b/src/engine/renderer/glsl_source/reflection_CB_fp.glsl index 298d79ac44..b6351eded6 100644 --- a/src/engine/renderer/glsl_source/reflection_CB_fp.glsl +++ b/src/engine/renderer/glsl_source/reflection_CB_fp.glsl @@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA uniform samplerCube u_ColorMapCube; uniform vec3 u_ViewOrigin; -uniform mat4 u_ModelMatrix; IN(smooth) vec3 var_Position; IN(smooth) vec2 var_TexCoords; diff --git a/src/engine/renderer/tr_backend.cpp b/src/engine/renderer/tr_backend.cpp index 3510cafe5f..dd94ae68fd 100644 --- a/src/engine/renderer/tr_backend.cpp +++ b/src/engine/renderer/tr_backend.cpp @@ -2983,8 +2983,6 @@ void RB_RenderGlobalFog() // go back to the world modelview matrix backEnd.orientation = backEnd.viewParms.world; - gl_fogGlobalShader->SetUniform_ViewOrigin( backEnd.viewParms.orientation.origin ); // world space - { fog_t *fog; @@ -3014,7 +3012,6 @@ void RB_RenderGlobalFog() gl_fogGlobalShader->SetUniform_Color( fog->color ); } - gl_fogGlobalShader->SetUniform_ViewMatrix( backEnd.viewParms.world.viewMatrix ); gl_fogGlobalShader->SetUniform_UnprojectMatrix( backEnd.viewParms.unprojectionMatrix ); // bind u_ColorMap diff --git a/src/engine/renderer/tr_local.h b/src/engine/renderer/tr_local.h index 6570e1fc89..b44fc3e0cc 100644 --- a/src/engine/renderer/tr_local.h +++ b/src/engine/renderer/tr_local.h @@ -1152,9 +1152,6 @@ enum class shaderProfilerRenderSubGroupsMode { expression_t normalIntensityExp; - expression_t etaExp; - expression_t etaDeltaExp; - expression_t fogDensityExp; expression_t depthScaleExp; @@ -1225,8 +1222,6 @@ enum class shaderProfilerRenderSubGroupsMode { // something calls RE_RegisterShader again with // the same name, we don't try looking for it again - bool createdByGuide; // created using a shader .guide template - int surfaceFlags; int contentFlags; @@ -1242,8 +1237,6 @@ enum class shaderProfilerRenderSubGroupsMode { float reliefDepthScale = 1.0f; // per-shader relief depth scale bool noShadows; - bool fogLight; - bool blendLight; bool ambientLight; bool translucent; bool forceOpaque; diff --git a/src/engine/renderer/tr_shade.cpp b/src/engine/renderer/tr_shade.cpp index 673bdba7fd..9a16a106a1 100644 --- a/src/engine/renderer/tr_shade.cpp +++ b/src/engine/renderer/tr_shade.cpp @@ -2013,9 +2013,6 @@ void Render_skybox( shaderStage_t *pStage ) gl_skyboxShader->BindProgram( pStage->deformIndex ); - gl_skyboxShader->SetUniform_ViewOrigin( backEnd.viewParms.orientation.origin ); // in world space - - gl_skyboxShader->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix ); gl_skyboxShader->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[ glState.stackIndex ] ); // bind u_ColorMap