citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #1745 from JayFoxRox/fix-const_color 

OpenGL: Copy TevStageConfig using a loop. Fixes bug: const_color not copied
This commit is contained in:
bunnei 2016-05-01 17:44:21 -04:00
parent aab41604f7 7e0d6903ff
commit 17ecf0d1a2
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/video_core/renderer_opengl/gl_rasterizer.h
View File

@ -39,36 +39,17 @@ struct PicaShaderConfig {
res.alpha_test_func = regs.output_merger.alpha_test.enable ?
regs.output_merger.alpha_test.func.Value() : Pica::Regs::CompareFunc::Always;
// Copy relevant TevStageConfig fields only. We're doing this manually (instead of calling
// the GetTevStages() function) because BitField explicitly disables copies.
res.tev_stages[0].sources_raw = regs.tev_stage0.sources_raw;
res.tev_stages[1].sources_raw = regs.tev_stage1.sources_raw;
res.tev_stages[2].sources_raw = regs.tev_stage2.sources_raw;
res.tev_stages[3].sources_raw = regs.tev_stage3.sources_raw;
res.tev_stages[4].sources_raw = regs.tev_stage4.sources_raw;
res.tev_stages[5].sources_raw = regs.tev_stage5.sources_raw;
res.tev_stages[0].modifiers_raw = regs.tev_stage0.modifiers_raw;
res.tev_stages[1].modifiers_raw = regs.tev_stage1.modifiers_raw;
res.tev_stages[2].modifiers_raw = regs.tev_stage2.modifiers_raw;
res.tev_stages[3].modifiers_raw = regs.tev_stage3.modifiers_raw;
res.tev_stages[4].modifiers_raw = regs.tev_stage4.modifiers_raw;
res.tev_stages[5].modifiers_raw = regs.tev_stage5.modifiers_raw;
res.tev_stages[0].ops_raw = regs.tev_stage0.ops_raw;
res.tev_stages[1].ops_raw = regs.tev_stage1.ops_raw;
res.tev_stages[2].ops_raw = regs.tev_stage2.ops_raw;
res.tev_stages[3].ops_raw = regs.tev_stage3.ops_raw;
res.tev_stages[4].ops_raw = regs.tev_stage4.ops_raw;
res.tev_stages[5].ops_raw = regs.tev_stage5.ops_raw;
res.tev_stages[0].scales_raw = regs.tev_stage0.scales_raw;
res.tev_stages[1].scales_raw = regs.tev_stage1.scales_raw;
res.tev_stages[2].scales_raw = regs.tev_stage2.scales_raw;
res.tev_stages[3].scales_raw = regs.tev_stage3.scales_raw;
res.tev_stages[4].scales_raw = regs.tev_stage4.scales_raw;
res.tev_stages[5].scales_raw = regs.tev_stage5.scales_raw;
// Copy tev stages
const auto& tev_stages = regs.GetTevStages();
DEBUG_ASSERT(res.tev_stages.size() == tev_stages.size());
for (size_t i = 0; i < tev_stages.size(); i++) {
const auto& tev_stage = tev_stages[i];
res.tev_stages[i].sources_raw = tev_stage.sources_raw;
res.tev_stages[i].modifiers_raw = tev_stage.modifiers_raw;
res.tev_stages[i].ops_raw = tev_stage.ops_raw;
res.tev_stages[i].const_color = tev_stage.const_color;
res.tev_stages[i].scales_raw = tev_stage.scales_raw;
}
res.combiner_buffer_input =
regs.tev_combiner_buffer_input.update_mask_rgb.Value() |