Changeset 2877 for trunk/packages/vizservers/nanovis/Texture3D.cpp

Timestamp:

Mar 23, 2012, 1:31:05 AM (13 years ago)

Author:

ldelgass

Message:

Some minor refactoring, also add some more fine grained config.h defines
(e.g. replace NV40 define with feature defines). Add tests for some required
OpenGL extensions (should always check for extensions or base version before
calling entry points from the extension). Also, clamp diffuse and specular
values on input and warn when they are out of range.

File:

• trunk/packages/vizservers/nanovis/Texture3D.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Texture3D.cpp

@@ -88 +88 @@
 void Texture3D::update(void *data)
 {
+    static GLuint floatFormats[] = { -1, GL_LUMINANCE32F_ARB, GL_LUMINANCE_ALPHA32F_ARB, GL_RGB32F_ARB, GL_RGBA32F_ARB };
+    static GLuint halfFloatFormats[] = { -1, GL_LUMINANCE16F_ARB, GL_LUMINANCE_ALPHA16F_ARB, GL_RGB16F_ARB, GL_RGBA16F_ARB };
+    static GLuint basicFormats[] = { -1, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA };
+
     glBindTexture(GL_TEXTURE_3D, _id);
 
-    //load texture with 16 bit half floating point precision if card is 6 series NV40
-    //half float with linear interpolation is only supported by 6 series and up cards
-    //If NV40 not defined, data is quantized to 8-bit from 32-bit.
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
@@ -103 +104 @@
 
     //to do: add handling to more formats
-#ifdef NV40
+    GLuint *targetFormats;
+#ifdef HAVE_FLOAT_TEXTURES
     if (_type == GL_FLOAT) {
-        GLuint targetFormat[5] = { -1, GL_LUMINANCE16F_ARB, GL_LUMINANCE_ALPHA16F_ARB, GL_RGB16F_ARB, GL_RGBA16F_ARB };
-        GLuint format[5] = { -1, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA };
-        glTexImage3D(GL_TEXTURE_3D, 0, targetFormat[_numComponents],
-                     _width, _height, _depth, 0, 
-                     format[_numComponents], _type, data);
+# ifdef USE_HALF_FLOAT
+        targetFormats = halfFloatFormats;
+# else
+        targetFormats = floatFormats;
+# endif
     } else {
 #endif
-        GLuint format[5] = { -1, GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA };
-        glTexImage3D(GL_TEXTURE_3D, 0, format[_numComponents],
-                     _width, _height, _depth, 0, 
-                     format[_numComponents], _type, data);
-#ifdef NV40
+        targetFormats = basicFormats;
+#ifdef HAVE_FLOAT_TEXTURES
     }
 #endif
+
+    glTexImage3D(GL_TEXTURE_3D, 0, targetFormats[_numComponents],
+                 _width, _height, _depth, 0, 
+                 basicFormats[_numComponents], _type, data);
 
     assert(glGetError()==0);