diff options
| author | Daniel Borca <dborca@users.sourceforge.net> | 2004-07-05 06:47:17 +0000 |
|---|---|---|
| committer | Daniel Borca <dborca@users.sourceforge.net> | 2004-07-05 06:47:17 +0000 |
| commit | 3e94fd34449210c8b548a2a30f248fb5bd73478b (patch) | |
| tree | d067d234e6dbd75799948b915742920e14f983e3 /src/mesa/drivers/glide/fxsetup.c | |
| parent | fd003824ad18fd78cbecf32fb5e8e58cf2f9cdba (diff) | |
added GL_ARB_point_sprite.
color masking correctly implemented for 15bpp.
small fixes for textures and tri engine.
Diffstat (limited to 'src/mesa/drivers/glide/fxsetup.c')
| -rw-r--r-- | src/mesa/drivers/glide/fxsetup.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c index 0d900d29f4..d486a5eaf1 100644 --- a/src/mesa/drivers/glide/fxsetup.c +++ b/src/mesa/drivers/glide/fxsetup.c @@ -156,10 +156,7 @@ fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj) FX_smallLodLog2(ti->info) = FX_largeLodLog2(ti->info); /* this is necessary because of fxDDCompressedTexImage2D */ - if ((ti->info.format == GR_TEXFMT_ARGB_CMP_FXT1) || - (ti->info.format == GR_TEXFMT_ARGB_CMP_DXT1) || - (ti->info.format == GR_TEXFMT_ARGB_CMP_DXT3) || - (ti->info.format == GR_TEXFMT_ARGB_CMP_DXT5)) { + if (ti->padded) { struct gl_texture_image *texImage = tObj->Image[0][minl]; tfxMipMapLevel *mml = FX_MIPMAP_DATA(texImage); if (mml->wScale != 1 || mml->hScale != 1) { @@ -1784,15 +1781,15 @@ fxSetupColorMask(GLcontext * ctx) { fxMesaContext fxMesa = FX_CONTEXT(ctx); - if (fxMesa->colDepth != 16) { - /* 32bpp mode or 15bpp mode */ + if (fxMesa->colDepth == 32) { + /* 32bpp mode */ fxMesa->Glide.grColorMaskExt(ctx->Color.ColorMask[RCOMP], ctx->Color.ColorMask[GCOMP], ctx->Color.ColorMask[BCOMP], ctx->Color.ColorMask[ACOMP] && fxMesa->haveHwAlpha); } else { - /* 16 bpp mode */ + /* 15/16 bpp mode */ grColorMask(ctx->Color.ColorMask[RCOMP] | ctx->Color.ColorMask[GCOMP] | ctx->Color.ColorMask[BCOMP], |