From 01bdb6e160c3a847ce312463a2f1a05f5c3fb6d0 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Mon, 15 Sep 2014 07:08:55 -0700 Subject: [PATCH] Cleanup some minor vertex cache stuff. --- GPU/Directx9/GPU_DX9.cpp | 2 +- GPU/Directx9/TransformPipelineDX9.h | 2 -- GPU/GLES/GLES_GPU.cpp | 2 +- GPU/GLES/TransformPipeline.cpp | 1 + GPU/GLES/TransformPipeline.h | 2 -- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 8f66b2f0dc..60d7347ba3 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -133,7 +133,7 @@ static const CommandTableEntry commandTable[] = { {GE_CMD_COLORTESTMASK, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTEONCHANGE, &DIRECTX9_GPU::Execute_ColorTestMask}, // These change the vertex shader so need flushing. - {GE_CMD_REVERSENORMAL, FLAG_FLUSHBEFOREONCHANGE}, // TODO: This one is actually processed during vertex decoding which is wrong. + {GE_CMD_REVERSENORMAL, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_LIGHTINGENABLE, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_LIGHTENABLE0, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_LIGHTENABLE1, FLAG_FLUSHBEFOREONCHANGE}, diff --git a/GPU/Directx9/TransformPipelineDX9.h b/GPU/Directx9/TransformPipelineDX9.h index 5be4f6c33b..242b6cbe43 100644 --- a/GPU/Directx9/TransformPipelineDX9.h +++ b/GPU/Directx9/TransformPipelineDX9.h @@ -63,7 +63,6 @@ public: status = VAI_NEW; vbo = 0; ebo = 0; - numDCs = 0; prim = GE_PRIM_INVALID; numDraws = 0; numFrames = 0; @@ -95,7 +94,6 @@ public: s8 prim; // ID information - u8 numDCs; int numDraws; int numFrames; int lastFrame; // So that we can forget. diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index d65d64b465..a92c5f538a 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -129,7 +129,7 @@ static const CommandTableEntry commandTable[] = { {GE_CMD_COLORTESTMASK, FLAG_FLUSHBEFOREONCHANGE | FLAG_EXECUTEONCHANGE, &GLES_GPU::Execute_ColorTestMask}, // These change the vertex shader so need flushing. - {GE_CMD_REVERSENORMAL, FLAG_FLUSHBEFOREONCHANGE}, // TODO: This one is actually processed during vertex decoding which is wrong. + {GE_CMD_REVERSENORMAL, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_LIGHTINGENABLE, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_LIGHTENABLE0, FLAG_FLUSHBEFOREONCHANGE}, {GE_CMD_LIGHTENABLE1, FLAG_FLUSHBEFOREONCHANGE}, diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp index 1538d03fa4..153fd03a87 100644 --- a/GPU/GLES/TransformPipeline.cpp +++ b/GPU/GLES/TransformPipeline.cpp @@ -129,6 +129,7 @@ TransformDrawEngine::TransformDrawEngine() numDrawCalls(0), vertexCountInDrawCalls(0), decodeCounter_(0), + dcid_(0), uvScale(0), fboTexBound_(false) { decimationCounter_ = VERTEXCACHE_DECIMATION_INTERVAL; diff --git a/GPU/GLES/TransformPipeline.h b/GPU/GLES/TransformPipeline.h index f1a1ede6c4..d1fd21d01d 100644 --- a/GPU/GLES/TransformPipeline.h +++ b/GPU/GLES/TransformPipeline.h @@ -59,7 +59,6 @@ public: status = VAI_NEW; vbo = 0; ebo = 0; - numDCs = 0; prim = GE_PRIM_INVALID; numDraws = 0; numFrames = 0; @@ -91,7 +90,6 @@ public: s8 prim; // ID information - u8 numDCs; int numDraws; int numFrames; int lastFrame; // So that we can forget.