OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 05:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1697 from tfarley/hw-lighting-sync

Browse Source 
HWRasterizer: Lighting Sync + Cleanup
This commit is contained in:
bunnei 2016-04-22 13:47:06 -04:00
commit 57a5fc40c0
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -874,6 +874,8 @@ void RasterizerOpenGL::SetShader() {
SyncGlobalAmbient(); SyncGlobalAmbient();
for (int light_index = 0; light_index < 8; light_index++) { for (int light_index = 0; light_index < 8; light_index++) {
SyncLightSpecular0(light_index);
SyncLightSpecular1(light_index);
SyncLightDiffuse(light_index); SyncLightDiffuse(light_index);
SyncLightAmbient(light_index); SyncLightAmbient(light_index);
SyncLightPosition(light_index); SyncLightPosition(light_index);

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

@ -332,18 +332,24 @@ private:
/// Syncs the depth test states to match the PICA register /// Syncs the depth test states to match the PICA register
void SyncDepthTest(); 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 /// Syncs the TEV combiner color buffer to match the PICA register
void SyncCombinerColor(); 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 /// Syncs the lighting global ambient color to match the PICA register
void SyncGlobalAmbient(); void SyncGlobalAmbient();
/// Syncs the lighting lookup tables /// Syncs the lighting lookup tables
void SyncLightingLUT(unsigned index); 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 /// Syncs the specified light's diffuse color to match the PICA register
void SyncLightDiffuse(int light_index); void SyncLightDiffuse(int light_index);
@ -353,12 +359,6 @@ private:
/// Syncs the specified light's position to match the PICA register /// Syncs the specified light's position to match the PICA register
void SyncLightPosition(int light_index); 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; OpenGLState state;
RasterizerCacheOpenGL res_cache; RasterizerCacheOpenGL res_cache;