--- deliantra/Deliantra-Client/DC/OpenGL.pm 2007/07/21 16:07:53 1.6 +++ deliantra/Deliantra-Client/DC/OpenGL.pm 2007/08/19 15:57:40 1.11 @@ -9,6 +9,8 @@ our $GL_VERSION; our $GL_NPOT; +our $GL_COMPRESS; +our $GL_BFSEP; # blendfuncseparate our $DEBUG = 1; our %INIT_HOOK; @@ -31,8 +33,30 @@ $GL_VERSION = gl_version * 1; %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; - $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; - $GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right... + unless (defined $::CFG->{force_opengl11}) { + # try to find a suitable default + if ( + $GL_VERSION >= 2.0 + && (!$GL_EXT{GL_ARB_texture_non_power_of_two} + || !$GL_EXT{GL_EXT_blend_func_separate}) + ) { + $::CFG->{force_opengl11} = 1; + } else { + $::CFG->{force_opengl11} = 0; + } + } + + if ($::CFG->{force_opengl11}) { + $GL_VERSION = 1.1; + %GL_EXT = (); + } + + $GL_BFSEP = $GL_EXT{GL_EXT_blend_func_separate} || $GL_VERSION >= 2.0; + $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2.0; + $GL_COMPRESS = $GL_EXT{GL_ARB_texture_compression} || $GL_VERSION >= 1.3; + + disable_GL_EXT_blend_func_separate + unless $GL_BFSEP; glDisable GL_COLOR_MATERIAL; glShadeModel GL_FLAT; @@ -46,6 +70,7 @@ glHint GL_LINE_SMOOTH_HINT , $hint; glHint GL_POLYGON_SMOOTH_HINT , $hint; glHint GL_GENERATE_MIPMAP_HINT , $hint; + glHint GL_TEXTURE_COMPRESSION_HINT , $hint; #glDrawBuffer GL_BACK; #glReadBuffer GL_BACK;