From 596abeca0606b1ea4690dc6ad4ee18e7066a954d Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 29 Jun 2014 15:45:11 -0700 Subject: [PATCH] Use the same vertex decoders for splines. Had the vert type bits at the top. --- GPU/GLES/Spline.cpp | 3 ++- GPU/GLES/TransformPipeline.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GPU/GLES/Spline.cpp b/GPU/GLES/Spline.cpp index 81d8a39c05..0ba3a16533 100644 --- a/GPU/GLES/Spline.cpp +++ b/GPU/GLES/Spline.cpp @@ -135,7 +135,8 @@ u32 TransformDrawEngine::NormalizeVertices(u8 *outPtr, u8 *bufPtr, const u8 *inP } u32 TransformDrawEngine::NormalizeVertices(u8 *outPtr, u8 *bufPtr, const u8 *inPtr, int lowerBound, int upperBound, u32 vertType) { - VertexDecoder *dec = GetVertexDecoder(vertType); + const u32 vertTypeID = (vertType & 0xFFFFFF) | (gstate.getUVGenMode() << 24); + VertexDecoder *dec = GetVertexDecoder(vertTypeID); return NormalizeVertices(outPtr, bufPtr, inPtr, dec, lowerBound, upperBound, vertType); } diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp index 907e9b94a9..b35211a57d 100644 --- a/GPU/GLES/TransformPipeline.cpp +++ b/GPU/GLES/TransformPipeline.cpp @@ -263,7 +263,6 @@ inline void TransformDrawEngine::SetupVertexDecoderInternal(u32 vertType) { const u32 vertTypeID = (vertType & 0xFFFFFF) | (gstate.getUVGenMode() << 24); // If vtype has changed, setup the vertex decoder. - // TODO: Simply cache the setup decoders instead. if (vertTypeID != lastVType_) { dec_ = GetVertexDecoder(vertTypeID); lastVType_ = vertTypeID;