From 76ea3c39a0dcf816e435ced3c61f43d5215c1b7c Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 27 Nov 2021 05:11:45 +0300 Subject: [PATCH] ref_gl: disable multisample texture for gl4es too --- ref_gl/gl_export.h | 4 ++-- ref_gl/gl_image.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ref_gl/gl_export.h b/ref_gl/gl_export.h index 819095d8..07d071d9 100644 --- a/ref_gl/gl_export.h +++ b/ref_gl/gl_export.h @@ -1354,9 +1354,9 @@ APIENTRY_LINKAGE void GL_FUNCTION( glGenVertexArrays )( GLsizei n, const GLuint APIENTRY_LINKAGE GLboolean GL_FUNCTION( glIsVertexArray )( GLuint array ); APIENTRY_LINKAGE void GL_FUNCTION( glSwapInterval ) ( int interval ); -#if defined( XASH_GLES ) +#if !defined( XASH_GLES ) && !defined( XASH_GL4ES ) APIENTRY_LINKAGE void GL_FUNCTION( glTexImage2DMultisample )(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -#endif /* XASH_GLES */ +#endif /* !XASH_GLES && !XASH_GL4ES */ #if defined( XASH_GL_STATIC ) && !defined( REF_GL_KEEP_MANGLED_FUNCTIONS ) #define pglGetError glGetError diff --git a/ref_gl/gl_image.c b/ref_gl/gl_image.c index 168591ef..610d762f 100644 --- a/ref_gl/gl_image.c +++ b/ref_gl/gl_image.c @@ -1047,7 +1047,7 @@ static void GL_TextureImageRAW( gl_texture_t *tex, GLint side, GLint level, GLin } else if( tex->target == GL_TEXTURE_2D_MULTISAMPLE ) { -#if !defined( XASH_GLES ) +#if !defined( XASH_GLES ) && !defined( XASH_GL4ES ) samplesCount = (GLsizei)gEngfuncs.pfnGetCvarFloat("gl_msaa_samples"); switch (samplesCount) { @@ -1060,9 +1060,9 @@ static void GL_TextureImageRAW( gl_texture_t *tex, GLint side, GLint level, GLin samplesCount = 1; } pglTexImage2DMultisample( tex->target, samplesCount, tex->format, width, height, GL_TRUE ); -#else /* XASH_GLES */ - Con_Printf( S_ERROR "GLES renderer don't support GL_TEXTURE_2D_MULTISAMPLE!\n" ); -#endif /* XASH_GLES */ +#else /* !XASH_GLES && !XASH_GL4ES */ + gEngfuncs.Con_Printf( S_ERROR "GLES renderer don't support GL_TEXTURE_2D_MULTISAMPLE!\n" ); +#endif /* !XASH_GLES && !XASH_GL4ES */ } else // 2D or RECT {