Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alchemy
Alchemy Next
Commits
13568204
Commit
13568204
authored
Sep 18, 2021
by
Rye Mutt
🍞
Browse files
Clean up matrix inverse in bindDeferredShader
parent
5fd28bf0
Changes
1
Hide whitespace changes
Inline
Side-by-side
indra/newview/pipeline.cpp
View file @
13568204
...
...
@@ -8591,12 +8591,12 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_
stop_glerror
();
}
glh
::
matrix4f
projection
=
get_current_projection
();
glh
::
matrix4f
inv_proj
=
projection
.
inverse
();
if
(
shader
.
getUniformLocation
(
LLShaderMgr
::
INVERSE_PROJECTION_MATRIX
)
!=
-
1
)
{
shader
.
uniformMatrix4fv
(
LLShaderMgr
::
INVERSE_PROJECTION_MATRIX
,
1
,
FALSE
,
inv_proj
.
m
);
LLMatrix4a
inv_proj
;
inv_proj
.
loadu
(
get_current_projection
().
m
);
inv_proj
.
invert
();
shader
.
uniformMatrix4fv
(
LLShaderMgr
::
INVERSE_PROJECTION_MATRIX
,
1
,
FALSE
,
inv_proj
.
getF32ptr
());
}
if
(
shader
.
getUniformLocation
(
LLShaderMgr
::
VIEWPORT
)
!=
-
1
)
...
...
@@ -8756,8 +8756,11 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_
if
(
shader
.
getUniformLocation
(
LLShaderMgr
::
DEFERRED_NORM_MATRIX
)
>=
0
)
{
glh
::
matrix4f
norm_mat
=
get_current_modelview
().
inverse
().
transpose
();
shader
.
uniformMatrix4fv
(
LLShaderMgr
::
DEFERRED_NORM_MATRIX
,
1
,
FALSE
,
norm_mat
.
m
);
LLMatrix4a
norm_mat
;
norm_mat
.
loadu
(
get_current_modelview
().
m
);
norm_mat
.
invert
();
norm_mat
.
transpose
();
shader
.
uniformMatrix4fv
(
LLShaderMgr
::
DEFERRED_NORM_MATRIX
,
1
,
FALSE
,
norm_mat
.
getF32ptr
());
}
shader
.
uniform4fv
(
LLShaderMgr
::
SUNLIGHT_COLOR
,
1
,
mSunDiffuse
.
mV
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment