This commit is contained in:
bkaradzic 2013-04-27 13:30:35 -07:00
parent 3686725fef
commit 3ed331220f
2 changed files with 4 additions and 11 deletions

View file

@ -5,13 +5,11 @@
#include "bgfx_p.h" #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" # include "renderer_gl.h"
# define GLX_GLXEXT_PROTOTYPES # define GLX_GLXEXT_PROTOTYPES
# include <glx/glxext.h> # include <glx/glxext.h>
# if BX_PLATFORM_LINUX
namespace bgfx namespace bgfx
{ {
# define GL_IMPORT(_optional, _proto, _func) _proto _func # define GL_IMPORT(_optional, _proto, _func) _proto _func
@ -201,6 +199,4 @@ namespace bgfx
} // namespace bgfx } // namespace bgfx
# endif // BX_PLATFORM_LINUX #endif // BX_PLATFORM_LINUX & (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL)
#endif // (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL)

View file

@ -5,11 +5,9 @@
#include "bgfx_p.h" #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" # include "renderer_gl.h"
# if BX_PLATFORM_NACL
namespace bgfx namespace bgfx
{ {
# define GL_IMPORT(_optional, _proto, _func) _proto _func # define GL_IMPORT(_optional, _proto, _func) _proto _func
@ -65,5 +63,4 @@ namespace bgfx
} }
} // namespace bgfx } // namespace bgfx
# endif // BX_PLATFORM_NACL #endif // BX_PLATFORM_NACL & (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL)
#endif // (BGFX_CONFIG_RENDERER_OPENGLES2|BGFX_CONFIG_RENDERER_OPENGLES3|BGFX_CONFIG_RENDERER_OPENGL)