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

Adds test for single DrawArrays edge case that triggers xemu exception.

Browse Source
This commit is contained in:
Erik Abair 2022-06-16 07:31:21 -07:00
parent 5879992a67
commit cc63e7a7d0
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/tests/overlapping_draw_modes_tests.cpp
View File

@ -8,6 +8,7 @@
static const char kArrElDrawArrArrElTest[] = "ArrElm_DrwArr_ArrElm";
static const char kDrawArrDrawArrTest[] = "DrwArr_DrwArr";
static const char kXemuSquashOptimizationTest[] = "SquashOpt";
static const char kXemuSquashOptimizationSingleDrawArraysTest[] = "SquashOptSingleArray";
static constexpr float kLeft = -2.75f;
static constexpr float kRight = 2.75f;
@ -19,6 +20,7 @@ OverlappingDrawModesTests::OverlappingDrawModesTests(TestHost &host, std::string
tests_[kArrElDrawArrArrElTest] = [this]() { TestArrayElementDrawArrayArrayElement(); };
tests_[kDrawArrDrawArrTest] = [this]() { TestDrawArrayDrawArray(); };
tests_[kXemuSquashOptimizationTest] = [this]() { TestXemuSquashOptimization(); };
tests_[kXemuSquashOptimizationSingleDrawArraysTest] = [this]() { TestXemuSquashOptimizationSingleDrawArrays(); };
}
void OverlappingDrawModesTests::Initialize() {
@ -226,4 +228,41 @@ void OverlappingDrawModesTests::TestXemuSquashOptimization() {
pb_end(p);
host_.FinishDraw(allow_saving_, output_dir_, kXemuSquashOptimizationTest);
}
void OverlappingDrawModesTests::TestXemuSquashOptimizationSingleDrawArrays() {
// Tests an edge case in xemu where a single DrawArrays followed by ARRAY_ELEMENTS combines the draws but fails
// to clear the DrawArrays count, leading to an assert.
CreateTriangles();
host_.PrepareDraw(0xFE242424);
host_.SetVertexBufferAttributes(host_.POSITION | host_.DIFFUSE);
auto p = pb_begin();
auto vertex_buffer = host_.GetVertexBuffer();
// Draw the third triangle via DRAW_ARRAYS and the fourth via ARRAY_ELEMENT.
p = pb_push1(p, NV097_SET_BEGIN_END, TestHost::PRIMITIVE_TRIANGLES);
p = pb_push1(p, NV2A_SUPPRESS_COMMAND_INCREMENT(NV097_DRAW_ARRAYS),
MASK(NV097_DRAW_ARRAYS_COUNT, 2) | MASK(NV097_DRAW_ARRAYS_START_INDEX, 6));
{
const uint32_t indices[] = {9, 10, 11};
p = SetArrayElements(p, indices, sizeof(indices) / sizeof(indices[0]));
}
// Then draw the first triangle as another DrawArrays
p = pb_push1(p, NV2A_SUPPRESS_COMMAND_INCREMENT(NV097_DRAW_ARRAYS),
MASK(NV097_DRAW_ARRAYS_COUNT, 2) | MASK(NV097_DRAW_ARRAYS_START_INDEX, 0));
// Draw the second triangle the same way.
p = pb_push1(p, NV2A_SUPPRESS_COMMAND_INCREMENT(NV097_DRAW_ARRAYS),
MASK(NV097_DRAW_ARRAYS_COUNT, 2) | MASK(NV097_DRAW_ARRAYS_START_INDEX, 3));
p = pb_push1(p, NV097_SET_BEGIN_END, NV097_SET_BEGIN_END_OP_END);
pb_end(p);
host_.FinishDraw(allow_saving_, output_dir_, kXemuSquashOptimizationSingleDrawArraysTest);
}

1
src/tests/overlapping_draw_modes_tests.h
View File

@ -23,6 +23,7 @@ class OverlappingDrawModesTests : public TestSuite {
void TestArrayElementDrawArrayArrayElement();
void TestDrawArrayDrawArray();
void TestXemuSquashOptimization();
void TestXemuSquashOptimizationSingleDrawArrays();
private:
std::vector<uint32_t> index_buffer_;