preserve-emulation/xenia
1
0
Fork 0
mirror of https://github.com/xenia-project/xenia.git synced 2026-07-11 01:24:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

[GPU] Rename AddressTiled in TiledAddress in shaders

Browse Source 
There will possibly be more `XenosTextureTiled*` functions in the future
where the word "Address" would make the names excessively long.
This commit is contained in:
Triang3l
2026-01-13 21:20:26 +03:00
parent 80a9af4277
commit 76c531bff2
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xenia/gpu/shaders/resolve.xesli
+2 -2
View File
@@ -170,13 +170,13 @@ uint XeResolveEdramPixelStrideInts(XeResolveInfo resolve_info) {
resolve_info.resolution_scale);
#else
dont_flatten_xe if (resolve_info.dest_is_array) {
address = uint(XenosTextureAddressTiled3D(
address = uint(XenosTextureTiledAddress3D(
int3_xe(uint3_xe(p, resolve_info.dest_slice)),
resolve_info.dest_row_pitch_aligned_shr5,
resolve_info.dest_slice_pitch_aligned_shr4,
bpp_log2));
} else {
address = uint(XenosTextureAddressTiled2D(
address = uint(XenosTextureTiledAddress2D(
int2_xe(p), resolve_info.dest_row_pitch_aligned_shr5, bpp_log2));
}
address += resolve_info.dest_base;
src/xenia/gpu/shaders/texture_address.xesli
+7 -7
View File
@@ -17,7 +17,7 @@
#define XENOS_TEXTURE_MACRO_TILE_HEIGHT_3D_LOG2 4
#define XENOS_TEXTURE_MACRO_TILE_DEPTH_LOG2 2
int XenosTextureAddressTiledCombine(const int outer_inner_bytes, const int bank,
int XenosTextureTiledAddressCombine(const int outer_inner_bytes, const int bank,
const int pipe, const int y_lsb) {
return (y_lsb << 4) | (pipe << 6) | (bank << 11) | (outer_inner_bytes & 0xF) |
(((outer_inner_bytes >> 4) & 0x1) << 5) |
@@ -25,7 +25,7 @@ int XenosTextureAddressTiledCombine(const int outer_inner_bytes, const int bank,
(outer_inner_bytes >> 8 << 12);
}
int XenosTextureAddressTiled2D(const int2_xe p, const uint pitch_macro_tiles,
int XenosTextureTiledAddress2D(const int2_xe p, const uint pitch_macro_tiles,
const uint bytes_per_element_log2) {
const int outer_elements =
((p.y >> XENOS_TEXTURE_MACRO_TILE_HEIGHT_2D_LOG2) *
@@ -37,11 +37,11 @@ int XenosTextureAddressTiled2D(const int2_xe p, const uint pitch_macro_tiles,
(outer_elements | inner_elements) << bytes_per_element_log2;
const int bank = (p.y >> 4) & 0x1;
const int pipe = ((p.x >> 3) & 0x3) ^ (((p.y >> 3) & 0x1) << 1);
return XenosTextureAddressTiledCombine(outer_inner_bytes, bank, pipe,
return XenosTextureTiledAddressCombine(outer_inner_bytes, bank, pipe,
p.y & 1);
}
int XenosTextureAddressTiled3D(const int3_xe p, const uint pitch_macro_tiles,
int XenosTextureTiledAddress3D(const int3_xe p, const uint pitch_macro_tiles,
const uint height_macro_tiles,
const uint bytes_per_element_log2) {
const int outer_elements =
@@ -57,7 +57,7 @@ int XenosTextureAddressTiled3D(const int3_xe p, const uint pitch_macro_tiles,
(outer_elements | inner_elements) << bytes_per_element_log2;
const int bank = ((p.y >> 3) ^ (p.z >> 2)) & 0x1;
const int pipe = ((p.x >> 3) & 0x3) ^ (bank << 1);
return XenosTextureAddressTiledCombine(outer_inner_bytes, bank, pipe,
return XenosTextureTiledAddressCombine(outer_inner_bytes, bank, pipe,
p.y & 1);
}
@@ -113,11 +113,11 @@ uint XeTextureScaledTiledOffset(bool is_3d, uint3_xe p, uint pitch_aligned_shr5,
// Global guest linear address of the beginning of Nx1 unit in bytes.
uint unit_guest_address;
dont_flatten_xe if (is_3d) {
unit_guest_address = uint(XenosTextureAddressTiled3D(
unit_guest_address = uint(XenosTextureTiledAddress3D(
int3_xe(unit_guest_origin), pitch_aligned_shr5, height_aligned_shr4,
bpb_log2));
} else {
unit_guest_address = uint(XenosTextureAddressTiled2D(
unit_guest_address = uint(XenosTextureTiledAddress2D(
int2_xe(unit_guest_origin.xy), pitch_aligned_shr5, bpb_log2));
}
// Unit-local host XY index of the host Nx1 sub-unit.
src/xenia/gpu/shaders/texture_load.xesli
+2 -2
View File
@@ -113,11 +113,11 @@ uint XeTextureLoadGuestBlockOffset(XeTextureLoadInfo load_info,
int block_offset_guest;
dont_flatten_xe if (load_info.is_tiled) {
dont_flatten_xe if (load_info.is_3d) {
block_offset_guest = XenosTextureAddressTiled3D(
block_offset_guest = XenosTextureTiledAddress3D(
int3_xe(block_index), load_info.guest_pitch_aligned >> 5,
load_info.guest_z_stride_block_rows_aligned >> 4, bpb_log2);
} else {
block_offset_guest = XenosTextureAddressTiled2D(
block_offset_guest = XenosTextureTiledAddress2D(
int2_xe(block_index.xy), load_info.guest_pitch_aligned >> 5,
bpb_log2);
}