From cef5f5be40b3208d1d86a93425c679bd0aeca223 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Wed, 17 Sep 2014 21:31:22 +0200 Subject: [PATCH] Fix DX9 bbox crash (DrawEngine::decoded wasn't initialized, because it also existed in the DX9 draw engine) --- GPU/Directx9/GPU_DX9.cpp | 4 +++- GPU/Directx9/TransformPipelineDX9.h | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 60d7347ba3..02bd8b1faa 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -886,7 +886,9 @@ void DIRECTX9_GPU::Execute_BoundingBox(u32 op, u32 diff) { } // Test if the bounding box is within the drawing region. - currentList->bboxResult = transformDraw_.TestBoundingBox(control_points, data, gstate.vertType); + if (control_points) { + currentList->bboxResult = transformDraw_.TestBoundingBox(control_points, data, gstate.vertType); + } } else { ERROR_LOG_REPORT_ONCE(boundingbox, G3D, "Bad bounding box data: %06x", data); // Data seems invalid. Let's assume the box test passed. diff --git a/GPU/Directx9/TransformPipelineDX9.h b/GPU/Directx9/TransformPipelineDX9.h index 242b6cbe43..b82c4240dd 100644 --- a/GPU/Directx9/TransformPipelineDX9.h +++ b/GPU/Directx9/TransformPipelineDX9.h @@ -193,10 +193,6 @@ private: VertexDecoderJitCache *decJitCache_; u32 lastVType_; - // Vertex collector buffers - u8 *decoded; - u16 *decIndex; - TransformedVertex *transformed; TransformedVertex *transformedExpanded;