ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D : Popup D3DDevice_DrawVertices test-cases for Quad-rendering with a StartVertex above 0

This commit is contained in:
patrickvl 2018-05-08 16:04:35 +02:00
parent b4daa37cab
commit d77fe1c1a4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -7378,15 +7378,15 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_DrawVertices)
DrawContext.dwVertexCount = VertexCount; DrawContext.dwVertexCount = VertexCount;
DrawContext.dwStartVertex = StartVertex; DrawContext.dwStartVertex = StartVertex;
DrawContext.hVertexShader = g_CurrentXboxVertexShaderHandle; DrawContext.hVertexShader = g_CurrentXboxVertexShaderHandle;
if (StartVertex > 0) {
// LOG_TEST_CASE("StartVertex > 0"); // Test case : XDK Sample (PlayField)
DrawContext.dwStartVertex = StartVertex; // Breakpoint location for testing.
}
CxbxVertexBufferConverter VertexBufferConverter = {}; CxbxVertexBufferConverter VertexBufferConverter = {};
VertexBufferConverter.Apply(&DrawContext); VertexBufferConverter.Apply(&DrawContext);
if (DrawContext.XboxPrimitiveType == X_D3DPT_QUADLIST) { if (DrawContext.XboxPrimitiveType == X_D3DPT_QUADLIST) {
// LOG_TEST_CASE("X_D3DPT_QUADLIST"); // ?X-Marbles and XDK Sample (Cartoon, ?maybe PlayField?) hits this case // LOG_TEST_CASE("X_D3DPT_QUADLIST"); // ?X-Marbles and XDK Sample (Cartoon, ?maybe PlayField?) hits this case
if (StartVertex > 0) {
LOG_TEST_CASE("X_D3DPT_QUADLIST StartVertex > 0");
DrawContext.dwStartVertex = StartVertex; // Breakpoint location for testing.
}
// Draw quadlists using a single 'quad-to-triangle mapping' index buffer : // Draw quadlists using a single 'quad-to-triangle mapping' index buffer :
// Assure & activate that special index buffer : // Assure & activate that special index buffer :
CxbxAssureQuadListD3DIndexBuffer(/*NrOfQuadVertices=*/DrawContext.dwVertexCount); CxbxAssureQuadListD3DIndexBuffer(/*NrOfQuadVertices=*/DrawContext.dwVertexCount);
@ -7412,6 +7412,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_DrawVertices)
g_dwPrimPerFrame += primCount; g_dwPrimPerFrame += primCount;
} }
else { else {
// if (StartVertex > 0) LOG_TEST_CASE("StartVertex > 0 (non-quad)"); // Verified test case : XDK Sample (PlayField)
HRESULT hRet = g_pD3DDevice->DrawPrimitive( HRESULT hRet = g_pD3DDevice->DrawPrimitive(
EmuXB2PC_D3DPrimitiveType(DrawContext.XboxPrimitiveType), EmuXB2PC_D3DPrimitiveType(DrawContext.XboxPrimitiveType),
DrawContext.dwStartVertex, DrawContext.dwStartVertex,