Changeset 438 for branches/thune/thread_safe/gl/gx_dt.c

Timestamp:

07/25/07 22:34:48 (16 months ago)

Author:

krobillard

Message:

GL - texture! make can now make GL_TEXTURE_1D from binary!.

Files:

• branches/thune/thread_safe/gl/gx_dt.c (modified) (12 diffs)

branches/thune/thread_safe/gl/gx_dt.c

@@ -1 +1 @@
 /*============================================================================
     Thune OpenGL Module
-    Copyright (C) 2005-2006  Karl Robillard
+    Copyright (C) 2005-2007  Karl Robillard
 
     This library is free software; you can redistribute it and/or
@@ -305 +305 @@
 static void _texCoord( TextureDef* tex, const UCell* cell )
 {
-    tex->width  = cell->coord.elem[0];
-    tex->height = cell->coord.elem[1];
+    if( ur_is(cell, UT_COORD) )
+    {
+        tex->width  = cell->coord.elem[0];
+        tex->height = cell->coord.elem[1];
+    }
+    else
+    {
+        tex->width  = ur_int(cell);
+        tex->height = 1;
+    }
+
     tex->pixels = 0;
     tex->comp   = 4;
@@ -327 +336 @@
 
 
-// (texture! raster -- tex)
-// (texture! coord  -- tex)
-// (texture! [raster!/coord! 'mipmap 'nearest 'linear 'repeat 'clamp] -- tex)
+/*
+  (texture! raster -- tex)
+  (texture! coord  -- tex)    ; 2D Texture
+  (texture! int    -- tex)    ; 1D Texture
+  (texture! [raster!/coord!/int!
+             binary!
+             'mipmap 'nearest 'linear 'repeat 'clamp
+             'gray 'rgb' 'rgba ] -- tex)
+*/
 UR_CALL( make_texture )
 {
@@ -337 +352 @@
     int mipmap = 0;
     UIndex rastN = 0;
+    GLenum target = GL_TEXTURE_2D;
     UCell* res = ur_s_prev(tos);
 
@@ -353 +369 @@
         else if( ur_is(tos, UT_COORD) )
         {
+            _texCoord( &def, tos );
+            goto build;
+        }
+        else if( ur_is(tos, UT_INT) )
+        {
+            target = GL_TEXTURE_1D;
             _texCoord( &def, tos );
             goto build;
@@ -380 +402 @@
                             _texRast( &def, ur_rastHead(val) );
                         } 
+                        else if( ur_is(val, UT_BINARY) )
+                        {
+                            def.pixels = ur_bin(val)->ptr.b;
+                        }
                         else if( ur_is(val, UT_COORD) )
                         {
+                            _texCoord( &def, val );
+                        }
+                        else if( ur_is(val, UT_INT) )
+                        {
+                            target = GL_TEXTURE_1D;
                             _texCoord( &def, val );
                         }
@@ -410 +441 @@
                                 mipmap = 1;
                                 break;
+
+                            case UR_ATOM_GRAY:
+                                def.comp   = 1;
+                                def.format = GL_LUMINANCE;
+                                break;
+
+                            case UR_ATOM_RGB:
+                                def.comp   = 3;
+                                def.format = GL_RGB;
+                                break;
+
+                            case UR_ATOM_RGBA:
+                                def.comp   = 4;
+                                def.format = GL_RGBA;
+                                break;
                         }
+                        break;
+
+                    case UT_INT:
+                        target = GL_TEXTURE_1D;
+                        _texCoord( &def, it );
                         break;
 
@@ -416 +467 @@
                         _texCoord( &def, it );
                         break;
+
+                    case UT_BINARY:
+                        def.pixels = ur_bin(it)->ptr.b;
                 }
                 ++it;
@@ -431 +485 @@
 
     name = gltex_alloc( &pool );
-    glBindTexture( GL_TEXTURE_2D, name );
+    glBindTexture( target, name );
 
     // TODO: Support texture type of GL_FLOAT.
-    if( mipmap )
-    {
-        gluBuild2DMipmaps( GL_TEXTURE_2D, def.comp, def.width, def.height,
-                           def.format, GL_UNSIGNED_BYTE, def.pixels );
+
+    if( target == GL_TEXTURE_2D )
+    {
+        if( mipmap )
+        {
+            gluBuild2DMipmaps( GL_TEXTURE_2D, def.comp, def.width, def.height,
+                               def.format, GL_UNSIGNED_BYTE, def.pixels );
+        }
+        else
+        {
+            // Ensure that a non-mipmap minifying filter is used.
+            // Using a mipmap filter can cause FBO format errors and textures
+            // to not appear.
+            if( def.min_filter != GL_NEAREST )
+                def.min_filter = GL_LINEAR;
+
+            glTexImage2D( GL_TEXTURE_2D, 0, def.comp, def.width, def.height,
+                          0, def.format, GL_UNSIGNED_BYTE, def.pixels );
+        }
     }
     else
     {
-        // Ensure that a non-mipmap minifying filter is used.
-        // Using a mipmap filter can cause FBO format errors and textures to
-        // not appear.
-        if( def.min_filter != GL_NEAREST )
-            def.min_filter = GL_LINEAR;
-
-        glTexImage2D( GL_TEXTURE_2D, 0, def.comp, def.width, def.height, 0,
-                      def.format, GL_UNSIGNED_BYTE, def.pixels );
+        if( mipmap )
+        {
+            gluBuild1DMipmaps( GL_TEXTURE_1D, def.comp, def.width,
+                               def.format, GL_UNSIGNED_BYTE, def.pixels );
+        }
+        else
+        {
+            if( def.min_filter != GL_NEAREST )
+                def.min_filter = GL_LINEAR;
+
+            glTexImage1D( GL_TEXTURE_1D, 0, def.comp, def.width,
+                          0, def.format, GL_UNSIGNED_BYTE, def.pixels );
+        }
     }
 
@@ -464 +538 @@
 
     // GL_CLAMP, GL_CLAMP_TO_EDGE, GL_REPEAT.
-    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, def.wrap );
-    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, def.wrap );
+    glTexParameteri( target, GL_TEXTURE_WRAP_S, def.wrap );
+    glTexParameteri( target, GL_TEXTURE_WRAP_T, def.wrap );
 
     // TODO: Support all GL_TEXTURE_MIN_FILTER types.
     // GL_NEAREST, GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST, etc.
-    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, def.min_filter );
+    glTexParameteri( target, GL_TEXTURE_MIN_FILTER, def.min_filter );
 
     // GL_NEAREST, GL_LINEAR
-    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, def.mag_filter );
+    glTexParameteri( target, GL_TEXTURE_MAG_FILTER, def.mag_filter );
 
     ur_initType( res, UT_TEXTURE );
@@ -522 +596 @@
     if( phase == UR_GC_PHASE_MARK )
     {
+        // Clear any unchecked GL error.
+#ifdef DEBUG
+        GLenum err = glGetError();
+        if( err )
+            printf( "recycle_texture - glGetError() returned %d\n", err );
+#else
+        glGetError();
+#endif
+
         gllist_gcBegin();
         gltex_gcBegin();
@@ -941 +1024 @@
 static int cmp_nop( UThread* ut, const UCell* a, const UCell* b, int mode )
 {
+    (void) ut;
+    (void) a;
+    (void) b;
+    (void) mode;
     return 0;
 }