gave names to nearly all structs and enums which should make for better C++ error...

[xonotic/darkplaces.git] / gl_textures.c

diff --git a/gl_textures.c b/gl_textures.c
index e2a49dd35fa9609142674fbef2ebc2a971879cd8..e8476796cdacb73a09ed4883dff79be2f8db27ac 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -15,8 +15,6 @@ int           gl_filter_mag = GL_LINEAR;
 
 
 static mempool_t *texturemempool;
 
 
 static mempool_t *texturemempool;

-static mempool_t *texturedatamempool;
-static mempool_t *textureprocessingmempool;

 
 // note: this must not conflict with TEXF_ flags in r_textures.h
 // cleared when a texture is uploaded
 
 // note: this must not conflict with TEXF_ flags in r_textures.h
 // cleared when a texture is uploaded


@@ -29,7 +27,7 @@ static mempool_t *textureprocessingmempool;
 // size of images which hold fragment textures, ignores picmip and max_size
 static int block_size;
 
 // size of images which hold fragment textures, ignores picmip and max_size
 static int block_size;
 

-typedef struct
+typedef struct textypeinfo_s

 {
        int textype;
        int inputbytesperpixel;
 {
        int textype;
        int inputbytesperpixel;


@@ -100,7 +98,7 @@ typedef struct gltexture_s
        // pointer into gltextureimage array
        gltextureimage_t *image;
        // name of the texture (this might be removed someday), no duplicates
        // pointer into gltextureimage array
        gltextureimage_t *image;
        // name of the texture (this might be removed someday), no duplicates

-       char *identifier;
+       char identifier[32];

        // location in the image, and size
        int x, y, z, width, height, depth;
        // copy of the original texture(s) supplied to the upload function, for
        // location in the image, and size
        int x, y, z, width, height, depth;
        // copy of the original texture(s) supplied to the upload function, for


@@ -240,42 +238,24 @@ void R_FreeTexture(rtexture_t *rt)
                        else
                                Host_Error("R_FreeTexture: image not linked in pool\n");
                        if (image->texnum)
                        else
                                Host_Error("R_FreeTexture: image not linked in pool\n");
                        if (image->texnum)

-                               qglDeleteTextures(1, &image->texnum);
+                               qglDeleteTextures(1, (GLuint *)&image->texnum);

                        if (image->blockallocation)
                                Mem_Free(image->blockallocation);
                        Mem_Free(image);
                }
        }
 
                        if (image->blockallocation)
                                Mem_Free(image->blockallocation);
                        Mem_Free(image);
                }
        }
 

-       if (glt->identifier)
-               Mem_Free(glt->identifier);

        if (glt->inputtexels)
                Mem_Free(glt->inputtexels);
        Mem_Free(glt);
 }
 
        if (glt->inputtexels)
                Mem_Free(glt->inputtexels);
        Mem_Free(glt);
 }
 

-/*
-static gltexture_t *R_FindTexture (gltexturepool_t *pool, char *identifier)
-{
-       gltexture_t     *glt;
-
-       if (!identifier)
-               return NULL;
-
-       for (glt = pool->gltchain;glt;glt = glt->chain)
-               if (glt->identifier && !strcmp (identifier, glt->identifier))
-                       return glt;
-
-       return NULL;
-}
-*/
-

 rtexturepool_t *R_AllocTexturePool(void)
 {
        gltexturepool_t *pool;
        if (texturemempool == NULL)
                return NULL;
 rtexturepool_t *R_AllocTexturePool(void)
 {
        gltexturepool_t *pool;
        if (texturemempool == NULL)
                return NULL;

-       pool = Mem_Alloc(texturemempool, sizeof(gltexturepool_t));
+       pool = (gltexturepool_t *)Mem_Alloc(texturemempool, sizeof(gltexturepool_t));

        if (pool == NULL)
                return NULL;
        pool->next = gltexturepoolchain;
        if (pool == NULL)
                return NULL;
        pool->next = gltexturepoolchain;


@@ -303,12 +283,12 @@ void R_FreeTexturePool(rtexturepool_t **rtexturepool)
        while (pool->gltchain)
                R_FreeTexture((rtexture_t *)pool->gltchain);
        if (pool->imagechain)
        while (pool->gltchain)
                R_FreeTexture((rtexture_t *)pool->gltchain);
        if (pool->imagechain)

-               Sys_Error("R_FreeTexturePool: not all images freed\n");
+               Con_Printf("R_FreeTexturePool: not all images freed\n");

        Mem_Free(pool);
 }
 
 
        Mem_Free(pool);
 }
 
 

-typedef struct
+typedef struct glmode_s

 {
        char *name;
        int minification, magnification;
 {
        char *name;
        int minification, magnification;


@@ -458,7 +438,7 @@ void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean print
                                poolloadedp += glt->inputdatasize;
                        }
                        if (printeach)
                                poolloadedp += glt->inputdatasize;
                        }
                        if (printeach)

-                               Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", isloaded ? '[' : ' ', (glsize + 1023) / 1024, isloaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', isloaded ? "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", isloaded ? '[' : ' ', (glsize + 1023) / 1024, isloaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', isloaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier);

                }
                if (printpool)
                        Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", pool, pooltotal, pooltotalt / 1048576.0, pooltotalp / 1048576.0, poolloaded, poolloadedt / 1048576.0, poolloadedp / 1048576.0, pooltotal - poolloaded, (pooltotalt - poolloadedt) / 1048576.0, (pooltotalp - poolloadedp) / 1048576.0);
                }
                if (printpool)
                        Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", pool, pooltotal, pooltotalt / 1048576.0, pooltotalp / 1048576.0, poolloaded, poolloadedt / 1048576.0, poolloadedp / 1048576.0, pooltotal - poolloaded, (pooltotalt - poolloadedt) / 1048576.0, (pooltotalp - poolloadedp) / 1048576.0);


@@ -478,8 +458,6 @@ static void R_TextureStats_f(void)
        R_TextureStats_Print(true, true, true);
 }
 
        R_TextureStats_Print(true, true, true);
 }
 

-char engineversion[40];
-

 static void r_textures_start(void)
 {
        // deal with size limits of various drivers (3dfx in particular)
 static void r_textures_start(void)
 {
        // deal with size limits of various drivers (3dfx in particular)


@@ -492,9 +470,7 @@ static void r_textures_start(void)
        // use the largest scrap texture size we can (not sure if this is really a good idea)
        for (block_size = 1;block_size < realmaxsize && block_size < gl_max_scrapsize.integer;block_size <<= 1);
 
        // use the largest scrap texture size we can (not sure if this is really a good idea)
        for (block_size = 1;block_size < realmaxsize && block_size < gl_max_scrapsize.integer;block_size <<= 1);
 

-       texturemempool = Mem_AllocPool("Texture Info", 0, NULL);
-       texturedatamempool = Mem_AllocPool("Texture Storage (not yet uploaded)", 0, NULL);
-       textureprocessingmempool = Mem_AllocPool("Texture Processing Buffers", 0, NULL);
+       texturemempool = Mem_AllocPool("texture management", 0, NULL);

 
        // Disable JPEG screenshots if the DLL isn't loaded
        if (! JPEG_OpenLibrary ())
 
        // Disable JPEG screenshots if the DLL isn't loaded
        if (! JPEG_OpenLibrary ())


@@ -519,8 +495,6 @@ static void r_textures_shutdown(void)
        colorconvertbuffer = NULL;
        texturebuffer = NULL;
        Mem_FreePool(&texturemempool);
        colorconvertbuffer = NULL;
        texturebuffer = NULL;
        Mem_FreePool(&texturemempool);

-       Mem_FreePool(&texturedatamempool);
-       Mem_FreePool(&textureprocessingmempool);

 }
 
 static void r_textures_newmap(void)
 }
 
 static void r_textures_newmap(void)


@@ -576,7 +550,7 @@ void R_Textures_Frame (void)
                        for (image = pool->imagechain;image;image = image->imagechain)
                        {
                                // only update already uploaded images
                        for (image = pool->imagechain;image;image = image->imagechain)
                        {
                                // only update already uploaded images

-                               if (!(image->flags & GLTEXF_UPLOAD))
+                               if (!(image->flags & GLTEXF_UPLOAD) && (image->flags & TEXF_MIPMAP))

                                {
                                        qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
 
                                {
                                        qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
 


@@ -599,8 +573,8 @@ void R_MakeResizeBufferBigger(int size)
                        Mem_Free(resizebuffer);
                if (colorconvertbuffer)
                        Mem_Free(colorconvertbuffer);
                        Mem_Free(resizebuffer);
                if (colorconvertbuffer)
                        Mem_Free(colorconvertbuffer);

-               resizebuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
-               colorconvertbuffer = Mem_Alloc(textureprocessingmempool, resizebuffersize);
+               resizebuffer = (qbyte *)Mem_Alloc(texturemempool, resizebuffersize);
+               colorconvertbuffer = (qbyte *)Mem_Alloc(texturemempool, resizebuffersize);

                if (!resizebuffer || !colorconvertbuffer)
                        Host_Error("R_Upload: out of memory\n");
        }
                if (!resizebuffer || !colorconvertbuffer)
                        Host_Error("R_Upload: out of memory\n");
        }


@@ -613,7 +587,7 @@ static void GL_SetupTextureParameters(int flags, int texturetype)
 
        CHECKGLERROR
 
 
        CHECKGLERROR
 

-       if (gl_support_anisotropy)
+       if (gl_support_anisotropy && (flags & TEXF_MIPMAP))

        {
                int aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
                if (gl_texture_anisotropy.integer != aniso)
        {
                int aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
                if (gl_texture_anisotropy.integer != aniso)


@@ -911,7 +885,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
                                continue;
                        if (image->texturetype != glt->texturetype)
                                continue;
                                continue;
                        if (image->texturetype != glt->texturetype)
                                continue;

-                       if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP))
+                       if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR))

                                continue;
                        if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
                                continue;
                                continue;
                        if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
                                continue;


@@ -950,9 +924,12 @@ static void R_FindImageForTexture(gltexture_t *glt)
                        return;
                }
 
                        return;
                }
 

-               image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
+               image = (gltextureimage_t *)Mem_Alloc(texturemempool, sizeof(gltextureimage_t));

                if (image == NULL)
                if (image == NULL)

-                       Sys_Error("R_FindImageForTexture: ran out of memory\n");
+               {
+                       Con_Printf ("R_FindImageForTexture: ran out of memory\n");
+                       return;
+               }

                image->type = GLIMAGETYPE_FRAGMENTS;
                // make sure the created image is big enough for the fragment
                for (image->width = block_size;image->width < glt->width;image->width <<= 1);
                image->type = GLIMAGETYPE_FRAGMENTS;
                // make sure the created image is big enough for the fragment
                for (image->width = block_size;image->width < glt->width;image->width <<= 1);


@@ -962,7 +939,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
                image->depth = 1;
                if (gltexturetypedimensions[glt->texturetype] >= 3)
                        for (image->depth = block_size;image->depth < glt->depth;image->depth <<= 1);
                image->depth = 1;
                if (gltexturetypedimensions[glt->texturetype] >= 3)
                        for (image->depth = block_size;image->depth < glt->depth;image->depth <<= 1);

-               image->blockallocation = Mem_Alloc(texturemempool, image->width * sizeof(short));
+               image->blockallocation = (short int *)Mem_Alloc(texturemempool, image->width * sizeof(short));

                memset(image->blockallocation, 0, image->width * sizeof(short));
 
                x = 0;
                memset(image->blockallocation, 0, image->width * sizeof(short));
 
                x = 0;


@@ -975,9 +952,12 @@ static void R_FindImageForTexture(gltexture_t *glt)
        {
                for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain);
 
        {
                for (imagechainpointer = &pool->imagechain;*imagechainpointer;imagechainpointer = &(*imagechainpointer)->imagechain);
 

-               image = Mem_Alloc(texturemempool, sizeof(gltextureimage_t));
+               image = (gltextureimage_t *)Mem_Alloc(texturemempool, sizeof(gltextureimage_t));

                if (image == NULL)
                if (image == NULL)

-                       Sys_Error("R_FindImageForTexture: ran out of memory\n");
+               {
+                       Con_Printf ("R_FindImageForTexture: ran out of memory\n");
+                       return;
+               }

                image->type = GLIMAGETYPE_TILE;
                image->blockallocation = NULL;
 
                image->type = GLIMAGETYPE_TILE;
                image->blockallocation = NULL;
 


@@ -1000,17 +980,17 @@ static void R_FindImageForTexture(gltexture_t *glt)
        image->texturetype = glt->texturetype;
        image->glinternalformat = texinfo->glinternalformat;
        image->glformat = texinfo->glformat;
        image->texturetype = glt->texturetype;
        image->glinternalformat = texinfo->glinternalformat;
        image->glformat = texinfo->glformat;

-       image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP)) | GLTEXF_UPLOAD;
+       image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)) | GLTEXF_UPLOAD;

        image->bytesperpixel = texinfo->internalbytesperpixel;
        image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
        // get a texture number to use
        image->bytesperpixel = texinfo->internalbytesperpixel;
        image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
        // get a texture number to use

-       qglGenTextures(1, &image->texnum);
+       qglGenTextures(1, (GLuint *)&image->texnum);

        *imagechainpointer = image;
        image->texturecount++;
 
        glt->x = x;
        glt->y = y;
        *imagechainpointer = image;
        image->texturecount++;
 
        glt->x = x;
        glt->y = y;

-       glt->y = z;
+       glt->z = z;

        glt->image = image;
 }
 
        glt->image = image;
 }
 


@@ -1042,25 +1022,28 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
                return NULL;
 
        if (flags & TEXF_FRAGMENT && texturetype != GLTEXTURETYPE_2D)
                return NULL;
 
        if (flags & TEXF_FRAGMENT && texturetype != GLTEXTURETYPE_2D)

-               Sys_Error("R_LoadTexture: only 2D fragment textures implemented\n");
+       {
+               Con_Printf ("R_LoadTexture: only 2D fragment textures implemented\n");
+               return NULL;
+       }

        if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap)
        if (texturetype == GLTEXTURETYPE_CUBEMAP && !gl_texturecubemap)

-               Sys_Error("R_LoadTexture: cubemap texture not supported by driver\n");
+       {
+               Con_Printf ("R_LoadTexture: cubemap texture not supported by driver\n");
+               return NULL;
+       }

        if (texturetype == GLTEXTURETYPE_3D && !gl_texture3d)
        if (texturetype == GLTEXTURETYPE_3D && !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);
+               Con_Printf ("R_LoadTexture: 3d texture not supported by driver\n");
+               return NULL;

        }
        }

-       */

 
        texinfo = R_GetTexTypeInfo(textype, flags);
        size = width * height * depth * sides * texinfo->inputbytesperpixel;
        if (size < 1)
 
        texinfo = R_GetTexTypeInfo(textype, flags);
        size = width * height * depth * sides * texinfo->inputbytesperpixel;
        if (size < 1)

-               Sys_Error("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides);
+       {
+               Con_Printf ("R_LoadTexture: bogus texture size (%dx%dx%dx%dbppx%dsides = %d bytes)\n", width, height, depth, texinfo->inputbytesperpixel * 8, sides);
+               return NULL;
+       }

 
        // clear the alpha flag if the texture has no transparent pixels
        switch(textype)
 
        // clear the alpha flag if the texture has no transparent pixels
        switch(textype)


@@ -1109,14 +1092,9 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
                Host_Error("R_LoadTexture: unknown texture type\n");
        }
 
                Host_Error("R_LoadTexture: unknown texture type\n");
        }
 

-       glt = Mem_Alloc(texturemempool, sizeof(gltexture_t));
+       glt = (gltexture_t *)Mem_Alloc(texturemempool, sizeof(gltexture_t));

        if (identifier)
        if (identifier)

-       {
-               glt->identifier = Mem_Alloc(texturemempool, strlen(identifier)+1);
-               strcpy (glt->identifier, identifier);
-       }
-       else
-               glt->identifier = NULL;
+               strlcpy (glt->identifier, identifier, sizeof(glt->identifier));

        glt->pool = pool;
        glt->chain = pool->gltchain;
        pool->gltchain = glt;
        glt->pool = pool;
        glt->chain = pool->gltchain;
        pool->gltchain = glt;


@@ -1131,10 +1109,11 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
 
        if (data)
        {
 
        if (data)
        {

-               glt->inputtexels = Mem_Alloc(texturedatamempool, size);
+               glt->inputtexels = (qbyte *)Mem_Alloc(texturemempool, size);

                if (glt->inputtexels == NULL)
                if (glt->inputtexels == NULL)

-                       Sys_Error("R_LoadTexture: out of memory\n");
-               memcpy(glt->inputtexels, data, size);
+                       Con_Printf ("R_LoadTexture: out of memory\n");
+               else
+                       memcpy(glt->inputtexels, data, size);

        }
        else
                glt->inputtexels = NULL;
        }
        else
                glt->inputtexels = NULL;