From 9849a8826936a3712f79ec88a93fe4b8f1730b3b Mon Sep 17 00:00:00 2001 From: rogerman Date: Wed, 21 Jan 2015 02:53:45 +0000 Subject: [PATCH] Cocoa Port: - Fix bug where using Deposterize with a CPU-based pixel scaler would make the video fail to update. (Regression from r5083.) --- desmume/src/cocoa/OGLDisplayOutput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desmume/src/cocoa/OGLDisplayOutput.cpp b/desmume/src/cocoa/OGLDisplayOutput.cpp index f9de866a7..f60e24859 100644 --- a/desmume/src/cocoa/OGLDisplayOutput.cpp +++ b/desmume/src/cocoa/OGLDisplayOutput.cpp @@ -2342,7 +2342,7 @@ void OGLDisplayLayer::LoadFrameOGL(const uint16_t *frameData, GLsizei w, GLsizei const GLint lineOffset = (this->_displayMode == DS_DISPLAY_TYPE_TOUCH) ? h : 0; const bool isUsingCPUPixelScaler = this->_pixelScaler != VideoFilterTypeID_None && !(this->_useShaderBasedPixelScaler && this->_filtersPreferGPU); - if (!isUsingCPUPixelScaler) + if (!isUsingCPUPixelScaler || this->_useDeposterize) { glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texVideoInputDataID); glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, lineOffset, w, h, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, frameData);