From b89ab48201dfe66623bf2b791879b29664857ebe Mon Sep 17 00:00:00 2001 From: Riley S Date: Wed, 24 Feb 2021 00:37:31 -0500 Subject: [PATCH] Better non-braching check --- src/gl/gl3device.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gl/gl3device.cpp b/src/gl/gl3device.cpp index c5756c3..47e54f8 100644 --- a/src/gl/gl3device.cpp +++ b/src/gl/gl3device.cpp @@ -1412,12 +1412,11 @@ rasterRenderFast(Raster *raster, int32 x, int32 y) case Raster::CAMERA: setActiveTexture(0); glBindTexture(GL_TEXTURE_2D, natdst->texid); - if(dpiScale.x != 1 || dpiScale.y != 1) - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, x, (dst->height-src->height)-y, - src->width/dpiScale.x, src->height/dpiScale.y, src->width, src->height); - else - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, x, (dst->height-src->height)-y, - 0, 0, src->width, src->height); + + glCopyTexSubImage2D(GL_TEXTURE_2D, 0, x, (dst->height-src->height)-y, + src->width - src->width/dpiScale.x, src->height - src->height/dpiScale.y, + src->width, src->height); + glBindTexture(GL_TEXTURE_2D, boundTexture[0]); return 1; }