From c2586523feeeed3b4a73d3d0da4895ab29769e3a Mon Sep 17 00:00:00 2001 From: Aapo Rantalainen Date: Wed, 13 Nov 2013 18:23:18 +0200 Subject: [PATCH] Maemo5: added !defined(MAEMO) as !defined(MEEGO_EDITION_HARMATTAN) --- GPU/GLES/Framebuffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index f29dc626cc..3cbaa63318 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -462,7 +462,7 @@ void FramebufferManager::DrawPlainColor(u32 color) { void FramebufferManager::DrawActiveTexture(GLuint texture, float x, float y, float w, float h, float destW, float destH, bool flip, float uscale, float vscale, GLSLProgram *program) { if (texture) { // We know the texture, we can do a DrawTexture shortcut on nvidia. -#if defined(USING_GLES2) && !defined(__SYMBIAN32__) && !defined(MEEGO_EDITION_HARMATTAN) && !defined(IOS) && !defined(BLACKBERRY) +#if defined(USING_GLES2) && !defined(__SYMBIAN32__) && !defined(MEEGO_EDITION_HARMATTAN) && !defined(IOS) && !defined(BLACKBERRY) && !defined(MAEMO) if (gl_extensions.NV_draw_texture && !program) { // Fast path for Tegra. TODO: Make this path work on desktop nvidia, seems GLEW doesn't have a clue. // Actually, on Desktop we should just use glBlitFramebuffer - although we take a texture here