[GPU] Revert 64bpp resolve addressing regression caused by a misunderstanding

2021-12-12 14:32:03 +03:00 · 2021-12-12 14:32:03 +03:00 · d813f7435b
parent 793cebd6a7
commit d813f7435b
11 changed files with 23305 additions and 22787 deletions
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_128bpp_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_128bpp_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_128bpp_scaled_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_128bpp_scaled_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_16bpp_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_16bpp_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_16bpp_scaled_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_16bpp_scaled_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_32bpp_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_32bpp_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_32bpp_scaled_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_32bpp_scaled_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_64bpp_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_64bpp_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_64bpp_scaled_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_64bpp_scaled_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_8bpp_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_8bpp_cs.h
--- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_8bpp_scaled_cs.h
+++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/resolve_full_8bpp_scaled_cs.h
--- a/src/xenia/gpu/shaders/resolve.hlsli
+++ b/src/xenia/gpu/shaders/resolve.hlsli
@ -61,7 +61,8 @@ bool XeResolveEdramFormatIs64bpp() {
 }

 uint XeResolveEdramPixelStrideInts() {
-  return 1u << uint(XeResolveEdramMsaaSamples() >= kXenosMsaaSamples_4X);
+  return 1u << (XeResolveEdramFormatIntsLog2() +
+                uint(XeResolveEdramMsaaSamples() >= kXenosMsaaSamples_4X));
 }

 uint2 XeResolveResolutionScale() {