1D, 3D, and cubemap textures are now supported (in addition to 2D)
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 4 Oct 2002 21:04:11 +0000 (21:04 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 4 Oct 2002 21:04:11 +0000 (21:04 +0000)
added detection of GL_EXT_texture3D, GL_ARB_texture_cube_map, and GL_ARB_texture_env_dot3
shadow volume rendering mode now depends on all of the above being present (but doesn't use them yet)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2497 d7cf8633-e32d-0410-b094-e92efae38249

gl_rmain.c
gl_textures.c
glquake.h
image.c
image.h
vid_shared.c

index 65c6420..4a10f50 100644 (file)
@@ -1140,10 +1140,28 @@ void R_RenderView (void)
        R_Mesh_Start();
        R_MeshQueue_BeginScene();
 
-       if (r_shadows.integer == 3 && !vid_stencil.integer)
+       if (r_shadows.integer == 3)
        {
-               Con_Printf("Stencil not enabled, turning off r_shadows 3\n");
-               Cvar_SetValueQuick(&r_shadows, 0);
+               if (!gl_stencil)
+               {
+                       Con_Printf("Stencil not enabled, turning off r_shadows 3\n");
+                       Cvar_SetValueQuick(&r_shadows, 0);
+               }
+               else if (!gl_texture3d)
+               {
+                       Con_Printf("3D texture support not detected, turning off r_shadows 3\n");
+                       Cvar_SetValueQuick(&r_shadows, 0);
+               }
+               else if (!gl_texturecubemap)
+               {
+                       Con_Printf("Cubemap texture support not detected, turning off r_shadows 3\n");
+                       Cvar_SetValueQuick(&r_shadows, 0);
+               }
+               else if (!gl_dot3arb)
+               {
+                       Con_Printf("Bumpmapping support not detected, turning off r_shadows 3\n");
+                       Cvar_SetValueQuick(&r_shadows, 0);
+               }
        }
 
        if (R_DrawBrushModelsSky())
index a984297..19327ba 100644 (file)
@@ -26,13 +26,6 @@ static mempool_t *textureprocessingmempool;
 // size of images which hold fragment textures, ignores picmip and max_size
 static int block_size;
 
-// really this number only governs gltexnuminuse
-#define MAX_GLTEXTURES 65536
-
-// since there is only one set of GL texture numbers, we have to track them
-// globally, everything else is per texture pool
-static qbyte *gltexnuminuse;
-
 typedef struct
 {
        int textype;
@@ -40,34 +33,50 @@ typedef struct
        int internalbytesperpixel;
        int glformat;
        int glinternalformat;
-       int align;
 }
 textypeinfo_t;
 
-static textypeinfo_t textype_qpalette       = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 3, 1};
-static textypeinfo_t textype_rgb            = {TEXTYPE_RGB     , 3, 3, GL_RGB , 3, 1};
-static textypeinfo_t textype_rgba           = {TEXTYPE_RGBA    , 4, 4, GL_RGBA, 3, 1};
-static textypeinfo_t textype_qpalette_alpha = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 4, 1};
-static textypeinfo_t textype_rgba_alpha     = {TEXTYPE_RGBA    , 4, 4, GL_RGBA, 4, 1};
+static textypeinfo_t textype_qpalette       = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 3};
+static textypeinfo_t textype_rgb            = {TEXTYPE_RGB     , 3, 3, GL_RGB , 3};
+static textypeinfo_t textype_rgba           = {TEXTYPE_RGBA    , 4, 4, GL_RGBA, 3};
+static textypeinfo_t textype_qpalette_alpha = {TEXTYPE_QPALETTE, 1, 4, GL_RGBA, 4};
+static textypeinfo_t textype_rgba_alpha     = {TEXTYPE_RGBA    , 4, 4, GL_RGBA, 4};
 
 // a tiling texture (most common type)
 #define GLIMAGETYPE_TILE 0
 // a fragments texture (contains one or more fragment textures)
 #define GLIMAGETYPE_FRAGMENTS 1
 
+#define GLTEXTURETYPE_1D 0
+#define GLTEXTURETYPE_2D 1
+#define GLTEXTURETYPE_3D 2
+#define GLTEXTURETYPE_CUBEMAP 3
+
+static int cubemapside[6] =
+{
+       GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
+       GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB,
+       GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB,
+       GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB,
+       GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB,
+       GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB
+};
+
 // a gltextureimage can have one (or more if fragments) gltextures inside
 typedef struct gltextureimage_s
 {
        struct gltextureimage_s *imagechain;
        int texturecount;
        int type; // one of the GLIMAGETYPE_ values
+       int texturetype; // one of the GLTEXTURETYPE_ values
+       int sides; // 1 or 6 depending on texturetype
        int texnum; // GL texture slot number
-       int width, height;
+       int width, height, depth; // 3D texture support
        int bytesperpixel; // bytes per pixel
        int glformat; // GL_RGB or GL_RGBA
        int glinternalformat; // 3 or 4
        int flags;
-       short *blockallocation; // fragment allocation
+       short *blockallocation; // fragment allocation (2D only)
 }
 gltextureimage_t;
 
@@ -86,16 +95,19 @@ typedef struct gltexture_s
        // name of the texture (this might be removed someday), no duplicates
        char *identifier;
        // location in the image, and size
-       int x, y, width, height;
-       // copy of the original texture supplied to the upload function, for re-uploading or deferred uploads (non-precached)
+       int x, y, z, width, height, depth;
+       // copy of the original texture(s) supplied to the upload function, for
+       // delayed uploads (non-precached)
        qbyte *inputtexels;
-       // to identify cache mismatchs (this might be removed someday)
-       int crc;
+       // original data size in *inputtexels
+       int inputdatasize;
        // flags supplied to the LoadTexture function
        // (might be altered to remove TEXF_ALPHA), and GLTEXF_ private flags
        int flags;
        // pointer to one of the textype_ structs
        textypeinfo_t *textype;
+       // one of the GLTEXTURETYPE_ values
+       int texturetype;
 }
 gltexture_t;
 
@@ -191,7 +203,6 @@ void R_FreeTexture(rtexture_t *rt)
 {
        gltexture_t *glt, **gltpointer;
        gltextureimage_t *image, **gltimagepointer;
-       GLuint texnum;
 
        glt = (gltexture_t *)rt;
        if (glt == NULL)
@@ -216,11 +227,7 @@ void R_FreeTexture(rtexture_t *rt)
                else
                        Host_Error("R_FreeTexture: image not linked in pool\n");
                if (image->texnum)
-               {
-                       texnum = image->texnum;
-                       gltexnuminuse[image->texnum] = 0;
-                       qglDeleteTextures(1, &texnum);
-               }
+                       qglDeleteTextures(1, &image->texnum);
                if (image->blockallocation)
                        Mem_Free(image->blockallocation);
                Mem_Free(image);
@@ -233,6 +240,7 @@ void R_FreeTexture(rtexture_t *rt)
        Mem_Free(glt);
 }
 
+/*
 static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier)
 {
        gltexture_t     *glt;
@@ -246,6 +254,7 @@ static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier)
 
        return NULL;
 }
+*/
 
 rtexturepool_t *R_AllocTexturePool(void)
 {
@@ -359,9 +368,9 @@ static void GL_TextureMode_f (void)
 
 static int R_CalcTexelDataSize (gltexture_t *glt)
 {
-       int width2, height2, size;
+       int width2, height2, depth2, size;
        if (glt->flags & TEXF_FRAGMENT)
-               size = glt->width * glt->height;
+               size = glt->width * glt->height * glt->depth;
        else
        {
                if (r_max_size.integer > realmaxsize)
@@ -369,35 +378,40 @@ static int R_CalcTexelDataSize (gltexture_t *glt)
                // calculate final size
                for (width2 = 1;width2 < glt->width;width2 <<= 1);
                for (height2 = 1;height2 < glt->height;height2 <<= 1);
+               for (depth2 = 1;depth2 < glt->depth;depth2 <<= 1);
                for (width2 >>= r_picmip.integer;width2 > r_max_size.integer;width2 >>= 1);
                for (height2 >>= r_picmip.integer;height2 > r_max_size.integer;height2 >>= 1);
+               for (depth2 >>= r_picmip.integer;depth2 > r_max_size.integer;depth2 >>= 1);
                if (width2 < 1) width2 = 1;
                if (height2 < 1) height2 = 1;
+               if (depth2 < 1) depth2 = 1;
 
                size = 0;
                if (glt->flags & TEXF_MIPMAP)
                {
-                       while (width2 > 1 || height2 > 1)
+                       while (width2 > 1 || height2 > 1 || depth2 > 1)
                        {
-                               size += width2 * height2;
+                               size += width2 * height2 * depth2;
                                if (width2 > 1)
                                        width2 >>= 1;
                                if (height2 > 1)
                                        height2 >>= 1;
+                               if (depth2 > 1)
+                                       depth2 >>= 1;
                        }
                        size++; // count the last 1x1 mipmap
                }
                else
-                       size = width2*height2;
+                       size = width2 * height2 * depth2;
        }
-       size *= glt->textype->internalbytesperpixel;
+       size *= glt->textype->internalbytesperpixel * glt->image->sides;
 
        return size;
 }
 
 void R_TextureStats_PrintTotal(void)
 {
-       int glsize, inputsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0;
+       int glsize, total = 0, totalt = 0, totalp = 0, loaded = 0, loadedt = 0, loadedp = 0;
        gltexture_t *glt;
        gltexturepool_t *pool;
        for (pool = gltexturepoolchain;pool;pool = pool->next)
@@ -405,16 +419,14 @@ void R_TextureStats_PrintTotal(void)
                for (glt = pool->gltchain;glt;glt = glt->chain)
                {
                        glsize = R_CalcTexelDataSize(glt);
-                       inputsize = glt->width * glt->height * glt->textype->inputbytesperpixel;
-
                        total++;
                        totalt += glsize;
-                       totalp += inputsize;
+                       totalp += glt->inputdatasize;
                        if (!(glt->flags & GLTEXF_UPLOAD))
                        {
                                loaded++;
                                loadedt += glsize;
-                               loadedp += inputsize;
+                               loadedp += glt->inputdatasize;
                        }
                }
        }
@@ -426,13 +438,13 @@ static void R_TextureStats_f(void)
        int loaded;
        gltexture_t *glt;
        gltexturepool_t *pool;
-       Con_Printf("glsize input crc  loaded mip alpha name\n");
+       Con_Printf("glsize input loaded mip alpha name\n");
        for (pool = gltexturepoolchain;pool;pool = pool->next)
        {
                for (glt = pool->gltchain;glt;glt = glt->chain)
                {
                        loaded = !(glt->flags & GLTEXF_UPLOAD);
-                       Con_Printf("%c%4i%c%c%4i%c %04X %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->width * glt->height * glt->textype->inputbytesperpixel + 1023) / 1024, glt->inputtexels ? ']' : ' ', glt->crc, loaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier ? glt->identifier : "<unnamed>");
+                       Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", loaded ? '[' : ' ', (R_CalcTexelDataSize(glt) + 1023) / 1024, loaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', loaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier ? glt->identifier : "<unnamed>");
                }
                Con_Printf("pool %10p\n", pool);
        }
@@ -456,7 +468,6 @@ static void r_textures_start(void)
        texturemempool = Mem_AllocPool("Texture Info");
        texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)");
        textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers");
-       gltexnuminuse = Mem_Alloc(texturemempool, MAX_GLTEXTURES);
 }
 
 static void r_textures_shutdown(void)
@@ -473,7 +484,6 @@ static void r_textures_shutdown(void)
        resizebuffer = NULL;
        colorconvertbuffer = NULL;
        texturebuffer = NULL;
-       gltexnuminuse = NULL;
        Mem_FreePool(&texturemempool);
        Mem_FreePool(&texturedatamempool);
        Mem_FreePool(&textureprocessingmempool);
@@ -485,14 +495,13 @@ static void r_textures_newmap(void)
 
 void R_Textures_Init (void)
 {
-       Cmd_AddCommand ("gl_texturemode", &GL_TextureMode_f);
+       Cmd_AddCommand("gl_texturemode", &GL_TextureMode_f);
        Cmd_AddCommand("r_texturestats", R_TextureStats_f);
        Cvar_RegisterVariable (&r_max_scrapsize);
        Cvar_RegisterVariable (&r_max_size);
        Cvar_RegisterVariable (&r_picmip);
        Cvar_RegisterVariable (&r_lerpimages);
        Cvar_RegisterVariable (&r_precachetextures);
-       gltexnuminuse = NULL;
 
        R_RegisterModule("R_Textures", r_textures_start, r_textures_shutdown, r_textures_newmap);
 }
@@ -534,50 +543,89 @@ void R_MakeResizeBufferBigger(int size)
 
 static void R_Upload(gltexture_t *glt, qbyte *data)
 {
-       int mip, width, height, internalformat;
+       int i, mip, width, height, depth, internalformat;
        qbyte *prevbuffer;
        prevbuffer = data;
 
+       glt->texnum = glt->image->texnum;
        qglBindTexture(GL_TEXTURE_2D, glt->image->texnum);
        CHECKGLERROR
-
-       gl_backend_rebindtextures = true;
-
        glt->flags &= ~GLTEXF_UPLOAD;
+       gl_backend_rebindtextures = true;
 
        if (glt->flags & TEXF_FRAGMENT)
        {
                if (glt->image->flags & GLTEXF_UPLOAD)
                {
-                       Con_DPrintf("uploaded new fragments image\n");
-                       R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel);
                        glt->image->flags &= ~GLTEXF_UPLOAD;
-                       memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->bytesperpixel);
-                       qglTexImage2D (GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
-                       CHECKGLERROR
-                       qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
-                       CHECKGLERROR
-                       qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
-                       CHECKGLERROR
+                       Con_DPrintf("uploaded new fragments image\n");
+                       R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
+                       memset(resizebuffer, 255, glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
+                       switch(glt->image->texturetype)
+                       {
+                       case GLTEXTURETYPE_1D:
+                               qglTexImage1D(GL_TEXTURE_1D, 0, glt->image->glinternalformat, glt->image->width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+                               CHECKGLERROR
+                               qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                               qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                               break;
+                       case GLTEXTURETYPE_2D:
+                               qglTexImage2D(GL_TEXTURE_2D, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+                               CHECKGLERROR
+                               qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                               qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                               break;
+                       case GLTEXTURETYPE_3D:
+                               qglTexImage3DEXT(GL_TEXTURE_3D_EXT, 0, glt->image->glinternalformat, glt->image->width, glt->image->height, glt->image->depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, resizebuffer);
+                               CHECKGLERROR
+                               qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                               qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                               break;
+                       default:
+                               Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n");
+                               break;
+                       }
                }
 
                if (prevbuffer == NULL)
                {
-                       R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel);
-                       memset(resizebuffer, 255, glt->width * glt->height * glt->image->bytesperpixel);
+                       R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
+                       memset(resizebuffer, 255, glt->width * glt->height * glt->image->depth * glt->image->bytesperpixel);
                        prevbuffer = resizebuffer;
                }
                else if (glt->textype->textype == TEXTYPE_QPALETTE)
                {
                        // promote paletted to RGBA, so we only have to worry about RGB and
                        // RGBA in the rest of this code
-                       R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->bytesperpixel);
-                       Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height, d_8to24table);
+                       R_MakeResizeBufferBigger(glt->image->width * glt->image->height * glt->image->depth * glt->image->bytesperpixel);
+                       Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth, d_8to24table);
                        prevbuffer = colorconvertbuffer;
                }
 
-               qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-               CHECKGLERROR
+               switch(glt->image->texturetype)
+               {
+               case GLTEXTURETYPE_1D:
+                       qglTexSubImage1D(GL_TEXTURE_1D, 0, glt->x, glt->width, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                       CHECKGLERROR
+                       break;
+               case GLTEXTURETYPE_2D:
+                       qglTexSubImage2D(GL_TEXTURE_2D, 0, glt->x, glt->y, glt->width, glt->height, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                       CHECKGLERROR
+                       break;
+               case GLTEXTURETYPE_3D:
+                       qglTexSubImage3DEXT(GL_TEXTURE_3D_EXT, 0, glt->x, glt->y, glt->z, glt->width, glt->height, glt->depth, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                       CHECKGLERROR
+                       break;
+               default:
+                       Host_Error("R_Upload: fragment texture of type other than 1D, 2D, or 3D\n");
+                       break;
+               }
                glt->texnum = glt->image->texnum;
                return;
        }
@@ -585,16 +633,18 @@ static void R_Upload(gltexture_t *glt, qbyte *data)
        glt->image->flags &= ~GLTEXF_UPLOAD;
 
        // these are rounded up versions of the size to do better resampling
-       for (width = 1;width < glt->width;width <<= 1);
+       for (width  = 1;width  < glt->width ;width  <<= 1);
        for (height = 1;height < glt->height;height <<= 1);
+       for (depth  = 1;depth  < glt->depth ;depth  <<= 1);
 
-       R_MakeResizeBufferBigger(width * height * glt->image->bytesperpixel);
+       R_MakeResizeBufferBigger(width * height * depth * glt->image->bytesperpixel);
 
        if (prevbuffer == NULL)
        {
                width = glt->image->width;
                height = glt->image->height;
-               memset(resizebuffer, 255, width * height * glt->image->bytesperpixel);
+               depth = glt->image->depth;
+               memset(resizebuffer, 255, width * height * depth * glt->image->bytesperpixel);
                prevbuffer = resizebuffer;
        }
        else
@@ -603,20 +653,20 @@ static void R_Upload(gltexture_t *glt, qbyte *data)
                {
                        // promote paletted to RGBA, so we only have to worry about RGB and
                        // RGBA in the rest of this code
-                       Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height, d_8to24table);
+                       Image_Copy8bitRGBA(prevbuffer, colorconvertbuffer, glt->width * glt->height * glt->depth, d_8to24table);
                        prevbuffer = colorconvertbuffer;
                }
 
-               if (glt->width != width || glt->height != height)
+               if (glt->width != width || glt->height != height || glt->depth != depth)
                {
-                       Image_Resample(prevbuffer, glt->width, glt->height, resizebuffer, width, height, glt->image->bytesperpixel, r_lerpimages.integer);
+                       Image_Resample(prevbuffer, glt->width, glt->height, glt->depth, resizebuffer, width, height, depth, glt->image->bytesperpixel, r_lerpimages.integer);
                        prevbuffer = resizebuffer;
                }
 
                // apply picmip/max_size limitations
-               while (width > glt->image->width || height > glt->image->height)
+               while (width > glt->image->width || height > glt->image->height || depth > glt->image->depth)
                {
-                       Image_MipReduce(prevbuffer, resizebuffer, &width, &height, glt->image->width, glt->image->height, glt->image->bytesperpixel);
+                       Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, glt->image->width, glt->image->height, glt->image->depth, glt->image->bytesperpixel);
                        prevbuffer = resizebuffer;
                }
        }
@@ -627,37 +677,122 @@ static void R_Upload(gltexture_t *glt, qbyte *data)
                internalformat = 4;
 
        mip = 0;
-       qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
-       CHECKGLERROR
-       if (glt->flags & TEXF_MIPMAP)
+       switch(glt->image->texturetype)
        {
-               while (width > 1 || height > 1)
+       case GLTEXTURETYPE_1D:
+               qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+               CHECKGLERROR
+               if (glt->flags & TEXF_MIPMAP)
                {
-                       Image_MipReduce(prevbuffer, resizebuffer, &width, &height, 1, 1, glt->image->bytesperpixel);
-                       prevbuffer = resizebuffer;
-
-                       qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                       while (width > 1 || height > 1 || depth > 1)
+                       {
+                               Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+                               prevbuffer = resizebuffer;
+                               qglTexImage1D(GL_TEXTURE_1D, mip++, internalformat, width, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                               CHECKGLERROR
+                       }
+                       qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+                       CHECKGLERROR
+                       qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
                        CHECKGLERROR
                }
-
-               qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-               CHECKGLERROR
-               qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
-               CHECKGLERROR
-       }
-       else
-       {
-               qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+               else
+               {
+                       qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+                       CHECKGLERROR
+                       qglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                       CHECKGLERROR
+               }
+               break;
+       case GLTEXTURETYPE_2D:
+               qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
                CHECKGLERROR
-               qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+               if (glt->flags & TEXF_MIPMAP)
+               {
+                       while (width > 1 || height > 1 || depth > 1)
+                       {
+                               Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+                               prevbuffer = resizebuffer;
+                               qglTexImage2D(GL_TEXTURE_2D, mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                               CHECKGLERROR
+                       }
+                       qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+                       CHECKGLERROR
+                       qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                       CHECKGLERROR
+               }
+               else
+               {
+                       qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+                       CHECKGLERROR
+                       qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                       CHECKGLERROR
+               }
+               break;
+       case GLTEXTURETYPE_3D:
+               qglTexImage3DEXT(GL_TEXTURE_3D_EXT, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
                CHECKGLERROR
+               if (glt->flags & TEXF_MIPMAP)
+               {
+                       while (width > 1 || height > 1 || depth > 1)
+                       {
+                               Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+                               prevbuffer = resizebuffer;
+                               qglTexImage3DEXT(GL_TEXTURE_3D_EXT, mip++, internalformat, width, height, depth, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                               CHECKGLERROR
+                       }
+                       qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+                       CHECKGLERROR
+                       qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                       CHECKGLERROR
+               }
+               else
+               {
+                       qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+                       CHECKGLERROR
+                       qglTexParameteri(GL_TEXTURE_3D_EXT, GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                       CHECKGLERROR
+               }
+               break;
+       case GLTEXTURETYPE_CUBEMAP:
+               // convert and upload each side in turn,
+               // from a continuous block of input texels
+               texturebuffer = prevbuffer;
+               for (i = 0;i < 6;i++)
+               {
+                       prevbuffer = texturebuffer;
+                       texturebuffer += width * height * depth * glt->textype->inputbytesperpixel;
+                       qglTexImage2D(cubemapside[i], mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                       CHECKGLERROR
+                       if (glt->flags & TEXF_MIPMAP)
+                       {
+                               while (width > 1 || height > 1 || depth > 1)
+                               {
+                                       Image_MipReduce(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1, glt->image->bytesperpixel);
+                                       prevbuffer = resizebuffer;
+                                       qglTexImage2D(cubemapside[i], mip++, internalformat, width, height, 0, glt->image->glformat, GL_UNSIGNED_BYTE, prevbuffer);
+                                       CHECKGLERROR
+                               }
+                               qglTexParameteri(cubemapside[i], GL_TEXTURE_MIN_FILTER, gl_filter_min);
+                               CHECKGLERROR
+                               qglTexParameteri(cubemapside[i], GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                       }
+                       else
+                       {
+                               qglTexParameteri(cubemapside[i], GL_TEXTURE_MIN_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                               qglTexParameteri(cubemapside[i], GL_TEXTURE_MAG_FILTER, gl_filter_mag);
+                               CHECKGLERROR
+                       }
+               }
+               break;
        }
-       glt->texnum = glt->image->texnum;
 }
 
 static void R_FindImageForTexture(gltexture_t *glt)
 {
-       int i, j, best, best2, x, y, w, h;
+       int i, j, best, best2, x, y, z, w, h, d;
        textypeinfo_t *texinfo;
        gltexturepool_t *pool;
        gltextureimage_t *image, **imagechainpointer;
@@ -669,8 +804,10 @@ static void R_FindImageForTexture(gltexture_t *glt)
 
        x = 0;
        y = 0;
+       z = 0;
        w = glt->width;
        h = glt->height;
+       d = glt->depth;
        if (glt->flags & TEXF_FRAGMENT)
        {
                for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain)
@@ -678,13 +815,15 @@ static void R_FindImageForTexture(gltexture_t *glt)
                        image = *imagechainpointer;
                        if (image->type != GLIMAGETYPE_FRAGMENTS)
                                continue;
+                       if (image->texturetype != glt->texturetype)
+                               continue;
                        if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
                                continue;
                        if (glt->width > image->width || glt->height > image->height)
                                continue;
 
                        // got a fragments texture, find a place in it if we can
-                       for (best = image->width, i = 0;i < image->width - w;i += texinfo->align)
+                       for (best = image->width, i = 0;i < image->width - w;i++)
                        {
                                for (best2 = 0, j = 0;j < w;j++)
                                {
@@ -709,6 +848,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
 
                        glt->x = x;
                        glt->y = y;
+                       glt->z = 0;
                        glt->image = image;
                        image->texturecount++;
                        return;
@@ -726,6 +866,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
 
                x = 0;
                y = 0;
+               z = 0;
                for (i = 0;i < w;i++)
                        image->blockallocation[x + i] = y + h;
        }
@@ -744,27 +885,27 @@ static void R_FindImageForTexture(gltexture_t *glt)
                        Cvar_SetValue("r_max_size", realmaxsize);
                for (image->width = 1;image->width < glt->width;image->width <<= 1);
                for (image->height = 1;image->height < glt->height;image->height <<= 1);
+               for (image->depth = 1;image->depth < glt->depth;image->depth <<= 1);
                for (image->width >>= r_picmip.integer;image->width > r_max_size.integer;image->width >>= 1);
                for (image->height >>= r_picmip.integer;image->height > r_max_size.integer;image->height >>= 1);
+               for (image->depth >>= r_picmip.integer;image->depth > r_max_size.integer;image->depth >>= 1);
                if (image->width < 1) image->width = 1;
                if (image->height < 1) image->height = 1;
+               if (image->depth < 1) image->depth = 1;
        }
+       image->texturetype = glt->texturetype;
        image->glinternalformat = texinfo->glinternalformat;
        image->glformat = texinfo->glformat;
        image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA)) | GLTEXF_UPLOAD;
        image->bytesperpixel = texinfo->internalbytesperpixel;
-       for (i = 1;i < MAX_GLTEXTURES;i++)
-               if (!gltexnuminuse[i])
-                       break;
-       if (i < MAX_GLTEXTURES)
-               gltexnuminuse[image->texnum = i] = true;
-       else
-               Sys_Error("R_FindImageForTexture: ran out of GL textures\n");
+       // get a texture number to use
+       qglGenTextures(1, &image->texnum);
        *imagechainpointer = image;
        image->texturecount++;
 
        glt->x = x;
        glt->y = y;
+       glt->y = z;
        glt->image = image;
 }
 
@@ -785,63 +926,38 @@ static void R_UploadTexture (gltexture_t *glt)
                Con_Printf("R_UploadTexture: Texture %s already uploaded and destroyed.  Can not upload original image again.  Uploaded blank texture.\n", glt->identifier);
 }
 
-static gltexture_t *R_SetupTexture(gltexturepool_t *pool, char *identifier, int crc, int width, int height, int flags, textypeinfo_t *texinfo, qbyte *data)
+static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, char *identifier, int width, int height, int depth, int sides, int flags, int textype, int texturetype, qbyte *data)
 {
-       gltexture_t *glt;
-       glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
-       if (identifier)
-       {
-               glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1);
-               strcpy (glt->identifier, identifier);
-       }
-       else
-               glt->identifier = NULL;
-       glt->pool = pool;
-       glt->chain = pool->gltchain;
-       pool->gltchain = glt;
-       glt->crc = crc;
-       glt->width = width;
-       glt->height = height;
-       glt->flags = flags;
-       glt->textype = texinfo;
-
-       if (data)
-       {
-               glt->inputtexels = Mem_Alloc(texturedatamempool, glt->width * glt->height * texinfo->inputbytesperpixel);
-               if (glt->inputtexels == NULL)
-                       Sys_Error("R_SetupTexture: out of memory\n");
-               memcpy(glt->inputtexels, data, glt->width * glt->height * texinfo->inputbytesperpixel);
-       }
-       else
-               glt->inputtexels = NULL;
-
-       R_FindImageForTexture(glt);
-       R_PrecacheTexture(glt);
-
-       return glt;
-}
-
-/*
-================
-R_LoadTexture
-================
-*/
-rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags)
-{
-       int i;
+       int i, size;
        gltexture_t *glt;
        gltexturepool_t *pool = (gltexturepool_t *)rtexturepool;
        textypeinfo_t *texinfo;
-       unsigned short crc;
 
        if (cls.state == ca_dedicated)
                return NULL;
 
-       texinfo = R_GetTexTypeInfo(textype, flags);
+       if (texturetype == GLTEXTURETYPE_CUBEMAP)
+       {
+               if (flags & TEXF_FRAGMENT)
+                       Sys_Error("R_LoadTexture: fragment cubemap texture??\n");
+               if (!gl_texturecubemap)
+                       Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n");
+       }
+       if (texturetype == GLTEXTURETYPE_3D)
+               if (!gl_texture3d)
+                       Sys_Error("R_LoadTexture: 3d texture not supported by driver\n");
+
+       /*
+       glt = R_FindTexture (pool, identifier);
+       if (glt)
+       {
+               Con_Printf("R_LoadTexture: replacing existing texture %s\n", identifier);
+               R_FreeTexture((rtexture_t *)glt);
+       }
+       */
 
-       if (flags & TEXF_FRAGMENT)
-               if ((width * texinfo->internalbytesperpixel) & 3)
-                       Host_Error("R_LoadTexture: incompatible width for fragment");
+       texinfo = R_GetTexTypeInfo(textype, flags);
+       size = width * height * depth * sides * texinfo->inputbytesperpixel;
 
        // clear the alpha flag if the texture has no transparent pixels
        switch(textype)
@@ -850,12 +966,15 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
                if (flags & TEXF_ALPHA)
                {
                        flags &= ~TEXF_ALPHA;
-                       for (i = 0;i < width * height;i++)
+                       if (data)
                        {
-                               if (data[i] == 255)
+                               for (i = 0;i < size;i++)
                                {
-                                       flags |= TEXF_ALPHA;
-                                       break;
+                                       if (data[i] == 255)
+                                       {
+                                               flags |= TEXF_ALPHA;
+                                               break;
+                                       }
                                }
                        }
                }
@@ -868,12 +987,15 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
                if (flags & TEXF_ALPHA)
                {
                        flags &= ~TEXF_ALPHA;
-                       for (i = 0;i < width * height;i++)
+                       if (data)
                        {
-                               if (data[i * 4 + 3] < 255)
+                               for (i = 3;i < size;i += 4)
                                {
-                                       flags |= TEXF_ALPHA;
-                                       break;
+                                       if (data[i] < 255)
+                                       {
+                                               flags |= TEXF_ALPHA;
+                                               break;
+                                       }
                                }
                        }
                }
@@ -882,70 +1004,107 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
                Host_Error("R_LoadTexture: unknown texture type\n");
        }
 
-       // LordHavoc: do a CRC to confirm the data really is the same as previous occurances.
-       if (data == NULL)
-               crc = 0;
+       glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
+       if (identifier)
+       {
+               glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1);
+               strcpy (glt->identifier, identifier);
+       }
        else
-               crc = CRC_Block(data, width*height*texinfo->inputbytesperpixel);
+               glt->identifier = NULL;
+       glt->pool = pool;
+       glt->chain = pool->gltchain;
+       pool->gltchain = glt;
+       glt->width = width;
+       glt->height = height;
+       glt->depth = depth;
+       glt->flags = flags | GLTEXF_UPLOAD;
+       glt->textype = texinfo;
+       glt->texturetype = texturetype;
+       glt->inputdatasize = size;
 
-       // see if the texture is already present
-       if (identifier && (glt = R_FindTexture(pool, identifier)))
+       if (data)
        {
-               if (crc == glt->crc && width == glt->width && height == glt->height && texinfo == glt->textype && ((flags ^ glt->flags) & TEXF_IMPORTANTBITS) == 0 && ((flags ^ glt->flags) & GLTEXF_IMPORTANTBITS) == 0)
-               {
-                       Con_Printf("R_LoadTexture: exact match with existing texture %s\n", identifier);
-                       return (rtexture_t *)glt; // exact match, use existing
-               }
-               Con_Printf("R_LoadTexture: cache mismatch on %s, replacing old texture\n", identifier);
-               R_FreeTexture((rtexture_t *)glt);
+               glt->inputtexels = Mem_Alloc(texturedatamempool, size);
+               if (glt->inputtexels == NULL)
+                       Sys_Error("R_SetupTexture: out of memory\n");
+               memcpy(glt->inputtexels, data, size);
        }
+       else
+               glt->inputtexels = NULL;
+
+       R_FindImageForTexture(glt);
+       R_PrecacheTexture(glt);
+
+       return (rtexture_t *)glt;
+}
+
+rtexture_t *R_LoadTexture(rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags)
+{
+       return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data);
+}
+
+rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, char *identifier, int width, qbyte *data, int textype, int flags)
+{
+       return R_SetupTexture(rtexturepool, identifier, width, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data);
+}
+
+rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags)
+{
+       return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data);
+}
+
+rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, char *identifier, int width, int height, int depth, qbyte *data, int textype, int flags)
+{
+       return R_SetupTexture(rtexturepool, identifier, width, height, depth, 1, flags, textype, GLTEXTURETYPE_3D, data);
+}
 
-       return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data);
+rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, char *identifier, int width, qbyte *data, int textype, int flags)
+{
+       return R_SetupTexture(rtexturepool, identifier, width, width, 1, 6, flags, textype, GLTEXTURETYPE_CUBEMAP, data);
 }
 
 int R_TextureHasAlpha(rtexture_t *rt)
 {
-       gltexture_t *glt;
-       if (!rt)
-               return false;
-       glt = (gltexture_t *)rt;
-       return (glt->flags & TEXF_ALPHA) != 0;
+       return rt ? (((gltexture_t *)rt)->flags & TEXF_ALPHA) != 0 : false;
 }
 
 int R_TextureWidth(rtexture_t *rt)
 {
-       if (!rt)
-               return false;
-       return ((gltexture_t *)rt)->width;
+       return rt ? ((gltexture_t *)rt)->width : 0;
 }
 
 int R_TextureHeight(rtexture_t *rt)
 {
-       if (!rt)
-               return false;
-       return ((gltexture_t *)rt)->height;
+       return rt ? ((gltexture_t *)rt)->height : 0;
 }
 
-void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+void R_FragmentLocation3D(rtexture_t *rt, int *x, int *y, int *z, float *fx1, float *fy1, float *fz1, float *fx2, float *fy2, float *fz2)
 {
        gltexture_t *glt;
-       float iwidth, iheight;
+       float iwidth, iheight, idepth;
        if (cls.state == ca_dedicated)
        {
                if (x)
                        *x = 0;
                if (y)
                        *y = 0;
+               if (z)
+                       *z = 0;
                if (fx1 || fy1 || fx2 || fy2)
                {
                        if (fx1)
                                *fx1 = 0;
                        if (fy1)
                                *fy1 = 0;
+                       if (fz1)
+                               *fz1 = 0;
                        if (fx2)
                                *fx2 = 1;
                        if (fy2)
                                *fy2 = 1;
+                       if (fz2)
+                               *fz2 = 1;
                }
                return;
        }
@@ -962,14 +1121,19 @@ void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1,
                {
                        iwidth = 1.0f / glt->image->width;
                        iheight = 1.0f / glt->image->height;
+                       idepth = 1.0f / glt->image->depth;
                        if (fx1)
                                *fx1 = glt->x * iwidth;
                        if (fy1)
                                *fy1 = glt->y * iheight;
+                       if (fz1)
+                               *fz1 = glt->z * idepth;
                        if (fx2)
                                *fx2 = (glt->x + glt->width) * iwidth;
                        if (fy2)
                                *fy2 = (glt->y + glt->height) * iheight;
+                       if (fz2)
+                               *fz2 = (glt->z + glt->depth) * idepth;
                }
        }
        else
@@ -978,25 +1142,33 @@ void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1,
                        *x = 0;
                if (y)
                        *y = 0;
+               if (z)
+                       *z = 0;
                if (fx1 || fy1 || fx2 || fy2)
                {
                        if (fx1)
                                *fx1 = 0;
                        if (fy1)
                                *fy1 = 0;
+                       if (fz1)
+                               *fz1 = 0;
                        if (fx2)
                                *fx2 = 1;
                        if (fy2)
                                *fy2 = 1;
+                       if (fz2)
+                               *fz2 = 1;
                }
        }
 }
 
+void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2)
+{
+       R_FragmentLocation3D(rt, x, y, NULL, fx1, fy1, NULL, fx2, fy2, NULL);
+}
+
 int R_CompatibleFragmentWidth(int width, int textype, int flags)
 {
-       textypeinfo_t *texinfo = R_GetTexTypeInfo(textype, flags);
-       while ((width * texinfo->internalbytesperpixel) & 3)
-               width++;
        return width;
 }
 
@@ -1011,7 +1183,7 @@ void R_UpdateTexture(rtexture_t *rt, qbyte *data)
 
        // if it has not been uploaded yet, update the data that will be used when it is
        if (glt->inputtexels)
-               memcpy(glt->inputtexels, data, glt->width * glt->height * glt->textype->inputbytesperpixel);
+               memcpy(glt->inputtexels, data, glt->inputdatasize);
        else
                R_Upload(glt, data);
 }
index e283259..96a7124 100644 (file)
--- a/glquake.h
+++ b/glquake.h
@@ -287,6 +287,55 @@ extern int gl_combine_extension;
 
 extern cvar_t gl_combine;
 
+extern int gl_texture3d;
+#ifndef GL_TEXTURE_3D_EXT
+#define GL_PACK_SKIP_IMAGES_EXT                        0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT               0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT              0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT             0x806E
+#define GL_TEXTURE_3D_EXT                      0x806F
+#define GL_PROXY_TEXTURE_3D_EXT                        0x8070
+#define GL_TEXTURE_DEPTH_EXT                   0x8071
+#define GL_TEXTURE_WRAP_R_EXT                  0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT             0x8073
+#define GL_TEXTURE_3D_BINDING_EXT              0x806A
+extern void (GLAPIENTRY *qglTexImage3DEXT)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+extern void (GLAPIENTRY *qglTexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+extern void (GLAPIENTRY *qglCopyTexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+extern int gl_texturecubemap;
+#ifndef GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB
+#define GL_NORMAL_MAP_ARB                          0x8511
+#define GL_REFLECTION_MAP_ARB              0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB                    0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB            0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB     0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB     0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB     0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB     0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB     0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB     0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB      0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB               0x851C
+#endif
+
+extern int gl_dot3arb;
+#ifndef GL_DOT3_RGB_ARB
+#define DOT3_RGB_ARB                           0x86AE
+#define DOT3_RGBA_ARB                          0x86AF
+#endif
+
+/*
+// uncomment if this is actually needed by anyone
+extern int gl_dot3ext;
+#ifndef GL_DOT3_RGB_EXT
+#define GL_DOT3_RGB_EXT                                0x8740
+#define GL_DOT3_RGBA_EXT                       0x8741
+#endif
+*/
+
+
 extern void (GLAPIENTRY *qglClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 
 extern void (GLAPIENTRY *qglClear)(GLbitfield mask);
@@ -362,17 +411,27 @@ extern void (GLAPIENTRY *qglClearStencil)(GLint s);
 
 //extern void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param);
 extern void (GLAPIENTRY *qglTexEnvi)(GLenum target, GLenum pname, GLint param);
-
 //extern void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param);
 extern void (GLAPIENTRY *qglTexParameteri)(GLenum target, GLenum pname, GLint param);
 
-extern void (GLAPIENTRY *qglBindTexture)(GLenum target, GLuint texture);
-extern void (GLAPIENTRY *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
-extern void (GLAPIENTRY *qglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+extern void (GLAPIENTRY *qglGenTextures)(GLsizei n, GLuint *textures);
 extern void (GLAPIENTRY *qglDeleteTextures)(GLsizei n, const GLuint *textures);
+extern void (GLAPIENTRY *qglBindTexture)(GLenum target, GLuint texture);
+extern void (GLAPIENTRY *qglPrioritizeTextures)(GLsizei n, const GLuint *textures, const GLclampf *priorities);
+extern GLboolean (GLAPIENTRY *qglAreTexturesResident)(GLsizei n, const GLuint *textures, GLboolean *residences);
+extern GLboolean (GLAPIENTRY *qglIsTexture)(GLuint texture);
 extern void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param);
 extern void (GLAPIENTRY *qglPixelStorei)(GLenum pname, GLint param);
 
+extern void (GLAPIENTRY *qglTexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+extern void (GLAPIENTRY *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+extern void (GLAPIENTRY *qglTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+extern void (GLAPIENTRY *qglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+extern void (GLAPIENTRY *qglCopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+extern void (GLAPIENTRY *qglCopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+extern void (GLAPIENTRY *qglCopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+extern void (GLAPIENTRY *qglCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
 #if WIN32
 extern int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *);
 extern int (WINAPI *qwglDescribePixelFormat)(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
diff --git a/image.c b/image.c
index 71737c4..d78d1f5 100644 (file)
--- a/image.c
+++ b/image.c
@@ -1097,8 +1097,10 @@ void Image_Resample24Nolerp(void *indata, int inwidth, int inheight, void *outda
 Image_Resample
 ================
 */
-void Image_Resample (void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight, int bytesperpixel, int quality)
+void Image_Resample (void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality)
 {
+       if (indepth != 1 || outdepth != 1)
+               Sys_Error("Image_Resample: 3D resampling not supported\n");
        if (resamplerowsize < outwidth*4)
        {
                if (resamplerow1)
@@ -1128,9 +1130,11 @@ void Image_Resample (void *indata, int inwidth, int inheight, void *outdata, int
 }
 
 // in can be the same as out
-void Image_MipReduce(qbyte *in, qbyte *out, int *width, int *height, int destwidth, int destheight, int bytesperpixel)
+void Image_MipReduce(qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
 {
        int x, y, nextrow;
+       if (*depth != 1 || destdepth != 1)
+               Sys_Error("Image_Resample: 3D resampling not supported\n");
        nextrow = *width * bytesperpixel;
        if (*width > destwidth)
        {
diff --git a/image.h b/image.h
index b441d72..c73d48a 100644 (file)
--- a/image.h
+++ b/image.h
@@ -40,10 +40,10 @@ void Image_WriteTGARGBA (char *filename, int width, int height, qbyte *data);
 qboolean Image_CheckAlpha(qbyte *data, int size, qboolean rgba);
 
 // resizes the image (in can not be the same as out)
-void Image_Resample (void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight, int bytesperpixel, int quality);
+void Image_Resample (void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality);
 
 // scales the image down by a power of 2 (in can be the same as out)
-void Image_MipReduce(qbyte *in, qbyte *out, int *width, int *height, int destwidth, int destheight, int bytesperpixel);
+void Image_MipReduce(qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel);
 
 // only used by menuplyr coloring
 qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight);
index 212118b..8c05f36 100644 (file)
@@ -8,16 +8,22 @@ viddef_t vid;
 qboolean isG200 = false; // LordHavoc: the Matrox G200 can't do per pixel alpha, and it uses a D3D driver for GL... ugh...
 qboolean isRagePro = false; // LordHavoc: the ATI Rage Pro has limitations with per pixel alpha (the color scaler does not apply to per pixel alpha images...), although not as bad as a G200.
 
-// LordHavoc: GL_ARB_multitexture support
+// GL_ARB_multitexture
 int gl_textureunits = 0;
-// LordHavoc: GL_ARB_texture_env_combine or GL_EXT_texture_env_combine support
+// GL_ARB_texture_env_combine or GL_EXT_texture_env_combine
 int gl_combine_extension = false;
-// LordHavoc: GL_EXT_compiled_vertex_array support
+// GL_EXT_compiled_vertex_array
 int gl_supportslockarrays = false;
-// LordHavoc: GLX_SGI_video_sync and WGL_EXT_swap_control
+// GLX_SGI_video_sync or WGL_EXT_swap_control
 int gl_videosyncavailable = false;
-// indicates that stencil is available
+// stencil available
 int gl_stencil = false;
+// GL_EXT_texture3D
+int gl_texture3d = false;
+// GL_ARB_texture_cubemap
+int gl_texturecubemap = false;
+// GL_ARB_texture_env_dot3
+int gl_dot3arb = false;
 
 // LordHavoc: if window is hidden, don't update screen
 int vid_hidden = true;
@@ -142,21 +148,37 @@ void (GLAPIENTRY *qglClearStencil)(GLint s);
 
 //void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param);
 void (GLAPIENTRY *qglTexEnvi)(GLenum target, GLenum pname, GLint param);
-
 //void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param);
 void (GLAPIENTRY *qglTexParameteri)(GLenum target, GLenum pname, GLint param);
 
-void (GLAPIENTRY *qglBindTexture)(GLenum target, GLuint texture);
-void (GLAPIENTRY *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-void (GLAPIENTRY *qglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+void (GLAPIENTRY *qglGenTextures)(GLsizei n, GLuint *textures);
 void (GLAPIENTRY *qglDeleteTextures)(GLsizei n, const GLuint *textures);
+void (GLAPIENTRY *qglBindTexture)(GLenum target, GLuint texture);
+void (GLAPIENTRY *qglPrioritizeTextures)(GLsizei n, const GLuint *textures, const GLclampf *priorities);
+GLboolean (GLAPIENTRY *qglAreTexturesResident)(GLsizei n, const GLuint *textures, GLboolean *residences);
+GLboolean (GLAPIENTRY *qglIsTexture)(GLuint texture);
 void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param);
 void (GLAPIENTRY *qglPixelStorei)(GLenum pname, GLint param);
 
+void (GLAPIENTRY *qglTexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+void (GLAPIENTRY *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+void (GLAPIENTRY *qglTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+void (GLAPIENTRY *qglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+void (GLAPIENTRY *qglCopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+void (GLAPIENTRY *qglCopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+void (GLAPIENTRY *qglCopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+void (GLAPIENTRY *qglCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+
 void (GLAPIENTRY *qglDrawRangeElementsEXT)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
 
 //void (GLAPIENTRY *qglColorTableEXT)(int, int, int, int, int, const void *);
 
+void (GLAPIENTRY *qglTexImage3DEXT)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+void (GLAPIENTRY *qglTexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+void (GLAPIENTRY *qglCopyTexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+
 int GL_CheckExtension(const char *name, const gl_extensionfunctionlist_t *funcs, const char *disableparm, int silent)
 {
        int failed = false;
@@ -263,12 +285,22 @@ static gl_extensionfunctionlist_t opengl110funcs[] =
        {"glTexEnvi", (void **) &qglTexEnvi},
 //     {"glTexParameterf", (void **) &qglTexParameterf},
        {"glTexParameteri", (void **) &qglTexParameteri},
+       {"glPixelStoref", (void **) &qglPixelStoref},
+       {"glPixelStorei", (void **) &qglPixelStorei},
+       {"glGenTextures", (void **) &qglGenTextures},
+       {"glDeleteTextures", (void **) &qglDeleteTextures},
        {"glBindTexture", (void **) &qglBindTexture},
+       {"glPrioritizeTextures", (void **) &qglPrioritizeTextures},
+       {"glAreTexturesResident", (void **) &qglAreTexturesResident},
+       {"glIsTexture", (void **) &qglIsTexture},
+       {"glTexImage1D", (void **) &qglTexImage1D},
        {"glTexImage2D", (void **) &qglTexImage2D},
+       {"glTexSubImage1D", (void **) &qglTexSubImage1D},
        {"glTexSubImage2D", (void **) &qglTexSubImage2D},
-       {"glDeleteTextures", (void **) &qglDeleteTextures},
-       {"glPixelStoref", (void **) &qglPixelStoref},
-       {"glPixelStorei", (void **) &qglPixelStorei},
+       {"glCopyTexImage1D", (void **) &qglCopyTexImage1D},
+       {"glCopyTexImage2D", (void **) &qglCopyTexImage2D},
+       {"glCopyTexSubImage1D", (void **) &qglCopyTexSubImage1D},
+       {"glCopyTexSubImage2D", (void **) &qglCopyTexSubImage2D},
        {NULL, NULL}
 };
 
@@ -299,9 +331,19 @@ static gl_extensionfunctionlist_t compiledvertexarrayfuncs[] =
        {NULL, NULL}
 };
 
+static gl_extensionfunctionlist_t texture3dfuncs[] =
+{
+       {"glTexImage3DEXT", (void **) &qglTexImage3DEXT},
+       {"glTexSubImage3DEXT", (void **) &qglTexSubImage3DEXT},
+       {"glCopyTexSubImage3DEXT", (void **) &qglCopyTexSubImage3DEXT},
+       {NULL, NULL}
+};
+
 void VID_CheckExtensions(void)
 {
+       gl_stencil = vid_stencil.integer;
        gl_combine_extension = false;
+       gl_dot3arb = false;
        gl_supportslockarrays = false;
        gl_textureunits = 1;
 
@@ -322,15 +364,13 @@ void VID_CheckExtensions(void)
        if (GL_CheckExtension("GL_ARB_multitexture", multitexturefuncs, "-nomtex", false))
        {
                qglGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_textureunits);
-               if (gl_textureunits > 1)
-                       gl_combine_extension = GL_CheckExtension("GL_ARB_texture_env_combine", NULL, "-nocombine", false) || GL_CheckExtension("GL_EXT_texture_env_combine", NULL, "-nocombine", false);
-               else
-               {
-                       Con_Printf("GL_ARB_multitexture with less than 2 units? - BROKEN DRIVER!\n");
-                       gl_textureunits = 1; // for sanity sake, make sure it's not 0
-               }
+               gl_combine_extension = GL_CheckExtension("GL_ARB_texture_env_combine", NULL, "-nocombine", false) || GL_CheckExtension("GL_EXT_texture_env_combine", NULL, "-nocombine", false);
+               if (gl_combine_extension)
+                       gl_dot3arb = GL_CheckExtension("GL_ARB_texture_env_dot3", NULL, "-nodot3", false);
        }
 
+       gl_texture3d = GL_CheckExtension("GL_EXT_texture3D", texture3dfuncs, "-notexture3d", false);
+       gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false);
        gl_supportslockarrays = GL_CheckExtension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva", false);
 
        // we don't care if it's an extension or not, they are identical functions, so keep it simple in the rendering code