From 4b7934e6d612a6d17f9ec229a2d72601a5caefc4 Mon Sep 17 00:00:00 2001 From: Erik Abair Date: Sat, 22 Jul 2023 23:14:52 -0700 Subject: [PATCH] Reenables z24s8 tests. (#116) --- src/tests/depth_format_fixed_function_tests.cpp | 6 ++---- src/tests/depth_format_tests.cpp | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/tests/depth_format_fixed_function_tests.cpp b/src/tests/depth_format_fixed_function_tests.cpp index a768ded..702b2de 100644 --- a/src/tests/depth_format_fixed_function_tests.cpp +++ b/src/tests/depth_format_fixed_function_tests.cpp @@ -10,7 +10,7 @@ #include "vertex_buffer.h" static constexpr uint32_t kF16MaxFixedRepresentation = 0x0000FFFF; -// static constexpr uint32_t kF24MaxFixedRepresentation = 0x00FEFFFF; +static constexpr uint32_t kF24MaxFixedRepresentation = 0x00FEFFFF; // Keep in sync with the value used to set up the default XDK composite matrix. static constexpr float kCameraZ = -7.0f; @@ -21,9 +21,7 @@ constexpr DepthFormatFixedFunctionTests::DepthFormat kDepthFormats[] = { {NV097_SET_SURFACE_FORMAT_ZETA_Z16, 0x0000FFFF, false}, {NV097_SET_SURFACE_FORMAT_ZETA_Z24S8, 0x00FFFFFF, false}, {NV097_SET_SURFACE_FORMAT_ZETA_Z16, kF16MaxFixedRepresentation, true}, - - // TODO: Enable when https://github.com/mborgerson/xemu/issues/322 is resolved. - // {NV097_SET_SURFACE_FORMAT_ZETA_Z24S8, kF24MaxFixedRepresentation, true}, + {NV097_SET_SURFACE_FORMAT_ZETA_Z24S8, kF24MaxFixedRepresentation, true}, }; constexpr uint32_t kNumDepthTests = 4; diff --git a/src/tests/depth_format_tests.cpp b/src/tests/depth_format_tests.cpp index 1ac507a..fc7d24f 100644 --- a/src/tests/depth_format_tests.cpp +++ b/src/tests/depth_format_tests.cpp @@ -10,15 +10,13 @@ #include "vertex_buffer.h" static constexpr uint32_t kF16MaxFixedRepresentation = 0x0000FFFF; -// static constexpr uint32_t kF24MaxFixedRepresentation = 0x00FEFFFF; +static constexpr uint32_t kF24MaxFixedRepresentation = 0x00FEFFFF; constexpr DepthFormatTests::DepthFormat kDepthFormats[] = { {NV097_SET_SURFACE_FORMAT_ZETA_Z16, 0x0000FFFF, false}, {NV097_SET_SURFACE_FORMAT_ZETA_Z24S8, 0x00FFFFFF, false}, {NV097_SET_SURFACE_FORMAT_ZETA_Z16, kF16MaxFixedRepresentation, true}, - - // TODO: Enable when https://github.com/mborgerson/xemu/issues/322 is resolved. - // {NV097_SET_SURFACE_FORMAT_ZETA_Z24S8, kF24MaxFixedRepresentation, true}, + {NV097_SET_SURFACE_FORMAT_ZETA_Z24S8, kF24MaxFixedRepresentation, true}, }; constexpr uint32_t kNumDepthTests = 48;