summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2016-05-03 07:44:07 -0400
committerGravatar bunnei2016-05-03 07:44:07 -0400
commit678d15761f7a4070849476f736158d7c8215ff2c (patch)
tree18e3f62447d97ffc409e07dc9f72c73b10b79a2a
parentMerge pull request #1750 from JayFoxRox/cleanup-shader-input (diff)
parentOpenGL: Don't copy const_color (Reverts #1745) (diff)
downloadyuzu-678d15761f7a4070849476f736158d7c8215ff2c.tar.gz
yuzu-678d15761f7a4070849476f736158d7c8215ff2c.tar.xz
yuzu-678d15761f7a4070849476f736158d7c8215ff2c.zip
Merge pull request #1754 from JayFoxRox/fix-const_color-revert
OpenGL: Don't copy const_color (Reverts #1745)
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 63ff7716d..82fa61742 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -49,7 +49,9 @@ struct PicaShaderConfig {
49 res.alpha_test_func = regs.output_merger.alpha_test.enable ? 49 res.alpha_test_func = regs.output_merger.alpha_test.enable ?
50 regs.output_merger.alpha_test.func.Value() : Pica::Regs::CompareFunc::Always; 50 regs.output_merger.alpha_test.func.Value() : Pica::Regs::CompareFunc::Always;
51 51
52 // Copy tev stages 52 // Copy relevant tev stages fields.
53 // We don't sync const_color here because of the high variance, it is a
54 // shader uniform instead.
53 const auto& tev_stages = regs.GetTevStages(); 55 const auto& tev_stages = regs.GetTevStages();
54 DEBUG_ASSERT(res.tev_stages.size() == tev_stages.size()); 56 DEBUG_ASSERT(res.tev_stages.size() == tev_stages.size());
55 for (size_t i = 0; i < tev_stages.size(); i++) { 57 for (size_t i = 0; i < tev_stages.size(); i++) {
@@ -57,7 +59,6 @@ struct PicaShaderConfig {
57 res.tev_stages[i].sources_raw = tev_stage.sources_raw; 59 res.tev_stages[i].sources_raw = tev_stage.sources_raw;
58 res.tev_stages[i].modifiers_raw = tev_stage.modifiers_raw; 60 res.tev_stages[i].modifiers_raw = tev_stage.modifiers_raw;
59 res.tev_stages[i].ops_raw = tev_stage.ops_raw; 61 res.tev_stages[i].ops_raw = tev_stage.ops_raw;
60 res.tev_stages[i].const_color = tev_stage.const_color;
61 res.tev_stages[i].scales_raw = tev_stage.scales_raw; 62 res.tev_stages[i].scales_raw = tev_stage.scales_raw;
62 } 63 }
63 64