From 7621516c1ca0ecf9f80d094763a1705c32d7458f Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Mon, 12 Feb 2018 23:39:19 +0800 Subject: Now we have unified the GLFW versions (uglily). Also fixed a symbol conflict for the good old msvc. --- smelt/glfw/smelt_internal.hpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'smelt/glfw/smelt_internal.hpp') diff --git a/smelt/glfw/smelt_internal.hpp b/smelt/glfw/smelt_internal.hpp index 9f51838..5b82bf6 100644 --- a/smelt/glfw/smelt_internal.hpp +++ b/smelt/glfw/smelt_internal.hpp @@ -44,8 +44,9 @@ class TOpenGLDevice { public: - GLenum TextureTarget; bool have_base_opengl; +#ifdef USE_OPENGL_COMPATIBILITY_PROFILE + GLenum TextureTarget; bool have_GL_ARB_texture_rectangle; bool have_GL_ARB_texture_non_power_of_two; bool have_GL_EXT_framebuffer_object; @@ -53,6 +54,7 @@ public: bool have_GL_ARB_vertex_buffer_object; bool have_GL_EXT_framebuffer_multisample; bool have_GL_EXT_framebuffer_blit; +#endif }; struct glTexture; @@ -193,6 +195,15 @@ public: smVertex *vertexBuf; GLushort *indexBuf; GLuint IndexBufferObject; +#ifndef USE_OPENGL_COMPATIBILITY_PROFILE + GLuint VertexBufferObject; + GLuint VertexArrayObject; + GLuint ShaderProgram; + GLuint fragshader,vertshader; + int loc_tex,loc_mmodv,loc_mproj; + float mmodv[16],mproj[16]; + SMTEX emptyTex; +#endif TRenderTargetList *targets; TRenderTargetList *curTarget; TTextureList *textures; -- cgit v1.2.3