diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/refresh/gl/images.c | 18 | ||||
| -rw-r--r-- | src/refresh/gl/main.c | 5 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/refresh/gl/images.c b/src/refresh/gl/images.c index 25ea3e8..035a5ee 100644 --- a/src/refresh/gl/images.c +++ b/src/refresh/gl/images.c @@ -686,8 +686,13 @@ static qboolean GL_Upload32(byte *data, int width, int height, qboolean mipmap) } if (!mipmap && is_clamp()) { - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + if (gl_config.version_major == 1 && gl_config.version_minor == 1) { + qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + } else { + qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + } } else { qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); @@ -953,8 +958,13 @@ static void GL_InitParticleTexture(void) GL_BindTexture(TEXNUM_PARTICLE); GL_Upload32(pixels, 16, 16, qfalse); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + if (gl_config.version_major == 1 && gl_config.version_minor == 1) { + qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + } else { + qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + } } static void GL_InitWhiteImage(void) diff --git a/src/refresh/gl/main.c b/src/refresh/gl/main.c index 3073a0c..b41e038 100644 --- a/src/refresh/gl/main.c +++ b/src/refresh/gl/main.c @@ -825,6 +825,11 @@ static qboolean GL_SetupConfig(void) gl_config.version_minor = 0; } + if (gl_config.version_major < 1) { + Com_EPrintf("OpenGL returned invalid version string\n"); + return qfalse; + } + // OpenGL 1.0 doesn't have vertex arrays if (gl_config.version_major == 1 && gl_config.version_minor == 0) { Com_EPrintf("OpenGL version 1.1 or greater required\n"); |