summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-04-22 19:47:06 +0200
committerbunnei <bunneidev@gmail.com>2016-04-22 19:47:06 +0200
commit57a5fc40c0b66e8cc6e4e12598e9e852be767d35 (patch)
tree3d5ba8f9916944c2bb81cc00dd56ac5d1eff75a5
parentMerge pull request #1436 from tfarley/hw-tex-forwarding (diff)
parentHWRasterizer: reorder declarations to match defs (diff)
downloadyuzu-57a5fc40c0b66e8cc6e4e12598e9e852be767d35.tar
yuzu-57a5fc40c0b66e8cc6e4e12598e9e852be767d35.tar.gz
yuzu-57a5fc40c0b66e8cc6e4e12598e9e852be767d35.tar.bz2
yuzu-57a5fc40c0b66e8cc6e4e12598e9e852be767d35.tar.lz
yuzu-57a5fc40c0b66e8cc6e4e12598e9e852be767d35.tar.xz
yuzu-57a5fc40c0b66e8cc6e4e12598e9e852be767d35.tar.zst
yuzu-57a5fc40c0b66e8cc6e4e12598e9e852be767d35.zip
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp2
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h18
2 files changed, 11 insertions, 9 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index da4121c35..30187d4cf 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -874,6 +874,8 @@ void RasterizerOpenGL::SetShader() {
SyncGlobalAmbient();
for (int light_index = 0; light_index < 8; light_index++) {
+ SyncLightSpecular0(light_index);
+ SyncLightSpecular1(light_index);
SyncLightDiffuse(light_index);
SyncLightAmbient(light_index);
SyncLightPosition(light_index);
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 5aa638985..8d6177e88 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -332,18 +332,24 @@ private:
/// Syncs the depth test states to match the PICA register
void SyncDepthTest();
- /// Syncs the TEV constant color to match the PICA register
- void SyncTevConstColor(int tev_index, const Pica::Regs::TevStageConfig& tev_stage);
-
/// Syncs the TEV combiner color buffer to match the PICA register
void SyncCombinerColor();
+ /// Syncs the TEV constant color to match the PICA register
+ void SyncTevConstColor(int tev_index, const Pica::Regs::TevStageConfig& tev_stage);
+
/// Syncs the lighting global ambient color to match the PICA register
void SyncGlobalAmbient();
/// Syncs the lighting lookup tables
void SyncLightingLUT(unsigned index);
+ /// Syncs the specified light's specular 0 color to match the PICA register
+ void SyncLightSpecular0(int light_index);
+
+ /// Syncs the specified light's specular 1 color to match the PICA register
+ void SyncLightSpecular1(int light_index);
+
/// Syncs the specified light's diffuse color to match the PICA register
void SyncLightDiffuse(int light_index);
@@ -353,12 +359,6 @@ private:
/// Syncs the specified light's position to match the PICA register
void SyncLightPosition(int light_index);
- /// Syncs the specified light's specular 0 color to match the PICA register
- void SyncLightSpecular0(int light_index);
-
- /// Syncs the specified light's specular 1 color to match the PICA register
- void SyncLightSpecular1(int light_index);
-
OpenGLState state;
RasterizerCacheOpenGL res_cache;