qf/nuq
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/nuq synced 2024-11-24 21:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

missed the 8 bit upload code

Browse source
This commit is contained in:
Bill Currie 2001-10-02 01:47:04 +00:00
parent 136a7629cb
commit 308d8a1304
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/gl_draw.c
View file

@ -1185,7 +1185,7 @@ void GL_Upload8_EXT (byte *data, int width, int height, qboolean mipmap, qboole
int i, s; int i, s;
qboolean noalpha; qboolean noalpha;
int samples; int samples;
static unsigned char scaled[1024*512]; // [512*256]; unsigned char *scaled;
int scaled_width, scaled_height; int scaled_width, scaled_height;
s = width*height; s = width*height;
@ -1214,7 +1214,7 @@ void GL_Upload8_EXT (byte *data, int width, int height, qboolean mipmap, qboole
scaled_width = min(scaled_width, gl_max_size->int_val); scaled_width = min(scaled_width, gl_max_size->int_val);
scaled_height = min(scaled_height, gl_max_size->int_val); scaled_height = min(scaled_height, gl_max_size->int_val);
if (scaled_width * scaled_height > sizeof(scaled)) if (!(scaled = malloc (scaled_width * scaled_height)))
Sys_Error ("GL_LoadTexture: too big"); Sys_Error ("GL_LoadTexture: too big");
samples = 1; // alpha ? gl_alpha_format : gl_solid_format; samples = 1; // alpha ? gl_alpha_format : gl_solid_format;
@ -1277,6 +1277,7 @@ done: ;
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
} }
free (scaled);
} }
extern qboolean VID_Is8bit(); extern qboolean VID_Is8bit();