fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[D3D12] Rename XeTextureCopy to XeTextureLoad in shaders

Browse Source
This commit is contained in:
Triang3l
2018-10-05 20:02:36 +03:00
parent 9dc7dfab02
commit 34946c57b0
58 changed files with 730 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/xenia/gpu/d3d12/shaders/texture_load_16bpb.cs.hlsl
View File

@@ -1,34 +1,34 @@
#include "texture_copy.hlsli"
#include "texture_load.hlsli"
[numthreads(8, 32, 1)]
void main(uint3 xe_thread_id : SV_DispatchThreadID) {
// 1 thread = 4 ushort blocks.
uint3 block_index = xe_thread_id;
block_index.x <<= 2u;
[branch] if (any(block_index >= xe_texture_copy_size_blocks)) {
[branch] if (any(block_index >= xe_texture_load_size_blocks)) {
return;
}
uint4 block_offsets_guest =
XeTextureCopyGuestBlockOffsets(block_index, 2u, 1u);
XeTextureLoadGuestBlockOffsets(block_index, 2u, 1u);
uint4 dword_offsets_guest = block_offsets_guest & ~3u;
uint4 blocks = uint4(xe_texture_copy_source.Load(dword_offsets_guest.x),
xe_texture_copy_source.Load(dword_offsets_guest.y),
xe_texture_copy_source.Load(dword_offsets_guest.z),
xe_texture_copy_source.Load(dword_offsets_guest.w));
uint4 blocks = uint4(xe_texture_load_source.Load(dword_offsets_guest.x),
xe_texture_load_source.Load(dword_offsets_guest.y),
xe_texture_load_source.Load(dword_offsets_guest.z),
xe_texture_load_source.Load(dword_offsets_guest.w));
blocks = (blocks >> ((block_offsets_guest & 2u) << 3u)) & 0xFFFFu;
blocks = XeByteSwap16(blocks, xe_texture_copy_endianness);
blocks = XeByteSwap16(blocks, xe_texture_load_endianness);
// Swap components - Xenos 16-bit packed textures are RGBA, but in Direct3D 12
// they are BGRA.
if (xe_texture_copy_guest_format == 3u) {
if (xe_texture_load_guest_format == 3u) {
// k_1_5_5_5.
blocks = (blocks & ((31u << 5u) | (1u << 15u))) | ((blocks & 31u) << 10u) |
((blocks >> 10u) & 31u);
} else if (xe_texture_copy_guest_format == 4u) {
} else if (xe_texture_load_guest_format == 4u) {
// k_5_6_5.
blocks = (blocks & (63u << 5u)) | ((blocks & 31u) << 11u) |
((blocks >> 11u) & 31u);
} else if (xe_texture_copy_guest_format == 15u) {
} else if (xe_texture_load_guest_format == 15u) {
// k_4_4_4_4.
blocks =
(blocks & 0xF0F0u) | ((blocks & 15u) << 8u) | ((blocks >> 8u) & 15u);
@@ -36,8 +36,8 @@ void main(uint3 xe_thread_id : SV_DispatchThreadID) {
// TODO(Triang3l): k_6_5_5.
uint block_offset_host = XeTextureHostLinearOffset(
block_index, xe_texture_copy_size_blocks.y, xe_texture_copy_host_pitch,
2u) + xe_texture_copy_host_base;
xe_texture_copy_dest.Store2(block_offset_host,
block_index, xe_texture_load_size_blocks.y, xe_texture_load_host_pitch,
2u) + xe_texture_load_host_base;
xe_texture_load_dest.Store2(block_offset_host,
blocks.xz | (blocks.yw << 16u));
}