Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GPU/HW: Handle palette VRAM wrapping

Browse source 
Fixes block colours in The Next Tetris.
This commit is contained in:
Stenzek 2024-01-13 13:54:49 +10:00
parent 5d3cf93aa3
commit e86cf51a48
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/gpu_hw_shadergen.cpp
View file

@ -130,9 +130,10 @@ std::string GPU_HW_ShaderGen::GenerateBatchVertexShader(bool textured)
float((a_texcoord >> 16) * RESOLUTION_SCALE)); float((a_texcoord >> 16) * RESOLUTION_SCALE));
// base_x,base_y,palette_x,palette_y // base_x,base_y,palette_x,palette_y
// Palette X is scaled in fragment shader, since it can wrap.
v_texpage.x = (a_texpage & 15u) * 64u * RESOLUTION_SCALE; v_texpage.x = (a_texpage & 15u) * 64u * RESOLUTION_SCALE;
v_texpage.y = ((a_texpage >> 4) & 1u) * 256u * RESOLUTION_SCALE; v_texpage.y = ((a_texpage >> 4) & 1u) * 256u * RESOLUTION_SCALE;
v_texpage.z = ((a_texpage >> 16) & 63u) * 16u * RESOLUTION_SCALE; v_texpage.z = ((a_texpage >> 16) & 63u) * 16u;
v_texpage.w = ((a_texpage >> 22) & 511u) * RESOLUTION_SCALE; v_texpage.w = ((a_texpage >> 22) & 511u) * RESOLUTION_SCALE;
#if UV_LIMITS #if UV_LIMITS
@ -755,8 +756,8 @@ float4 SampleFromVRAM(uint4 texpage, float2 coords)
uint palette_index = (vram_value >> (subpixel * 8u)) & 0xFFu; uint palette_index = (vram_value >> (subpixel * 8u)) & 0xFFu;
#endif #endif
// sample palette // sample palette. can wrap in X direction
uint2 palette_icoord = uint2(texpage.z + (palette_index * RESOLUTION_SCALE), texpage.w); uint2 palette_icoord = uint2(((texpage.z + palette_index) & 0x3FFu) * RESOLUTION_SCALE, texpage.w);
return SAMPLE_TEXTURE(samp0, float2(palette_icoord) * RCP_VRAM_SIZE); return SAMPLE_TEXTURE(samp0, float2(palette_icoord) * RCP_VRAM_SIZE);
#else #else
// Direct texturing. Render-to-texture effects. Use upscaled coordinates. // Direct texturing. Render-to-texture effects. Use upscaled coordinates.