From d0038775e5436b5aaa29f3aff78e0945ec51d8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 10 Jan 2018 11:22:54 +0100 Subject: [PATCH] TODOs and indentations --- GPU/GLES/DrawEngineGLES.cpp | 1 + GPU/GLES/FramebufferManagerGLES.cpp | 4 ++-- GPU/GLES/StateMappingGLES.cpp | 1 + ext/native/thin3d/GLQueueRunner.cpp | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp index d6d803ed12..1aa3a0dd66 100644 --- a/GPU/GLES/DrawEngineGLES.cpp +++ b/GPU/GLES/DrawEngineGLES.cpp @@ -759,6 +759,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) { + // TODO: Implement with the render manager /* #ifndef USING_GLES2 if (isAllowTexture1D_) { diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index 67d9ce44cb..60bddd9499 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -293,8 +293,8 @@ void FramebufferManagerGLES::DestroyDeviceObjects() { } if (drawPixelsTex_) { render_->DeleteTexture(drawPixelsTex_); - drawPixelsTex_ = 0; - } + drawPixelsTex_ = 0; + } if (stencilUploadProgram_) { render_->DeleteProgram(stencilUploadProgram_); stencilUploadProgram_ = nullptr; diff --git a/GPU/GLES/StateMappingGLES.cpp b/GPU/GLES/StateMappingGLES.cpp index 1c8f52911d..0b9229e365 100644 --- a/GPU/GLES/StateMappingGLES.cpp +++ b/GPU/GLES/StateMappingGLES.cpp @@ -232,6 +232,7 @@ void DrawEngineGLES::ApplyDrawState(int prim) { // TODO: Make this dynamic // Logic Ops if (gstate.isLogicOpEnabled() && gstate.getLogicOp() != GE_LOGIC_COPY) { + // TODO: Fix logic ops. //glstate.colorLogicOp.enable(); //glstate.logicOp.set(logicOps[gstate.getLogicOp()]); } else { diff --git a/ext/native/thin3d/GLQueueRunner.cpp b/ext/native/thin3d/GLQueueRunner.cpp index c31bf38f4e..8f63e76f38 100644 --- a/ext/native/thin3d/GLQueueRunner.cpp +++ b/ext/native/thin3d/GLQueueRunner.cpp @@ -398,7 +398,6 @@ void GLQueueRunner::PerformRenderPass(const GLRStep &step) { PerformBindFramebufferAsRenderTarget(step); - glDisable(GL_SCISSOR_TEST); glDisable(GL_DEPTH_TEST); glDisable(GL_STENCIL_TEST); glDisable(GL_BLEND);