[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/libs/kgllib/core/kgllib
From:       David Faure <faure () kde ! org>
Date:       2009-08-20 11:14:13
Message-ID: 1250766853.415527.12575.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1013645 by dfaure:

Fix compilation with opengl 2.0. Hope this is correct.
CCMAIL: rivolaks@hot.ee


 M  +14 -1     texture.cpp  


--- trunk/playground/libs/kgllib/core/kgllib/texture.cpp #1013644:1013645
@@ -25,7 +25,6 @@
 #include <qstring.h>
 #include <QtDebug>
 
-
 namespace
 {
 
@@ -82,10 +81,17 @@
         case GL_RGBA16:
             return GL_RGBA;
         // sRGB
+#ifdef GL_VERSION_2_1
         case GL_SRGB8:              return GL_RGB;
         case GL_SRGB8_ALPHA8:       return GL_RGBA;
         case GL_SLUMINANCE:         return GL_LUMINANCE;
         case GL_SLUMINANCE8_ALPHA8: return GL_LUMINANCE_ALPHA;
+#else
+        case GL_SRGB8_EXT:              return GL_RGB;
+        case GL_SRGB8_ALPHA8_EXT:       return GL_RGBA;
+        case GL_SLUMINANCE_EXT:         return GL_LUMINANCE;
+        case GL_SLUMINANCE8_ALPHA8_EXT: return GL_LUMINANCE_ALPHA;
+#endif
         // Generic compressed formats
         case GL_COMPRESSED_ALPHA:           return GL_ALPHA;
         case GL_COMPRESSED_LUMINANCE:       return GL_LUMINANCE;
@@ -93,10 +99,17 @@
         case GL_COMPRESSED_INTENSITY:       return GL_INTENSITY;
         case GL_COMPRESSED_RGB:             return GL_RGB;
         case GL_COMPRESSED_RGBA:            return GL_RGBA;
+#ifdef GL_VERSION_2_1
         case GL_COMPRESSED_SRGB:            return GL_RGB;
         case GL_COMPRESSED_SRGB_ALPHA:      return GL_RGBA;
         case GL_COMPRESSED_SLUMINANCE:      return GL_LUMINANCE;
         case GL_COMPRESSED_SLUMINANCE_ALPHA: return GL_LUMINANCE_ALPHA;
+#else
+        case GL_COMPRESSED_SRGB_EXT:            return GL_RGB;
+        case GL_COMPRESSED_SRGB_ALPHA_EXT:      return GL_RGBA;
+        case GL_COMPRESSED_SLUMINANCE_EXT:      return GL_LUMINANCE;
+        case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT: return GL_LUMINANCE_ALPHA;
+#endif
         // From EXT_texture_compression_s3tc extension
         case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
             return GL_RGB;
[prev in list] [next in list] [prev in thread] [next in thread]