Skip to content

opengl shader fixes and an xcode fix #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrentDaMage merged 2 commits into from
Jan 5, 2026
Merged

opengl shader fixes and an xcode fix #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c75c4
Fixed building on Xcode 3
BrentDaMage Jan 4, 2026
e6051b1
Fixed OpenGL Shaders on older OpenGL versions
BrentDaMage Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions source/renderer/VertexFormat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include <string.h>
#define __STDC_LIMIT_MACROS
#include <stdint.h>

#include "VertexFormat.hpp"
#include "world/phys/Vec2.hpp"
Expand Down
2 changes: 2 additions & 0 deletions source/renderer/hal/ogl/ShaderOGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ void ShaderOGL::finalizeShaderUniforms()

void ShaderOGL::freeCompilerResources()
{
#ifdef USE_GL_SHADER_PRECISION
xglReleaseShaderCompiler();
#endif
glGetError();
}

Expand Down
2 changes: 1 addition & 1 deletion source/renderer/platform/ogl/ShaderPrecision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
8 changes: 8 additions & 0 deletions thirdparty/GL/GL.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/stb_image/include
Open in desktop
Submodule include updated 12 files
+3 −0 .gitignore
+9 −7 README.md
+2 −1 stb_c_lexer.h
+178 −177 stb_image.h
+935 −677 stb_image_resize2.h
+8 −6 stb_truetype.h
+259 −0 tests/pngsuite/ref_results.csv
+4 −0 tests/stb.dsp
+47 −0 tests/test_png_paeth.c
+75 −0 tests/test_png_regress.c
+1 −1 tests/test_vorbis.c
+4 −2 tools/README.header.md