ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10996 from JosJuice/gpu-texture-uint 

VideoCommon: Fix OpenGL ES GPU texture decoding
This commit is contained in:
Admiral H. Curtiss 2022-08-23 10:48:51 +02:00 committed by GitHub
parent 48fdbcde23 724bd3e597
commit aa8364a327
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/VideoCommon/TextureConversionShader.cpp
View File

@ -602,7 +602,7 @@ uint GetTiledTexelOffset(uint2 block_size, uint2 coords)
{ {
uint2 block = coords / block_size; uint2 block = coords / block_size;
uint2 offset = coords % block_size; uint2 offset = coords % block_size;
uint buffer_pos = 0; uint buffer_pos = 0u;
buffer_pos += block.y * u_src_row_stride; buffer_pos += block.y * u_src_row_stride;
buffer_pos += block.x * (block_size.x * block_size.y); buffer_pos += block.x * (block_size.x * block_size.y);
buffer_pos += offset.y * block_size.x; buffer_pos += offset.y * block_size.x;
@ -672,7 +672,7 @@ static const std::map<TextureFormat, DecodingShaderInfo> s_decoding_shader_info{
// the size of the buffer elements. // the size of the buffer elements.
uint2 block = coords.xy / 8u; uint2 block = coords.xy / 8u;
uint2 offset = coords.xy % 8u; uint2 offset = coords.xy % 8u;
uint buffer_pos = 0; uint buffer_pos = 0u;
buffer_pos += block.y * u_src_row_stride; buffer_pos += block.y * u_src_row_stride;
buffer_pos += block.x * 32u; buffer_pos += block.x * 32u;
buffer_pos += offset.y * 4u; buffer_pos += offset.y * 4u;
@ -810,7 +810,7 @@ static const std::map<TextureFormat, DecodingShaderInfo> s_decoding_shader_info{
// for the entire block, then the GB channels afterwards. // for the entire block, then the GB channels afterwards.
uint2 block = coords.xy / 4u; uint2 block = coords.xy / 4u;
uint2 offset = coords.xy % 4u; uint2 offset = coords.xy % 4u;
uint buffer_pos = 0; uint buffer_pos = 0u;
// Our buffer has 16-bit elements, so the offsets here are half what they would be in bytes. // Our buffer has 16-bit elements, so the offsets here are half what they would be in bytes.
buffer_pos += block.y * u_src_row_stride; buffer_pos += block.y * u_src_row_stride;
@ -874,7 +874,7 @@ static const std::map<TextureFormat, DecodingShaderInfo> s_decoding_shader_info{
// Calculate tiled block coordinates. // Calculate tiled block coordinates.
uint2 tile_block_coords = block_coords / 2u; uint2 tile_block_coords = block_coords / 2u;
uint2 subtile_block_coords = block_coords % 2u; uint2 subtile_block_coords = block_coords % 2u;
uint buffer_pos = 0; uint buffer_pos = 0u;
buffer_pos += tile_block_coords.y * u_src_row_stride; buffer_pos += tile_block_coords.y * u_src_row_stride;
buffer_pos += tile_block_coords.x * 4u; buffer_pos += tile_block_coords.x * 4u;
buffer_pos += subtile_block_coords.y * 2u; buffer_pos += subtile_block_coords.y * 2u;
@ -960,7 +960,7 @@ static const std::map<TextureFormat, DecodingShaderInfo> s_decoding_shader_info{
// the size of the buffer elements. // the size of the buffer elements.
uint2 block = coords.xy / 8u; uint2 block = coords.xy / 8u;
uint2 offset = coords.xy % 8u; uint2 offset = coords.xy % 8u;
uint buffer_pos = 0; uint buffer_pos = 0u;
buffer_pos += block.y * u_src_row_stride; buffer_pos += block.y * u_src_row_stride;
buffer_pos += block.x * 32u; buffer_pos += block.x * 32u;
buffer_pos += offset.y * 4u; buffer_pos += offset.y * 4u;