diff --git a/source/renderer/VertexFormat.cpp b/source/renderer/VertexFormat.cpp index f43bf4324..21bc1c1b5 100644 --- a/source/renderer/VertexFormat.cpp +++ b/source/renderer/VertexFormat.cpp @@ -1,4 +1,6 @@ #include +#define __STDC_LIMIT_MACROS +#include #include "VertexFormat.hpp" #include "world/phys/Vec2.hpp" diff --git a/source/renderer/hal/ogl/ShaderOGL.cpp b/source/renderer/hal/ogl/ShaderOGL.cpp index ce98f8da6..f985ad90d 100644 --- a/source/renderer/hal/ogl/ShaderOGL.cpp +++ b/source/renderer/hal/ogl/ShaderOGL.cpp @@ -68,7 +68,9 @@ void ShaderOGL::finalizeShaderUniforms() void ShaderOGL::freeCompilerResources() { +#ifdef USE_GL_SHADER_PRECISION xglReleaseShaderCompiler(); +#endif glGetError(); } diff --git a/source/renderer/platform/ogl/ShaderPrecision.cpp b/source/renderer/platform/ogl/ShaderPrecision.cpp index b9e959157..b21c7467b 100644 --- a/source/renderer/platform/ogl/ShaderPrecision.cpp +++ b/source/renderer/platform/ogl/ShaderPrecision.cpp @@ -33,7 +33,7 @@ GLint Precision::_getPrecision(GLenum shaderType, GLenum precisionType) GLint range[2]; GLint precision = -1; -#if GL_VERSION_4_1 +#ifdef USE_GL_SHADER_PRECISION const gl::Version& glVersion = gl::Version::singleton(); if (glVersion.major >= 4 && glVersion.minor >= 1) { diff --git a/thirdparty/GL/GL.hpp b/thirdparty/GL/GL.hpp index cf5c3c6c9..31b7000b9 100644 --- a/thirdparty/GL/GL.hpp +++ b/thirdparty/GL/GL.hpp @@ -88,6 +88,12 @@ // use our macro for glOrtho #endif +#ifndef GL_LOW_FLOAT +#define GL_LOW_FLOAT 0x8DF0 +#define GL_MEDIUM_FLOAT 0x8DF1 +#define GL_HIGH_FLOAT 0x8DF2 +#endif + #if defined(MC_GL_DEBUG_OUTPUT) && !defined(GL_ARB_debug_output) #undef MC_GL_DEBUG_OUTPUT #endif @@ -169,6 +175,7 @@ bool xglInitted(); #define xglEnableVertexAttribArray glEnableVertexAttribArray #endif // GL_VERSION_2_0 || GL_ES_VERSION_2_0 #if GL_VERSION_4_1 || GL_ES_VERSION_2_0 +#define USE_GL_SHADER_PRECISION #define xglReleaseShaderCompiler glReleaseShaderCompiler #define xglGetShaderPrecisionFormat glGetShaderPrecisionFormat #endif // GL_VERSION_4_1 || GL_ES_VERSION_2_0 @@ -229,6 +236,7 @@ GLint xglGetAttribLocation(GLuint program, const GLchar* name); void xglEnableVertexAttribArray(GLuint index); #endif // GL_VERSION_2_0 || GL_ES_VERSION_2_0 #if GL_VERSION_4_1 || GL_ES_VERSION_2_0 +#define USE_GL_SHADER_PRECISION void xglReleaseShaderCompiler(); void xglGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision); #endif diff --git a/thirdparty/stb_image/include b/thirdparty/stb_image/include index beebb24b9..f7f20f39f 160000 --- a/thirdparty/stb_image/include +++ b/thirdparty/stb_image/include @@ -1 +1 @@ -Subproject commit beebb24b945efdea3b9bba23affb8eb3ba8982e7 +Subproject commit f7f20f39fe4f206c6f19e26ebfef7b261ee59ee4