From 3ed331220f0545f441d4409bf73b6e603eb0e536 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sat, 27 Apr 2013 13:30:35 -0700 Subject: [PATCH] Cleanup. --- src/glcontext_glx.cpp | 8 ++------ src/glcontext_ppapi.cpp | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/glcontext_glx.cpp b/src/glcontext_glx.cpp index d67a3581..04f0f930 100644 --- a/src/glcontext_glx.cpp +++ b/src/glcontext_glx.cpp @@ -5,13 +5,11 @@ #include "bgfx_p.h" -#if (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL) +#if BX_PLATFORM_LINUX & (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL) # include "renderer_gl.h" # define GLX_GLXEXT_PROTOTYPES # include -# if BX_PLATFORM_LINUX - namespace bgfx { # define GL_IMPORT(_optional, _proto, _func) _proto _func @@ -201,6 +199,4 @@ namespace bgfx } // namespace bgfx -# endif // BX_PLATFORM_LINUX -#endif // (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL) - +#endif // BX_PLATFORM_LINUX & (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL) diff --git a/src/glcontext_ppapi.cpp b/src/glcontext_ppapi.cpp index e5c61027..e6be1983 100644 --- a/src/glcontext_ppapi.cpp +++ b/src/glcontext_ppapi.cpp @@ -5,11 +5,9 @@ #include "bgfx_p.h" -#if (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL) +#if BX_PLATFORM_NACL & (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL) # include "renderer_gl.h" -# if BX_PLATFORM_NACL - namespace bgfx { # define GL_IMPORT(_optional, _proto, _func) _proto _func @@ -65,5 +63,4 @@ namespace bgfx } } // namespace bgfx -# endif // BX_PLATFORM_NACL -#endif // (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL) +#endif // BX_PLATFORM_NACL & (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL)