Skip to content

renderer: also set u_SRGB in lightMapping shader for the material system #1939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 1 commit into
base: for-0.56.0/sync
Choose a base branch
from
+4 −1
Open

renderer: also set u_SRGB in lightMapping shader for the material system #1939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/engine/renderer/Material.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,7 @@ void BindShaderLightMapping( Material* material ) {
}

gl_lightMappingShaderMaterial->SetUniform_ViewOrigin( backEnd.orientation.viewOrigin );
gl_lightMappingShaderMaterial->SetUniform_SRGB( tr.worldLinearizeTexture );
gl_lightMappingShaderMaterial->SetUniform_numLights( backEnd.refdef.numLights );
gl_lightMappingShaderMaterial->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix );
gl_lightMappingShaderMaterial->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[glState.stackIndex] );
Expand Down
3 changes: 2 additions & 1 deletion src/engine/renderer/gl_shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2573,6 +2573,7 @@ GLShader_lightMappingMaterial::GLShader_lightMappingMaterial() :
u_LightGridScale( this ),
u_numLights( this ),
u_Lights( this ),
u_SRGB( this ),
u_ShowTris( this ),
u_MaterialColour( this ),
u_ProfilerZero( this ),
Expand Down Expand Up @@ -3047,4 +3048,4 @@ GlobalUBOProxy::GlobalUBOProxy() :
u_Tonemap( this ),
u_TonemapParms( this ),
u_Exposure( this ) {
}
}
1 change: 1 addition & 0 deletions src/engine/renderer/gl_shader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3068,6 +3068,7 @@ class GLShader_lightMappingMaterial :
public u_LightGridScale,
public u_numLights,
public u_Lights,
public u_SRGB,
public u_ShowTris,
public u_MaterialColour,
public u_ProfilerZero,
Expand Down
Loading