xemu-project/nxdk_pgraph_tests
1
0
Fork 0
mirror of https://github.com/xemu-project/nxdk_pgraph_tests.git synced 2024-11-26 19:40:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes texture corruption in blend tests.

Browse Source
This commit is contained in:
Erik Abair 2023-07-22 20:46:03 -07:00
parent 8a23ef6f1b
commit fd469c3bf1
6 changed files with 77 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -192,6 +192,8 @@ add_library(
src/shaders/perspective_vertex_shader.h
src/shaders/pixel_shader_program.cpp
src/shaders/pixel_shader_program.h
src/shaders/passthrough_vertex_shader.cpp
src/shaders/passthrough_vertex_shader.h
src/shaders/precalculated_vertex_shader.cpp
src/shaders/precalculated_vertex_shader.h
src/shaders/projection_vertex_shader.cpp

19
src/shaders/passthrough_vertex_shader.cpp Normal file
View File

@ -0,0 +1,19 @@
#include "passthrough_vertex_shader.h"
#include <pbkit/pbkit.h>
// clang-format off
static const uint32_t kPassthroughVsh[] = {
#include "passthrough.vshinc"
};
// clang-format on
void PassthroughVertexShader::OnLoadShader() {
const uint32_t *shader;
uint32_t shader_len;
shader = kPassthroughVsh;
shader_len = sizeof(kPassthroughVsh);
LoadShaderProgram(shader, shader_len);
}

20
src/shaders/passthrough_vertex_shader.h Normal file
View File

@ -0,0 +1,20 @@
#ifndef NXDK_PGRAPH_TESTS_SHADERS_PASSTHROUGH_VERTEX_SHADER_H_
#define NXDK_PGRAPH_TESTS_SHADERS_PASSTHROUGH_VERTEX_SHADER_H_
#include <cstdint>
#include "vertex_shader_program.h"
#include "xbox_math_types.h"
using namespace XboxMath;
//! A vertex shader that passes through all inputs without modifications. It performs no lighting.
class PassthroughVertexShader : public VertexShaderProgram {
public:
PassthroughVertexShader() = default;
protected:
void OnLoadShader() override;
};
#endif // NXDK_PGRAPH_TESTS_SHADERS_PASSTHROUGH_VERTEX_SHADER_H_

58
src/tests/blend_tests.cpp
View File

@ -5,13 +5,16 @@
#include <memory>
#include <utility>
#include "shaders/precalculated_vertex_shader.h"
#include "shaders/passthrough_vertex_shader.h"
#include "test_host.h"
#include "texture_generator.h"
// From pbkit.c, DMA_A is set to channel 3 by default
// NV097_SET_CONTEXT_DMA_A == NV20_TCL_PRIMITIVE_3D_SET_OBJECT1
static constexpr uint32_t kDefaultDMAChannelA = 3;
// From pbkit.c, DMA_B is set to channel 11 by default
// NV097_SET_CONTEXT_DMA_B == NV20_TCL_PRIMITIVE_3D_SET_OBJECT2
// static constexpr uint32_t kDefaultDMAChannelB = 11;
// From pbkit.c, DMA_COLOR is set to channel 9 by default.
// NV097_SET_CONTEXT_DMA_COLOR == NV20_TCL_PRIMITIVE_3D_SET_OBJECT3
static constexpr uint32_t kDefaultDMAColorChannel = 9;
@ -40,7 +43,7 @@ void BlendTests::Initialize() {
host_.SetXDKDefaultViewportAndFixedFunctionMatrices();
host_.SetCombinerControl(1);
auto shader = std::make_shared<PrecalculatedVertexShader>();
auto shader = std::make_shared<PassthroughVertexShader>();
host_.SetVertexShaderProgram(shader);
auto p = pb_begin();
@ -55,27 +58,31 @@ void BlendTests::Test(const std::string &name, const std::function<void()> &body
DrawCheckerboardBackground();
RenderToTextureStart();
host_.SetFinalCombiner0Just(TestHost::SRC_DIFFUSE);
host_.SetFinalCombiner1Just(TestHost::SRC_DIFFUSE, true);
host_.SetSurfaceFormatImmediate(TestHost::SCF_A8R8G8B8, TestHost::SZF_Z24S8, 256, 256, true);
{
RenderToTextureStart(1);
// Initialize texture to fully opaque white.
memset(host_.GetTextureMemory(), 0xFF, kTexturePitch * kTextureSize);
host_.SetFinalCombiner0Just(TestHost::SRC_DIFFUSE);
host_.SetFinalCombiner1Just(TestHost::SRC_DIFFUSE, true);
host_.SetSurfaceFormatImmediate(TestHost::SCF_A8R8G8B8, TestHost::SZF_Z24S8, 256, 256, true);
body();
// Initialize texture to fully opaque white.
auto texture_memory = host_.GetTextureMemoryForStage(1);
memset(texture_memory, 0xFF, kTexturePitch * kTextureSize);
host_.SetSurfaceFormatImmediate(TestHost::SCF_A8R8G8B8, TestHost::SZF_Z24S8, host_.GetFramebufferWidth(),
host_.GetFramebufferHeight());
body();
RenderToTextureEnd();
host_.SetSurfaceFormatImmediate(TestHost::SCF_A8R8G8B8, TestHost::SZF_Z24S8, host_.GetFramebufferWidth(),
host_.GetFramebufferHeight());
RenderToTextureEnd();
}
{
host_.SetFinalCombiner0Just(TestHost::SRC_TEX0);
host_.SetFinalCombiner1Just(TestHost::SRC_TEX0, true);
host_.SetTextureStageEnabled(0, true);
host_.SetShaderStageProgram(TestHost::STAGE_2D_PROJECTIVE);
auto &texture_stage = host_.GetTextureStage(0);
host_.SetFinalCombiner0Just(TestHost::SRC_TEX1);
host_.SetFinalCombiner1Just(TestHost::SRC_TEX1, true);
host_.SetTextureStageEnabled(1, true);
host_.SetShaderStageProgram(TestHost::STAGE_NONE, TestHost::STAGE_2D_PROJECTIVE);
auto &texture_stage = host_.GetTextureStage(1);
texture_stage.SetFormat(GetTextureFormatInfo(NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A8B8G8R8));
texture_stage.SetTextureDimensions(kTextureSize, kTextureSize);
host_.SetupTextureStages();
@ -86,13 +93,13 @@ void BlendTests::Test(const std::string &name, const std::function<void()> &body
const float kBottom = kTop + kTextureSize;
host_.Begin(TestHost::PRIMITIVE_QUADS);
host_.SetTexCoord0(0.0f, 0.0f);
host_.SetTexCoord1(0.0f, 0.0f);
host_.SetVertex(kLeft, kTop, 0.1f, 1.0f);
host_.SetTexCoord0(1.0f, 0.0f);
host_.SetTexCoord1(1.0f, 0.0f);
host_.SetVertex(kRight, kTop, 0.1f, 1.0f);
host_.SetTexCoord0(1.0f, 1.0f);
host_.SetTexCoord1(1.0f, 1.0f);
host_.SetVertex(kRight, kBottom, 0.1f, 1.0f);
host_.SetTexCoord0(0.0f, 1.0f);
host_.SetTexCoord1(0.0f, 1.0f);
host_.SetVertex(kLeft, kBottom, 0.1f, 1.0f);
host_.End();
@ -151,8 +158,9 @@ void BlendTests::DrawCheckerboardBackground() const {
texture_stage.SetTextureDimensions(kTextureSize, kTextureSize);
host_.SetupTextureStages();
GenerateSwizzledRGBACheckerboard(host_.GetTextureMemory(), 0, 0, kTextureSize, kTextureSize, kTextureSize * 4,
kCheckerboardA, kCheckerboardB, kCheckerSize);
auto texture_memory = host_.GetTextureMemoryForStage(0);
GenerateSwizzledRGBACheckerboard(texture_memory, 0, 0, kTextureSize, kTextureSize, kTextureSize * 4, kCheckerboardA,
kCheckerboardB, kCheckerSize);
host_.Begin(TestHost::PRIMITIVE_QUADS);
host_.SetTexCoord0(0.0f, 0.0f);
@ -169,8 +177,8 @@ void BlendTests::DrawCheckerboardBackground() const {
host_.SetShaderStageProgram(TestHost::STAGE_NONE);
}
void BlendTests::RenderToTextureStart() const {
const auto kTextureMemory = reinterpret_cast<uint32_t>(host_.GetTextureMemory());
void BlendTests::RenderToTextureStart(uint32_t stage) const {
const auto kTextureMemory = reinterpret_cast<uint32_t>(host_.GetTextureMemoryForStage(stage));
const uint32_t kFramebufferPitch = host_.GetFramebufferWidth() * 4;
auto p = pb_begin();
p = pb_push1(p, NV097_SET_CONTEXT_DMA_COLOR, kDefaultDMAChannelA);

2
src/tests/blend_tests.h
View File

@ -34,7 +34,7 @@ class BlendTests : public TestSuite {
void Draw(float left, float top, float right, float bottom, uint32_t color, uint32_t func, uint32_t sfactor,
uint32_t dfactor) const;
void RenderToTextureStart() const;
void RenderToTextureStart(uint32_t stage) const;
void RenderToTextureEnd() const;
};

12
src/tests/z_min_max_control_tests.cpp
View File

@ -4,8 +4,7 @@
#include "debug_output.h"
#include "pbkit_ext.h"
#include "shaders/perspective_vertex_shader.h"
#include "texture_generator.h"
#include "shaders/passthrough_vertex_shader.h"
#include "vertex_buffer.h"
#include "xbox_math_d3d.h"
#include "xbox_math_matrix.h"
@ -83,12 +82,6 @@ static void AddVertex(TestHost& host, const vector_t& position, float r, float g
host.SetVertex(position);
};
// clang-format off
static const uint32_t kPassthroughVsh[] = {
#include "passthrough.vshinc"
};
// clang-format on
void ZMinMaxControlTests::DrawBlock(float x_offset, float y_offset, ZMinMaxDrawMode zw_mode, bool projected) const {
const float z_min = 0.f;
const float z_max = kZFar * 1.5f;
@ -212,8 +205,7 @@ void ZMinMaxControlTests::DrawBlock(float x_offset, float y_offset, ZMinMaxDrawM
}
void ZMinMaxControlTests::Test(const std::string& name, uint32_t mode, bool w_buffered) {
auto shader = std::make_shared<VertexShaderProgram>();
shader->SetShaderOverride(kPassthroughVsh, sizeof(kPassthroughVsh));
auto shader = std::make_shared<PassthroughVertexShader>();
host_.SetVertexShaderProgram(shader);
host_.PrepareDraw(kBackgroundColor);