fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 19:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Software fallback for glColorMask. Can be avoided on Savage4 when all

Browse source 
channels are masked (disable draw update). Bumped driver date to
reflect recent correctness fixes. The driver now passes all glean
tests except exactRGBA on both Savage4 and Savage3D-based cards.
This commit is contained in:
Felix Kuehling 2005-04-24 20:55:57 +00:00
parent 6ffd0a4cf1
commit cbc8d7596a
2 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/savage/savagedd.c
View file

@ -41,7 +41,7 @@
#include "utils.h"
#define DRIVER_DATE "20050305"
#define DRIVER_DATE "20050424"
/***************************************
* Mesa's Driver Functions

61
src/mesa/drivers/dri/savage/savagestate.c
View file

@ -845,64 +845,45 @@ static void savageUpdateCull( GLcontext *ctx )
* Color masks
*/
/* Mesa calls this from the wrong place - it is called a very large
* number of redundant times.
*
* Colormask can be simulated by multipass or multitexture techniques.
/* Savage4 can disable draw updates when all channels are
* masked. Savage3D has a bit called drawUpdateEn, but it doesn't seem
* to have any effect. If only some channels are masked we need a
* software fallback on all chips.
*/
static void savageDDColorMask_s4(GLcontext *ctx,
GLboolean r, GLboolean g,
GLboolean b, GLboolean a )
{
savageContextPtr imesa = SAVAGE_CONTEXT( ctx );
GLuint enable;
GLboolean passAny, passAll;
if (ctx->Visual.alphaBits)
{
enable = b | g | r | a;
}
else
{
enable = b | g | r;
if (ctx->Visual.alphaBits) {
passAny = b || g || r || a;
passAll = r && g && b && a;
} else {
passAny = b || g || r;
passAll = r && g && b;
}
if (enable)
{
imesa->regs.s4.drawLocalCtrl.ni.drawUpdateEn = GL_TRUE;
}
else
{
if (passAny) {
if (!imesa->regs.s4.drawLocalCtrl.ni.drawUpdateEn) {
imesa->regs.s4.drawLocalCtrl.ni.drawUpdateEn = GL_TRUE;
imesa->dirty |= SAVAGE_UPLOAD_LOCAL;
}
FALLBACK (ctx, SAVAGE_FALLBACK_COLORMASK, !passAll);
} else if (imesa->regs.s4.drawLocalCtrl.ni.drawUpdateEn) {
imesa->regs.s4.drawLocalCtrl.ni.drawUpdateEn = GL_FALSE;
imesa->dirty |= SAVAGE_UPLOAD_LOCAL;
}
imesa->dirty |= SAVAGE_UPLOAD_LOCAL;
/* TODO: need a software fallback */
}
static void savageDDColorMask_s3d(GLcontext *ctx,
GLboolean r, GLboolean g,
GLboolean b, GLboolean a )
{
savageContextPtr imesa = SAVAGE_CONTEXT( ctx );
GLuint enable;
if (ctx->Visual.alphaBits)
{
enable = b | g | r | a;
}
FALLBACK (ctx, SAVAGE_FALLBACK_COLORMASK, !(r && g && b && a));
else
{
enable = b | g | r;
}
if (enable)
{
imesa->regs.s3d.zBufCtrl.ni.drawUpdateEn = GL_TRUE;
}
else
{
imesa->regs.s3d.zBufCtrl.ni.drawUpdateEn = GL_FALSE;
}
imesa->dirty |= SAVAGE_UPLOAD_LOCAL;
/* TODO: need a software fallback */
FALLBACK (ctx, SAVAGE_FALLBACK_COLORMASK, !(r && g && b));
}
/* Seperate specular not fully implemented in hardware... Needs