diff options
Diffstat (limited to '3rdparty/bgfx/src/renderer_gl.h')
-rw-r--r-- | 3rdparty/bgfx/src/renderer_gl.h | 48 |
1 files changed, 21 insertions, 27 deletions
diff --git a/3rdparty/bgfx/src/renderer_gl.h b/3rdparty/bgfx/src/renderer_gl.h index 9227d0e00cf..012f90d0fe5 100644 --- a/3rdparty/bgfx/src/renderer_gl.h +++ b/3rdparty/bgfx/src/renderer_gl.h @@ -107,7 +107,7 @@ typedef uint64_t GLuint64; #endif // BGFX_CONFIG_RENDERER_OPENGL #include "renderer.h" -#include "hmd_ovr.h" +#include "hmd.h" #include "hmd_openvr.h" #include "debug_renderdoc.h" @@ -720,6 +720,10 @@ typedef uint64_t GLuint64; # define GL_IMAGE_2D 0x904D #endif // GL_IMAGE_2D +#ifndef GL_IMAGE_2D_ARRAY +# define GL_IMAGE_2D_ARRAY 0x9053 +#endif // GL_IMAGE_2D_ARRAY + #ifndef GL_IMAGE_3D # define GL_IMAGE_3D 0x904E #endif // GL_IMAGE_3D @@ -915,6 +919,22 @@ typedef uint64_t GLuint64; # define GL_DEBUG_SEVERITY_NOTIFICATION 0x826b #endif // GL_DEBUG_SEVERITY_NOTIFICATION +#ifndef GL_LINE +# define GL_LINE 0x1B01 +#endif // GL_LINE + +#ifndef GL_FILL +# define GL_FILL 0x1B02 +#endif // GL_FILL + +#ifndef GL_MULTISAMPLE +# define GL_MULTISAMPLE 0x809D +#endif // GL_MULTISAMPLE + +#ifndef GL_LINE_SMOOTH +# define GL_LINE_SMOOTH 0x0B20 +#endif // GL_LINE_SMOOTH + #if BX_PLATFORM_NACL # include "glcontext_ppapi.h" #elif BX_PLATFORM_WINDOWS @@ -950,32 +970,6 @@ namespace bgfx namespace bgfx { namespace gl { -#if BGFX_CONFIG_USE_OVR - struct OVRBufferGL : public OVRBufferI - { - virtual void create(const ovrSession& _session, int _eyeIdx, int _msaaSamples) BX_OVERRIDE; - virtual void destroy(const ovrSession& _session) BX_OVERRIDE; - virtual void render(const ovrSession& _session) BX_OVERRIDE; - virtual void postRender(const ovrSession& _sesion) BX_OVERRIDE; - - GLuint m_eyeFbo; - GLuint m_eyeTexId; - GLuint m_depthBuffer; - GLuint m_msaaEyeFbo; - GLuint m_msaaEyeTexId; - GLuint m_msaaDepthBuffer; - }; - - struct OVRMirrorGL : public OVRMirrorI - { - virtual void create(const ovrSession& _session, int _width, int _height) BX_OVERRIDE; - virtual void destroy(const ovrSession& _session) BX_OVERRIDE; - virtual void blit(const ovrSession& _session) BX_OVERRIDE; - - GLuint m_mirrorFBO; - }; -#endif // BGFX_CONFIG_USE_OVR - void dumpExtensions(const char* _extensions); const char* glEnumName(GLenum _enum); |