fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 11:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

NCC fixes and some cosmetics

Browse source
This commit is contained in:
Daniel Borca 2003-11-07 13:17:21 +00:00
parent e83cf6ddf2
commit d96651bdc5
4 changed files with 5 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/glide/fx.rc
View file

@ -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"

4
src/mesa/drivers/glide/fxddtex.c
View file

@ -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

2
src/mesa/drivers/glide/fxopengl.def
View file

@ -1,3 +1,5 @@
LIBRARY OpenGL32
DESCRIPTION "Mesa 5.1"
EXPORTS
glAccum
glActiveStencilFaceEXT

47
src/mesa/drivers/glide/fxwgl.c
View file

@ -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,