]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_textures.c
moved the GL_CloseLibrary call a bit
[xonotic/darkplaces.git] / gl_textures.c
index 43bf88e8b8e5f1522cfba9f97f191102f82662cc..0a7f2a1d1e3f72d5ff913be2e4da35abc7329bab 100644 (file)
@@ -26,7 +26,6 @@ static mempool_t *textureprocessingmempool;
 #define GLTEXF_DESTROYED 0x00040000
 
 // size of images which hold fragment textures, ignores picmip and max_size
-//#define BLOCK_SIZE 256
 static int block_size;
 
 // really this number only governs gltexnuminuse
@@ -201,12 +200,13 @@ int R_GetTexture(rtexture_t *rt)
        return glt->image->texnum;
 }
 
-static void R_FreeTexture(gltexture_t *glt)
+void R_FreeTexture(rtexture_t *rt)
 {
-       gltexture_t **gltpointer;
+       gltexture_t *glt, **gltpointer;
        gltextureimage_t *image, **gltimagepointer;
        GLuint texnum;
 
+       glt = (gltexture_t *)rt;
        if (glt == NULL)
                Host_Error("R_FreeTexture: texture == NULL\n");
 
@@ -293,7 +293,7 @@ void R_FreeTexturePool(rtexturepool_t **rtexturepool)
        else
                Host_Error("R_FreeTexturePool: pool not linked\n");
        while (pool->gltchain)
-               R_FreeTexture(pool->gltchain);
+               R_FreeTexture((rtexture_t *)pool->gltchain);
        if (pool->imagechain)
                Sys_Error("R_FreeTexturePool: not all images freed\n");
        Mem_Free(pool);
@@ -676,10 +676,11 @@ static void R_FindImageForTexture(gltexture_t *glt)
                                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
-                       best = block_size;
-                       for (best = block_size, i = 0;i < block_size - w;i += texinfo->align)
+                       for (best = image->width, i = 0;i < image->width - w;i += texinfo->align)
                        {
                                for (best2 = 0, j = 0;j < w;j++)
                                {
@@ -696,7 +697,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
                                }
                        }
 
-                       if (best + h > block_size)
+                       if (best + h > image->height)
                                continue;
 
                        for (i = 0;i < w;i++)
@@ -713,10 +714,11 @@ static void R_FindImageForTexture(gltexture_t *glt)
                if (image == NULL)
                        Sys_Error("R_FindImageForTexture: ran out of memory\n");
                image->type = GLIMAGETYPE_FRAGMENTS;
-               image->width = block_size;
-               image->height = block_size;
-               image->blockallocation = Mem_Alloc(texturemempool, block_size * sizeof(short));
-               memset(image->blockallocation, 0, block_size * sizeof(short));
+               // make sure the created image is big enough for the fragment
+               for (image->width = block_size;image->width < glt->width;image->width <<= 1);
+               for (image->height = block_size;image->height < glt->height;image->height <<= 1);
+               image->blockallocation = Mem_Alloc(texturemempool, image->width * sizeof(short));
+               memset(image->blockallocation, 0, image->width * sizeof(short));
 
                x = 0;
                y = 0;
@@ -863,12 +865,8 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
        texinfo = R_GetTexTypeInfo(textype, flags);
 
        if (flags & TEXF_FRAGMENT)
-       {
-               if (width > block_size || height > block_size)
-                       Host_Error("R_LoadTexture: fragment too big, must be no more than %dx%d\n", block_size, block_size);
                if ((width * texinfo->internalbytesperpixel) & 3)
                        Host_Error("R_LoadTexture: incompatible width for fragment");
-       }
 
        // clear the alpha flag if the texture has no transparent pixels
        switch(textype)
@@ -924,7 +922,7 @@ rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int w
                        return (rtexture_t *)glt; // exact match, use existing
                }
                Con_Printf("R_LoadTexture: cache mismatch on %s, replacing old texture\n", identifier);
-               R_FreeTexture(glt);
+               R_FreeTexture((rtexture_t *)glt);
        }
 
        return (rtexture_t *)R_SetupTexture(pool, identifier, crc, width, height, flags | GLTEXF_UPLOAD, texinfo, data, NULL, NULL, 0);
@@ -942,12 +940,8 @@ rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier,
        texinfo = R_GetTexTypeInfo(textype, flags);
 
        if (flags & TEXF_FRAGMENT)
-       {
-               if (width > block_size || height > block_size)
-                       Host_Error("R_ProceduralTexture: fragment too big, must be no more than %dx%d\n", block_size, block_size);
                if ((width * texinfo->internalbytesperpixel) & 3)
                        Host_Error("R_ProceduralTexture: incompatible width for fragment");
-       }
 
        // see if the texture is already present
        if (identifier && (glt = R_FindTexture(pool, identifier)))
@@ -958,7 +952,7 @@ rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier,
                        return (rtexture_t *)glt; // exact match, use existing
                }
                Con_Printf("R_LoadTexture: cache mismatch, replacing old texture\n");
-               R_FreeTexture(glt);
+               R_FreeTexture((rtexture_t *)glt);
        }
 
        return (rtexture_t *)R_SetupTexture(pool, identifier, 0, width, height, flags | GLTEXF_PROCEDURAL | GLTEXF_UPLOAD, texinfo, NULL, generate, proceduraldata, proceduraldatasize);