From: Brian P. <br...@va...> - 2001-03-27 19:54:23
|
Gareth Hughes wrote: > > CVSROOT: /cvsroot/mesa3d > Module name: Mesa > Repository: Mesa/src/ > Changes by: gareth@usw-pr-cvs1. 01/03/27 11:18:02 > > Log message: > Updates required for DRI drivers on mesa-3-5-branch. > > Modified files: > Mesa/src/: > imports.c mtypes.h texformat.c texstore.c texutil.c > > Revision Changes Path > 1.9 +10 -8 Mesa/src/imports.c > 1.33 +4 -1 Mesa/src/mtypes.h > 1.4 +63 -36 Mesa/src/texformat.c > 1.19 +13 -5 Mesa/src/texstore.c > 1.19 +41 -1 Mesa/src/texutil.c This code in texutil.c: #define CONVERT_TEXEL_DWORD( src ) \ ({ GLuint s = *(GLuint *)src; \ s = (((s & 0xfffefffe) >> 1) | \ ((s & 0x00010001) << 15)); s; }) is not ANSI-legal. I'll fix it up. Gareth, With these latest changes it appears to me that the Format and Type fields in gl_texture_image are redundant with respect to the BaseFormat and BaseType fields in the gl_texture_format struct. I'd like to remove Format and Type from the former and use the later instead. I'll work on that too. -Brian |