From 1505740b73788c28914d4dc277378280e1e3ac0c Mon Sep 17 00:00:00 2001 From: mittorn Date: Fri, 6 Oct 2023 01:46:17 +0300 Subject: [PATCH] ref_gl: fix enabling multitexturing on GLES --- ref/gl/gl2_shim/fragment.glsl.inc | 2 +- ref/gl/gl2_shim/gl2_shim.c | 2 +- ref/gl/gl_opengl.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ref/gl/gl2_shim/fragment.glsl.inc b/ref/gl/gl2_shim/fragment.glsl.inc index 9319d143..1fafa020 100644 --- a/ref/gl/gl2_shim/fragment.glsl.inc +++ b/ref/gl/gl2_shim/fragment.glsl.inc @@ -9,7 +9,7 @@ R"( #define in varying #define texture texture2D #endif -#if version >= 130 +#if VER >= 130 precision mediump float; #endif #if ATTR_TEXCOORD0 diff --git a/ref/gl/gl2_shim/gl2_shim.c b/ref/gl/gl2_shim/gl2_shim.c index 9d8b710a..b2fd9360 100644 --- a/ref/gl/gl2_shim/gl2_shim.c +++ b/ref/gl/gl2_shim/gl2_shim.c @@ -154,7 +154,7 @@ static GLuint GL2_GenerateShader( gl2wrap_prog_t *prog, GLenum type ) int i; GLint status, len; GLuint id, loc; - int version = 130; + int version = 300; shader = shader_buf; //shader[0] = '\n'; diff --git a/ref/gl/gl_opengl.c b/ref/gl/gl_opengl.c index 95f0af82..8fc5a902 100644 --- a/ref/gl/gl_opengl.c +++ b/ref/gl/gl_opengl.c @@ -686,9 +686,12 @@ void GL_InitExtensionsGLES( void ) GL_CheckExtension( "vertex_buffer_object", vbofuncs, "gl_vertex_buffer_object", extid ); break; case GL_ARB_MULTITEXTURE: - GL_SetExtension( extid, true ); // required to be supported by wrapper + GL_CheckExtension( "multitexture", multitexturefuncs, "gl_arb_multitexture", GL_ARB_MULTITEXTURE ); + //GL_SetExtension( extid, true ); // required to be supported by wrapper pglGetIntegerv( GL_MAX_TEXTURE_UNITS_ARB, &glConfig.max_texture_units ); + if( glConfig.max_texture_units <= 1 ) + pglGetIntegerv( GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &glConfig.max_texture_units ); if( glConfig.max_texture_units <= 1 ) { GL_SetExtension( extid, false );