ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: 

- Fix drawing bug where the wrong texture coordinates were being used when a display window is in Touch mode. (Regression from r5249.)
This commit is contained in:
rogerman 2015-08-25 23:44:19 +00:00
parent e344486e8a
commit c36c379e1f
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
desmume/src/cocoa/OGLDisplayOutput.cpp
View File

@ -6673,7 +6673,7 @@ void OGLDisplayLayer::ProcessOGL()
GLfloat w1 = this->_texLoadedWidth[1]; GLfloat w1 = this->_texLoadedWidth[1];
GLfloat h1 = this->_texLoadedHeight[1]; GLfloat h1 = this->_texLoadedHeight[1];
if (this->_isTexVideoInputDataNative[0]) if (this->_isTexVideoInputDataNative[0] && (displayMode == DS_DISPLAY_TYPE_MAIN || displayMode == DS_DISPLAY_TYPE_DUAL))
{ {
if (!isUsingCPUPixelScaler) if (!isUsingCPUPixelScaler)
{ {
@ -6686,20 +6686,17 @@ void OGLDisplayLayer::ProcessOGL()
} }
else else
{ {
if (displayMode == DS_DISPLAY_TYPE_MAIN || displayMode == DS_DISPLAY_TYPE_DUAL) uint32_t *texData = this->_vf[0]->RunFilter();
{ texVideoPixelScalerID[0] = this->_texCPUFilterDstID[0];
uint32_t *texData = this->_vf[0]->RunFilter(); glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texVideoPixelScalerID[0]);
texVideoPixelScalerID[0] = this->_texCPUFilterDstID[0]; glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, this->_vf[0]->GetDstWidth(), this->_vf[0]->GetDstHeight(), GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texData);
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texVideoPixelScalerID[0]);
glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, this->_vf[0]->GetDstWidth(), this->_vf[0]->GetDstHeight(), GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texData); w0 = this->_vf[0]->GetDstWidth();
h0 = this->_vf[0]->GetDstHeight();
w0 = this->_vf[0]->GetDstWidth();
h0 = this->_vf[0]->GetDstHeight();
}
} }
} }
if (this->_isTexVideoInputDataNative[1]) if (this->_isTexVideoInputDataNative[1] && (displayMode == DS_DISPLAY_TYPE_TOUCH || displayMode == DS_DISPLAY_TYPE_DUAL))
{ {
if (!isUsingCPUPixelScaler) if (!isUsingCPUPixelScaler)
{ {
@ -6712,16 +6709,13 @@ void OGLDisplayLayer::ProcessOGL()
} }
else else
{ {
if (displayMode == DS_DISPLAY_TYPE_TOUCH || displayMode == DS_DISPLAY_TYPE_DUAL) uint32_t *texData = this->_vf[1]->RunFilter();
{ texVideoPixelScalerID[1] = this->_texCPUFilterDstID[1];
uint32_t *texData = this->_vf[1]->RunFilter(); glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texVideoPixelScalerID[1]);
texVideoPixelScalerID[1] = this->_texCPUFilterDstID[1]; glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, this->_vf[1]->GetDstWidth(), this->_vf[1]->GetDstHeight(), GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texData);
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, texVideoPixelScalerID[1]);
glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, this->_vf[1]->GetDstWidth(), this->_vf[1]->GetDstHeight(), GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texData); w1 = this->_vf[1]->GetDstWidth();
h1 = this->_vf[1]->GetDstHeight();
w1 = this->_vf[1]->GetDstWidth();
h1 = this->_vf[1]->GetDstHeight();
}
} }
} }
@ -6763,7 +6757,7 @@ void OGLDisplayLayer::RenderOGL()
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texVideoOutputID[1]); glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texVideoOutputID[1]);
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, this->_displayTexFilter[1]); glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, this->_displayTexFilter[1]);
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, this->_displayTexFilter[1]); glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, this->_displayTexFilter[1]);
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0); glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, (GLubyte *)(6 * sizeof(GLubyte)));
break; break;
case DS_DISPLAY_TYPE_DUAL: case DS_DISPLAY_TYPE_DUAL: