- do not disable sampler objects with -gl3.

This commit is contained in:
Christoph Oelckers 2016-04-23 15:47:51 +02:00
parent 78da8b5a60
commit 0d17459c36

View file

@ -128,15 +128,15 @@ void gl_LoadExtensions()
gl.vendorstring = (char*)glGetString(GL_VENDOR); gl.vendorstring = (char*)glGetString(GL_VENDOR);
if (CheckExtension("GL_ARB_texture_compression")) gl.flags|=RFL_TEXTURE_COMPRESSION;
if (CheckExtension("GL_EXT_texture_compression_s3tc")) gl.flags|=RFL_TEXTURE_COMPRESSION_S3TC;
if (!Args->CheckParm("-gl3"))
{
if (gl.version >= 3.3f || CheckExtension("GL_ARB_sampler_objects")) if (gl.version >= 3.3f || CheckExtension("GL_ARB_sampler_objects"))
{ {
gl.flags |= RFL_SAMPLER_OBJECTS; gl.flags |= RFL_SAMPLER_OBJECTS;
} }
if (CheckExtension("GL_ARB_texture_compression")) gl.flags|=RFL_TEXTURE_COMPRESSION;
if (CheckExtension("GL_EXT_texture_compression_s3tc")) gl.flags|=RFL_TEXTURE_COMPRESSION_S3TC;
if (!Args->CheckParm("-gl3"))
{
// don't use GL 4.x features when running in GL 3 emulation mode. // don't use GL 4.x features when running in GL 3 emulation mode.
if (CheckExtension("GL_ARB_buffer_storage")) if (CheckExtension("GL_ARB_buffer_storage"))
{ {