diff --git a/src/xenia/gpu/shaders/texture_load.xesli b/src/xenia/gpu/shaders/texture_load.xesli index 036bc8117..e0ae8b7e4 100644 --- a/src/xenia/gpu/shaders/texture_load.xesli +++ b/src/xenia/gpu/shaders/texture_load.xesli @@ -22,8 +22,8 @@ // in 128x16 blocks per group for 8bpb / 16bpb, and for a 32x32 mip tail, there // would be two groups rather than one, for a total of 128x32 blocks - 75% of // the work will be wasted rather than 50% with one 64x32-block group. -#define XeTextureLoadGroupSizeX 4 -#define XeTextureLoadGroupSizeY 32 +#define kXeTextureLoadGroupSizeX 4 +#define kXeTextureLoadGroupSizeY 32 xesl_cbuffer_begin(xe_texture_load_constants, set=2, binding=0, b0, space0) uint xe_texture_load_is_tiled_3d_endian_scale; diff --git a/src/xenia/gpu/shaders/texture_load_128bpb.xesli b/src/xenia/gpu/shaders/texture_load_128bpb.xesli index c98c03605..a7fdd6bc3 100644 --- a/src/xenia/gpu/shaders/texture_load_128bpb.xesli +++ b/src/xenia/gpu/shaders/texture_load_128bpb.xesli @@ -15,8 +15,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 2 blocks. diff --git a/src/xenia/gpu/shaders/texture_load_16bpb.xesli b/src/xenia/gpu/shaders/texture_load_16bpb.xesli index 5cdb3207f..932a8e75f 100644 --- a/src/xenia/gpu/shaders/texture_load_16bpb.xesli +++ b/src/xenia/gpu/shaders/texture_load_16bpb.xesli @@ -15,8 +15,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 16 blocks passed through an externally provided diff --git a/src/xenia/gpu/shaders/texture_load_32bpb.xesli b/src/xenia/gpu/shaders/texture_load_32bpb.xesli index d56168ded..774f23428 100644 --- a/src/xenia/gpu/shaders/texture_load_32bpb.xesli +++ b/src/xenia/gpu/shaders/texture_load_32bpb.xesli @@ -15,8 +15,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 8 blocks passed through an externally provided diff --git a/src/xenia/gpu/shaders/texture_load_32bpb_64bpb.xesli b/src/xenia/gpu/shaders/texture_load_32bpb_64bpb.xesli index a48dce4a8..1590661f4 100644 --- a/src/xenia/gpu/shaders/texture_load_32bpb_64bpb.xesli +++ b/src/xenia/gpu/shaders/texture_load_32bpb_64bpb.xesli @@ -15,8 +15,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 8 packed 32-bit texels with the externally provided uint4 -> 2x diff --git a/src/xenia/gpu/shaders/texture_load_64bpb.xesli b/src/xenia/gpu/shaders/texture_load_64bpb.xesli index 55ed8e3dd..094b70150 100644 --- a/src/xenia/gpu/shaders/texture_load_64bpb.xesli +++ b/src/xenia/gpu/shaders/texture_load_64bpb.xesli @@ -15,8 +15,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 4 blocks passed through an externally provided diff --git a/src/xenia/gpu/shaders/texture_load_8bpb.xesli b/src/xenia/gpu/shaders/texture_load_8bpb.xesli index dcb6cab05..1b5aa7a5e 100644 --- a/src/xenia/gpu/shaders/texture_load_8bpb.xesli +++ b/src/xenia/gpu/shaders/texture_load_8bpb.xesli @@ -15,8 +15,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint2, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 16 blocks. diff --git a/src/xenia/gpu/shaders/texture_load_ctx1.cs.xesl b/src/xenia/gpu/shaders/texture_load_ctx1.cs.xesl index 81e07ae1e..7785e7c8e 100644 --- a/src/xenia/gpu/shaders/texture_load_ctx1.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_ctx1.cs.xesl @@ -30,8 +30,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 4 CTX1 blocks to 16x4 R8G8 texels. diff --git a/src/xenia/gpu/shaders/texture_load_dxn_rg8.cs.xesl b/src/xenia/gpu/shaders/texture_load_dxn_rg8.cs.xesl index 465fe8719..93da72c96 100644 --- a/src/xenia/gpu/shaders/texture_load_dxn_rg8.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_dxn_rg8.cs.xesl @@ -16,8 +16,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 2 DXN blocks to 8x4 R8G8 texels. diff --git a/src/xenia/gpu/shaders/texture_load_dxt1_rgba8.cs.xesl b/src/xenia/gpu/shaders/texture_load_dxt1_rgba8.cs.xesl index 4ace2fc19..286d32f3d 100644 --- a/src/xenia/gpu/shaders/texture_load_dxt1_rgba8.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_dxt1_rgba8.cs.xesl @@ -16,8 +16,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 4 DXT1 blocks to 16x4 R8G8B8A8 texels. diff --git a/src/xenia/gpu/shaders/texture_load_dxt3_rgba8.cs.xesl b/src/xenia/gpu/shaders/texture_load_dxt3_rgba8.cs.xesl index 1e6dfd435..e099c5e91 100644 --- a/src/xenia/gpu/shaders/texture_load_dxt3_rgba8.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_dxt3_rgba8.cs.xesl @@ -16,8 +16,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 2 DXT3 blocks to 8x4 R8G8B8A8 texels. diff --git a/src/xenia/gpu/shaders/texture_load_dxt3a.cs.xesl b/src/xenia/gpu/shaders/texture_load_dxt3a.cs.xesl index a735b6af0..23b37d03f 100644 --- a/src/xenia/gpu/shaders/texture_load_dxt3a.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_dxt3a.cs.xesl @@ -16,8 +16,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 4 DXT3A blocks to 16x4 R8 texels (no need to convert to DXT3 diff --git a/src/xenia/gpu/shaders/texture_load_dxt3aas1111.xesli b/src/xenia/gpu/shaders/texture_load_dxt3aas1111.xesli index 607b8e55f..a1e94ca4c 100644 --- a/src/xenia/gpu/shaders/texture_load_dxt3aas1111.xesli +++ b/src/xenia/gpu/shaders/texture_load_dxt3aas1111.xesli @@ -15,8 +15,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 4 DXT3A-as-1111 blocks to 16x4 16bpp texels passed through an diff --git a/src/xenia/gpu/shaders/texture_load_dxt5_rgba8.cs.xesl b/src/xenia/gpu/shaders/texture_load_dxt5_rgba8.cs.xesl index 63473faf1..d7eeb351a 100644 --- a/src/xenia/gpu/shaders/texture_load_dxt5_rgba8.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_dxt5_rgba8.cs.xesl @@ -16,8 +16,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 2 DXT5 blocks to 8x4 R8G8B8A8 texels. diff --git a/src/xenia/gpu/shaders/texture_load_dxt5a_r8.cs.xesl b/src/xenia/gpu/shaders/texture_load_dxt5a_r8.cs.xesl index e6f4afa14..71993a321 100644 --- a/src/xenia/gpu/shaders/texture_load_dxt5a_r8.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_dxt5a_r8.cs.xesl @@ -16,8 +16,8 @@ xesl_entry xesl_entry_binding_next xesl_typedStorageBuffer(xesl_uint4, xe_texture_load_source, set=1, binding=0, t0, space0) -xesl_entry_bindings_end_local_size(XeTextureLoadGroupSizeX, - XeTextureLoadGroupSizeY, 1) +xesl_entry_bindings_end_local_size(kXeTextureLoadGroupSizeX, + kXeTextureLoadGroupSizeY, 1) xesl_input_global_invocation_id xesl_entry_signature_end // 1 thread = 4 DXT5A blocks to 16x4 R8 texels.