edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed error that occurs when you try to free the invalid texture texture

Browse source
This commit is contained in:
Magnus Auvinen 2009-01-10 18:34:27 +00:00
parent d7b0da8a0b
commit 3729f4cbf3
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engine/client/ec_gfx.c
View file

@ -78,6 +78,8 @@ static float screen_y0 = 0;
static float screen_x1 = 0; static float screen_x1 = 0;
static float screen_y1 = 0; static float screen_y1 = 0;
static int invalid_texture = 0;
typedef struct typedef struct
{ {
GLuint tex; GLuint tex;
@ -221,7 +223,7 @@ int gfx_init()
} }
atexit(SDL_Quit); atexit(SDL_Quit);
if(!no_gfx) if(!no_gfx)
{ {
#ifdef CONF_FAMILY_WINDOWS #ifdef CONF_FAMILY_WINDOWS
@ -308,7 +310,7 @@ int gfx_init()
inp_init(); inp_init();
/* create null texture, will get id=0 */ /* create null texture, will get id=0 */
gfx_load_texture_raw(4,4,IMG_RGBA,null_texture_data,IMG_RGBA,TEXLOAD_NORESAMPLE); invalid_texture = gfx_load_texture_raw(4,4,IMG_RGBA,null_texture_data,IMG_RGBA,TEXLOAD_NORESAMPLE);
/* perform some tests */ /* perform some tests */
/* pixeltest_dotesting(); */ /* pixeltest_dotesting(); */
@ -413,8 +415,12 @@ void gfx_set_vsync(int val)
int gfx_unload_texture(int index) int gfx_unload_texture(int index)
{ {
if(index == invalid_texture)
return 0;
if(index < 0) if(index < 0)
return 0; return 0;
glDeleteTextures(1, &textures[index].tex); glDeleteTextures(1, &textures[index].tex);
textures[index].next = first_free_texture; textures[index].next = first_free_texture;
memory_usage -= textures[index].memsize; memory_usage -= textures[index].memsize;
@ -463,7 +469,7 @@ int gfx_load_texture_raw(int w, int h, int format, const void *data, int store_f
/* don't waste memory on texture if we are stress testing */ /* don't waste memory on texture if we are stress testing */
if(config.dbg_stress || no_gfx) if(config.dbg_stress || no_gfx)
return -1; return invalid_texture;
/* grab texture */ /* grab texture */
tex = first_free_texture; tex = first_free_texture;
@ -559,7 +565,7 @@ int gfx_load_texture(const char *filename, int store_format, int flags)
IMAGE_INFO img; IMAGE_INFO img;
if(l < 3) if(l < 3)
return 0; return -1;
if(gfx_load_png(&img, filename)) if(gfx_load_png(&img, filename))
{ {
if (store_format == IMG_AUTO) if (store_format == IMG_AUTO)
@ -570,7 +576,7 @@ int gfx_load_texture(const char *filename, int store_format, int flags)
return id; return id;
} }
return 0; return invalid_texture;
} }
int gfx_load_png(IMAGE_INFO *img, const char *filename) int gfx_load_png(IMAGE_INFO *img, const char *filename)
@ -711,7 +717,9 @@ void gfx_texture_set(int slot)
dbg_assert(drawing == 0, "called gfx_texture_set within begin"); dbg_assert(drawing == 0, "called gfx_texture_set within begin");
if(no_gfx) return; if(no_gfx) return;
if(slot == -1) if(slot == -1)
{
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
}
else else
{ {
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);