From 638cbf725b6bf7ebe52f88ca7ccd344055bd5081 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 20 Jan 2018 07:58:04 -0800 Subject: [PATCH] GLES: Skip blend reset after stencil upload. We dirty the flag anyway. Avoid extra calls. --- GPU/GLES/StencilBufferGLES.cpp | 1 - ext/native/thin3d/GLQueueRunner.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/GPU/GLES/StencilBufferGLES.cpp b/GPU/GLES/StencilBufferGLES.cpp index 0f3a19b881..e86aad078f 100644 --- a/GPU/GLES/StencilBufferGLES.cpp +++ b/GPU/GLES/StencilBufferGLES.cpp @@ -196,7 +196,6 @@ bool FramebufferManagerGLES::NotifyStencilUpload(u32 addr, int size, bool skipZe draw_->BlitFramebuffer(blitFBO, 0, 0, w, h, dstBuffer->fbo, 0, 0, dstBuffer->renderWidth, dstBuffer->renderHeight, Draw::FB_STENCIL_BIT, Draw::FB_BLIT_NEAREST); } - render_->SetNoBlendAndMask(0xF); gstate_c.Dirty(DIRTY_BLEND_STATE | DIRTY_DEPTHSTENCIL_STATE | DIRTY_VIEWPORTSCISSOR_STATE); RebindFramebuffer(); return true; diff --git a/ext/native/thin3d/GLQueueRunner.cpp b/ext/native/thin3d/GLQueueRunner.cpp index b7a107bc69..da262e425d 100644 --- a/ext/native/thin3d/GLQueueRunner.cpp +++ b/ext/native/thin3d/GLQueueRunner.cpp @@ -214,7 +214,7 @@ void GLQueueRunner::RunInitSteps(const std::vector &steps) { boundTexture = tex->texture; } glTexParameteri(tex->target, GL_TEXTURE_MAX_LEVEL, step.texture_finalize.maxLevel); - tex->maxLod = step.texture_finalize.maxLevel; + tex->maxLod = (float)step.texture_finalize.maxLevel; if (step.texture_finalize.genMips) { glGenerateMipmap(tex->target); }