qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

make GL_LoadTexture support RGB textures (ie, 24 bit). I'm not happy with

Browse source 
the solution, but at least it works.
This commit is contained in:
Bill Currie 2003-09-04 05:22:23 +00:00
parent 194ea081eb
commit 8db2660a4c
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libs/video/renderer/gl/gl_textures.c
View file

@ -551,10 +551,7 @@ GL_LoadTexture (const char *identifier, int width, int height, byte *data,
gltexture_t *glt;
// LordHavoc: now just using a standard CRC for texture validation
if (bytesperpixel == 1)
crc = CRC_Block (data, width * height * bytesperpixel);
else
crc = CRC_Block (data, width * height * 4);
crc = CRC_Block (data, width * height * bytesperpixel);
// see if the texture is already present
if (identifier[0]) {
@ -597,7 +594,20 @@ SetupTexture:
GL_Upload8 (data, width, height, mipmap, alpha);
break;
case 3:
GL_Upload32 ((GLuint *) data, width, height, mipmap, 0);
{
int count = width * height;
byte *data32 = malloc (count * 4);
byte *d = data32;
while (count--) {
*d++ = *data++;
*d++ = *data++;
*d++ = *data++;
*d++ = 255; // alpha 1.0
}
GL_Upload32 ((GLuint *) data32, width, height, mipmap, 0);
free (data32);
}
break;
case 4:
GL_Upload32 ((GLuint *) data, width, height, mipmap, alpha);