Reenables z24s8 tests. (#116)

This commit is contained in:
Erik Abair 2023-07-22 23:14:52 -07:00 committed by GitHub
parent 5e8e998f6c
commit 4b7934e6d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions

View File

@ -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;

View File

@ -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;