From 147d311acb60fac55acd53cd92b76d7aad173aee Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Fri, 3 Mar 2017 12:32:01 +0100 Subject: [PATCH] Fix typo with isAllowTexture2D for hardware tesselation --- GPU/GLES/DrawEngineGLES.cpp | 2 +- GPU/GLES/DrawEngineGLES.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp index 0daec9d8ac..c54df889e5 100644 --- a/GPU/GLES/DrawEngineGLES.cpp +++ b/GPU/GLES/DrawEngineGLES.cpp @@ -1118,7 +1118,7 @@ bool DrawEngineGLES::IsCodePtrVertexDecoder(const u8 *ptr) const { void DrawEngineGLES::TessellationDataTransferGLES::SendDataToShader(const float *pos, const float *tex, const float *col, int size, bool hasColor, bool hasTexCoords) { #ifndef USING_GLES2 - if (isAllowTexture1D) { + if (isAllowTexture1D_) { // Position glActiveTexture(GL_TEXTURE4); glBindTexture(GL_TEXTURE_1D, data_tex[0]); diff --git a/GPU/GLES/DrawEngineGLES.h b/GPU/GLES/DrawEngineGLES.h index a2cee574bd..7ca161095f 100644 --- a/GPU/GLES/DrawEngineGLES.h +++ b/GPU/GLES/DrawEngineGLES.h @@ -243,9 +243,9 @@ private: class TessellationDataTransferGLES : public TessellationDataTransfer { private: int data_tex[3]; - bool isAllowTexture1D; + bool isAllowTexture1D_; public: - TessellationDataTransferGLES(bool isAllowTexture1D) : TessellationDataTransfer(), data_tex(), isAllowTexture1D(isAllowTexture1D) { + TessellationDataTransferGLES(bool isAllowTexture1D) : TessellationDataTransfer(), data_tex(), isAllowTexture1D_(isAllowTexture1D) { glGenTextures(3, (GLuint*)data_tex); } ~TessellationDataTransferGLES() {