admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #257 from fjtrujy/master

Browse Source 
[PS2] Fix wrong palette in FCEUmm
This commit is contained in:
Twinaphex
2019-02-22 01:48:56 +01:00
committed by GitHub
parent 4b9fffa33a e962d1f19c
commit b1a1718ae8
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/drivers/libretro/libretro.c
View File

@@ -940,6 +940,12 @@ static void retro_set_custom_palette(void)
FCEUD_SetPalette( i + 128, r, g, b);
FCEUD_SetPalette( i + 192, r, g, b);
}
#if defined(RENDER_GSKIT_PS2)
if (ps2) {
ps2->updatedPalette = true;
}
#endif
}
/* Set variables for NTSC(1) / PAL(2) / Dendy(3)
@@ -993,6 +999,10 @@ void retro_deinit (void)
free(fceu_video_out);
fceu_video_out = NULL;
#endif
#if defined(RENDER_GSKIT_PS2)
ps2 = NULL;
#endif
}
void retro_reset(void)
@@ -1587,11 +1597,14 @@ static void retro_run_blit(uint8_t *gfx)
ps2->coreTexture->PSM = GS_PSM_T8;
ps2->coreTexture->ClutPSM = GS_PSM_CT16;
ps2->coreTexture->Filter = GS_FILTER_LINEAR;
ps2->coreTexture->Clut = (u32*)retro_palette;
ps2->updatedPalette = true;
ps2->padding = (struct retro_hw_ps2_insets){8.0f, 8.0f, 8.0f, 8.0f};
ps2->padding = (struct retro_hw_ps2_insets){ overscan_v ? 8.0f : 0.0f,
overscan_h ? 8.0f : 0.0f,
overscan_v ? 8.0f : 0.0f,
overscan_h ? 8.0f : 0.0f};
}
ps2->updatedPalette = true;
ps2->coreTexture->Clut = (u32*)retro_palette;
ps2->coreTexture->Mem = (u32*)gfx;
video_cb(buf, width, height, pitch);
@@ -2166,6 +2179,9 @@ void retro_unload_game(void)
free(fceu_video_out);
fceu_video_out = NULL;
#endif
#if defined(RENDER_GSKIT_PS2)
ps2 = NULL;
#endif
}
unsigned retro_get_region(void)