diff options
author | Daniel Borca <dborca@users.sourceforge.net> | 2003-11-07 13:17:21 +0000 |
---|---|---|
committer | Daniel Borca <dborca@users.sourceforge.net> | 2003-11-07 13:17:21 +0000 |
commit | d96651bdc59b1ddd6909a70b803ad60f07654cb5 (patch) | |
tree | 7eefd4e139d1fa5ff7c2d1546ee99b04c3cd9737 /src/mesa/drivers | |
parent | e83cf6ddf2b3f2f652ee0dfb1b0951649331c4e8 (diff) |
NCC fixes and some cosmetics
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/glide/fx.rc | 2 | ||||
-rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/glide/fxopengl.def | 2 | ||||
-rw-r--r-- | src/mesa/drivers/glide/fxwgl.c | 47 |
4 files changed, 5 insertions, 50 deletions
diff --git a/src/mesa/drivers/glide/fx.rc b/src/mesa/drivers/glide/fx.rc index c90e8c58bf..5d00629b82 100644 --- a/src/mesa/drivers/glide/fx.rc +++ b/src/mesa/drivers/glide/fx.rc @@ -2,7 +2,7 @@ #define PRODNAME "Mesa 5.1" #define CONTACTSTR "http://www.mesa3d.org" -#define HWSTR "3dfx Voodoo Banshee, Velocity 100/200, Voodoo3, Voodoo4, Voodoo5" +#define HWSTR "3dfx Voodoo^2, Voodoo Banshee, Velocity 100/200, Voodoo3, Voodoo4, Voodoo5" #define COPYRIGHTSTR "Copyright \251 Brian E. Paul" #define VERSIONSTR "5.1.0.1" diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index 8c48e92551..9dc47ec8e4 100644 --- a/src/mesa/drivers/glide/fxddtex.c +++ b/src/mesa/drivers/glide/fxddtex.c @@ -1311,7 +1311,7 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level, pxMip.data[0] = texImage->Data; fxMesa->Glide.txMipQuantize(&pxMip, &txMip, mml->glideFormat, TX_DITHER_ERR, TX_COMPRESSION_STATISTICAL); fxMesa->Glide.txPalToNcc((GuNccTable *)(&(ti->palette)), pxMip.pal); - MEMCPY((char *)texImage->Data + texImage->CompressedSize - 12 * 4, &(ti->palette), 12 * 4); + MEMCPY((char *)texImage->Data + texImage->CompressedSize - 12 * 4, &(ti->palette.data[16]), 12 * 4); } else #endif fxMesa->Glide.txImgQuantize(texImage->Data, _final_texImage_Data, mml->width, mml->height, mml->glideFormat, TX_DITHER_NONE); @@ -1525,7 +1525,7 @@ fxDDCompressedTexImage2D (GLcontext *ctx, GLenum target, #if FX_TC_NCC if ((mml->glideFormat == GR_TEXFMT_AYIQ_8422) || (mml->glideFormat == GR_TEXFMT_YIQ_422)) { - MEMCPY(&(ti->palette), (char *)texImage->Data + imageSize - 12 * 4, 12 * 4); + MEMCPY(&(ti->palette.data[16]), (char *)data + imageSize - 12 * 4, 12 * 4); } #endif diff --git a/src/mesa/drivers/glide/fxopengl.def b/src/mesa/drivers/glide/fxopengl.def index 9d0d3eb501..897905b4b4 100644 --- a/src/mesa/drivers/glide/fxopengl.def +++ b/src/mesa/drivers/glide/fxopengl.def @@ -1,3 +1,5 @@ +LIBRARY OpenGL32 +DESCRIPTION "Mesa 5.1" EXPORTS glAccum glActiveStencilFaceEXT diff --git a/src/mesa/drivers/glide/fxwgl.c b/src/mesa/drivers/glide/fxwgl.c index 8ab9d23c98..308cb9ba76 100644 --- a/src/mesa/drivers/glide/fxwgl.c +++ b/src/mesa/drivers/glide/fxwgl.c @@ -164,53 +164,6 @@ struct __pixelformat__ pix[] = { FXMESA_NONE} } , -#if 0 - /* 24bit RGB888 single buffer with depth */ - { - {sizeof(PIXELFORMATDESCRIPTOR), 1, - PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL, - PFD_TYPE_RGBA, - 24, - 8, 0, 8, 8, 8, 16, 0, 0, - 0, 0, 0, 0, 0, - 24, - 8, - 0, - PFD_MAIN_PLANE, - 0, 0, 0, 0} - , - {FXMESA_COLORDEPTH, 32, - FXMESA_ALPHA_SIZE, 8, - FXMESA_DEPTH_SIZE, 24, - FXMESA_STENCIL_SIZE, 8, - FXMESA_ACCUM_SIZE, 0, - FXMESA_NONE} - } - , - /* 24bit RGB888 double buffer with depth */ - { - {sizeof(PIXELFORMATDESCRIPTOR), 1, - PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | - PFD_DOUBLEBUFFER | PFD_SWAP_COPY, - PFD_TYPE_RGBA, - 24, - 8, 0, 8, 8, 8, 16, 0, 0, - 0, 0, 0, 0, 0, - 24, - 8, - 0, - PFD_MAIN_PLANE, - 0, 0, 0, 0} - , - {FXMESA_COLORDEPTH, 32, - FXMESA_DOUBLEBUFFER, - FXMESA_ALPHA_SIZE, 8, - FXMESA_DEPTH_SIZE, 24, - FXMESA_STENCIL_SIZE, 8, - FXMESA_ACCUM_SIZE, 0, - FXMESA_NONE} - }, -#endif /* 32bit ARGB8888 single buffer with depth */ { {sizeof(PIXELFORMATDESCRIPTOR), 1, |