From 654eb220220e08fee5b3d99dc887f25de152bed2 Mon Sep 17 00:00:00 2001 From: Sergey Pisarchik Date: Tue, 8 Apr 2014 17:39:30 +0300 Subject: [PATCH] [Tizen] After review --- graphics/opengl/opengl.cpp | 29 ----------------------------- graphics/opengl/opengl.hpp | 4 ---- 2 files changed, 33 deletions(-) diff --git a/graphics/opengl/opengl.cpp b/graphics/opengl/opengl.cpp index 2e6a387f78..6a507375fb 100644 --- a/graphics/opengl/opengl.cpp +++ b/graphics/opengl/opengl.cpp @@ -6,11 +6,6 @@ #include "../../std/bind.hpp" -#ifdef OMIM_OS_TIZEN - #include -#endif - - namespace graphics { namespace gl @@ -162,23 +157,6 @@ namespace graphics // case GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW"; //< not supported in OpenGL ES2.0 // case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW"; //< not supported in OpenGL ES2.0 case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY"; -#ifdef OMIM_OS_TIZEN /* Errors / GetError return values */ - case EGL_SUCCESS : return 0; - case EGL_NOT_INITIALIZED : return "EGL_NOT_INITIALIZED"; - case EGL_BAD_ACCESS : return "EGL_BAD_ACCESS"; - case EGL_BAD_ALLOC : return "EGL_BAD_ALLOC"; - case EGL_BAD_ATTRIBUTE : return "EGL_BAD_ATTRIBUTE"; - case EGL_BAD_CONFIG : return "EGL_BAD_CONFIG"; - case EGL_BAD_CONTEXT : return "EGL_BAD_CONTEXT"; - case EGL_BAD_CURRENT_SURFACE : return "EGL_BAD_CURRENT_SURFACE"; - case EGL_BAD_DISPLAY : return "EGL_BAD_DISPLAY"; - case EGL_BAD_MATCH : return "EGL_BAD_MATCH"; - case EGL_BAD_NATIVE_PIXMAP : return "EGL_BAD_NATIVE_PIXMAP"; - case EGL_BAD_NATIVE_WINDOW : return "EGL_BAD_NATIVE_WINDOW"; - case EGL_BAD_PARAMETER : return "EGL_BAD_PARAMETER"; - case EGL_BAD_SURFACE : return "EGL_BAD_SURFACE"; - case EGL_CONTEXT_LOST : return "EGL_CONTEXT_LOST"; -#endif default: return 0; } } @@ -187,12 +165,5 @@ namespace graphics { LogError(Error2String(glGetError()), srcPt); } - -#ifdef OMIM_OS_TIZEN - void CheckEGLError(my::SrcPoint const & srcPt) - { - LogError(Error2String(eglGetError()), srcPt); - } -#endif } } diff --git a/graphics/opengl/opengl.hpp b/graphics/opengl/opengl.hpp index 1295c98f59..cf309b3cd0 100644 --- a/graphics/opengl/opengl.hpp +++ b/graphics/opengl/opengl.hpp @@ -226,7 +226,6 @@ namespace graphics }; void CheckError(my::SrcPoint const & srcPt); - void CheckEGLError(my::SrcPoint const & srcPt); } } @@ -237,15 +236,12 @@ namespace graphics #ifdef OMIM_GL_ENABLE_TRACE #define OGLCHECK(f) do { if (graphics::gl::g_doLogOGLCalls) LOG(LDEBUG, (#f)); if (graphics::gl::g_hasContext) {f; graphics::gl::CheckError(SRC());} else LOG(LDEBUG, ("no OGL context. skipping OGL call")); } while(false) #define OGLCHECKAFTER if (graphics::gl::g_doLogOGLCalls) LOG(LDEBUG, ("OGLCHECKAFTER")); graphics::gl::CheckError(SRC()) - #define EGLCHECK do { LOG(LDEBUG, ("EGLCHECK")); graphics::gl::CheckEGLError(SRC()); } while(false) #else #define OGLCHECK(f) do { if (graphics::gl::g_hasContext) {f; graphics::gl::CheckError(SRC());} else LOG(LDEBUG, ("no OGL context. skipping OGL call.")); } while(false) #define OGLCHECKAFTER graphics::gl::CheckError(SRC()) - #define EGLCHECK do { graphics::gl::CheckEGLError(SRC()); } while(false) #endif #else #define OGLCHECK(f) do {if (graphics::gl::g_hasContext) {f;} else LOG(LDEBUG, ("no OGL context. skipping OGL call."));} while (false) #define OGLCHECKAFTER -#define EGLCHECK #endif