Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Qt: Mac arch detection workaround on Qt4. Fix a conflict.

Browse Source
This commit is contained in:
Sacha 2014-06-10 15:11:25 +10:00
parent 56a513e20a
commit 87c7b31e77
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GPU/GLES/Framebuffer.cpp
View File

@ -1094,11 +1094,11 @@ void FramebufferManager::BindFramebufferDepth(VirtualFramebuffer *sourceframebuf
fbo_bind_for_read(sourceframebuffer->fbo);
glDisable(GL_SCISSOR_TEST);
#if defined(USING_GLES2) && (defined(ANDROID) || defined(BLACKBERRY)) // We only support this extension on Android, it's not even available on PC.
#if defined(USING_GLES2) && defined(ANDROID) // We only support this extension on Android, it's not even available on PC.
if (useNV) {
glBlitFramebufferNV(0, 0, sourceframebuffer->renderWidth, sourceframebuffer->renderHeight, 0, 0, targetframebuffer->renderWidth, targetframebuffer->renderHeight, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
} else
#endif // defined(USING_GLES2) && (defined(ANDROID) || defined(BLACKBERRY))
#endif // defined(USING_GLES2) && defined(ANDROID)
glBlitFramebuffer(0, 0, sourceframebuffer->renderWidth, sourceframebuffer->renderHeight, 0, 0, targetframebuffer->renderWidth, targetframebuffer->renderHeight, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
// If we set targetframebuffer->depthUpdated here, our optimization above would be pointless.
@ -1507,9 +1507,9 @@ void FramebufferManager::BlitFramebuffer_(VirtualFramebuffer *dst, int dstX, int
if (!useNV) {
glBlitFramebuffer(srcX1, srcY1, srcX2, srcY2, dstX1, dstY1, dstX2, dstY2, GL_COLOR_BUFFER_BIT, GL_NEAREST);
} else {
#if defined(USING_GLES2) && (defined(ANDROID) || defined(BLACKBERRY)) // We only support this extension on Android, it's not even available on PC.
#if defined(USING_GLES2) && defined(ANDROID) // We only support this extension on Android, it's not even available on PC.
glBlitFramebufferNV(srcX1, srcY1, srcX2, srcY2, dstX1, dstY1, dstX2, dstY2, GL_COLOR_BUFFER_BIT, GL_NEAREST);
#endif // defined(USING_GLES2) && (defined(ANDROID) || defined(BLACKBERRY))
#endif // defined(USING_GLES2) && defined(ANDROID)
}
} else {

2
Qt/Settings.pri
View File

@ -41,7 +41,7 @@ win32-msvc* {
}
# Arch specific
xarch = $$find(QT_ARCH, "86")
contains(QT_ARCH, windows)|count(xarch, 1) {
macx|contains(QT_ARCH, windows)|count(xarch, 1) {
!win32-msvc*: QMAKE_CXXFLAGS += -msse2
CONFIG += x86
} else { # Assume ARM

2
native

@ -1 +1 @@
Subproject commit 271ecd0cae6e340bf0d16bc41409b15311712c4f
Subproject commit dd03687400d18fb8b2747ba22901bb525cac5ff7