--- deliantra/Deliantra-Client/DC.pm	2006/04/25 11:18:48	1.48
+++ deliantra/Deliantra-Client/DC.pm	2006/04/30 08:09:44	1.49
@@ -30,6 +30,7 @@
 our $GL_VERSION;
 
 our $GL_NPOT;
+our $GL_DEBUG = 1;
 
 sub gl_init {
    $GL_VERSION = gl_version * 1;
@@ -37,17 +38,23 @@
 
    $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
 
-   glEnable GL_TEXTURE_2D;
-   glEnable GL_COLOR_MATERIAL;
+   glDisable GL_COLOR_MATERIAL;
    glShadeModel GL_FLAT;
+   glDisable GL_DITHER;
    glDisable GL_DEPTH_TEST;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-
    glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
 
    CFClient::Texture::restore_state ();
 }
 
+sub gl_check {
+   return unless $GL_DEBUG;
+
+   if (my $error = glGetError) {
+      Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
+   }
+}
+
 sub find_rcfile($) {
    my $path;
 
@@ -300,20 +307,16 @@
                    $self->{format},
                    $self->{type},
                    $data;
-      if (my $error = glGetError) {
-         Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",
-                      $error, $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
-      }
+      CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
+                         $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
    } else {
       glCopyTexImage2D GL_TEXTURE_2D, 0,
                    $self->{internalformat},
                    0, 0,
                    $tw, $th,
                    0;
-      if (my $error = glGetError) {
-         Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
-                      $error, $tw, $th, $self->{internalformat};
-      }
+      CFClient::gl_check "copying to texture %dx%d if=%x",
+                         $tw, $th, $self->{internalformat};
    }
 }