From 87c7b31e77efb5181207896df1668a0ab3177deb Mon Sep 17 00:00:00 2001 From: Sacha Date: Tue, 10 Jun 2014 15:11:25 +1000 Subject: [PATCH] Qt: Mac arch detection workaround on Qt4. Fix a conflict. --- GPU/GLES/Framebuffer.cpp | 8 ++++---- Qt/Settings.pri | 2 +- native | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 5b72bd9c32..74765f325f 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -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 { diff --git a/Qt/Settings.pri b/Qt/Settings.pri index ff4710d7db..8d4b63d7c0 100644 --- a/Qt/Settings.pri +++ b/Qt/Settings.pri @@ -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 diff --git a/native b/native index 271ecd0cae..dd03687400 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 271ecd0cae6e340bf0d16bc41409b15311712c4f +Subproject commit dd03687400d18fb8b2747ba22901bb525cac5ff7