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

Fix multitexturing.

Browse source 
The multiarb test works now when disabling texunit0/1.
This commit is contained in:
Alan Hourihane 2005-01-12 12:45:42 +00:00
parent a9531eb2c5
commit 26dcb88fb9
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/mesa/drivers/dri/unichrome/via_state.c
View file

@ -194,7 +194,7 @@ void viaEmitState(viaContextPtr vmesa)
OUT_RING( HC_HEADER2 );
OUT_RING( (HC_ParaType_Tex << 16) | (HC_SubType_TexGeneral << 24) );
if (ctx->Texture._EnabledUnits > 1) {
if (texUnit0->Enabled && texUnit1->Enabled) {
if (VIA_DEBUG) fprintf(stderr, "multi texture\n");
nDummyValue = (HC_SubA_HTXSMD << 24) | (1 << 3);
@ -355,6 +355,7 @@ void viaEmitState(viaContextPtr vmesa)
struct gl_texture_object *texObj = texUnit1->_Current;
viaTextureObjectPtr t = (viaTextureObjectPtr)texObj->DriverData;
GLuint numLevels = t->lastLevel - t->firstLevel + 1;
int texunit = (texUnit0->Enabled ? 1 : 0);
if (VIA_DEBUG) {
fprintf(stderr, "texture1 enabled\n");
fprintf(stderr, "texture level %d\n", t->actualLevel);
@ -362,7 +363,7 @@ void viaEmitState(viaContextPtr vmesa)
if (numLevels == 8) {
BEGIN_RING(27);
OUT_RING( HC_HEADER2 );
OUT_RING( (HC_ParaType_Tex << 16) | (1 << 24) );
OUT_RING( (HC_ParaType_Tex << 16) | (texunit << 24) );
OUT_RING( t->regTexFM );
OUT_RING( (HC_SubA_HTXnL0OS << 24) |
((t->lastLevel) << HC_HTXnLVmax_SHIFT) | t->firstLevel );
@ -394,7 +395,7 @@ void viaEmitState(viaContextPtr vmesa)
else if (numLevels > 1) {
BEGIN_RING(12 + numLevels * 2);
OUT_RING( HC_HEADER2 );
OUT_RING( (HC_ParaType_Tex << 16) | (1 << 24) );
OUT_RING( (HC_ParaType_Tex << 16) | (texunit << 24) );
OUT_RING( t->regTexFM );
OUT_RING( (HC_SubA_HTXnL0OS << 24) |
((t->lastLevel) << HC_HTXnLVmax_SHIFT) | t->firstLevel );
@ -428,7 +429,7 @@ void viaEmitState(viaContextPtr vmesa)
else {
BEGIN_RING(9);
OUT_RING( HC_HEADER2 );
OUT_RING( (HC_ParaType_Tex << 16) | (1 << 24) );
OUT_RING( (HC_ParaType_Tex << 16) | (texunit << 24) );
OUT_RING( t->regTexFM );
OUT_RING( (HC_SubA_HTXnL0OS << 24) |
((t->lastLevel) << HC_HTXnLVmax_SHIFT) | t->firstLevel );
@ -458,7 +459,7 @@ void viaEmitState(viaContextPtr vmesa)
BEGIN_RING(2 + table->Size);
OUT_RING( HC_HEADER2 );
OUT_RING( (HC_ParaType_Palette << 16) | (1 << 24) );
OUT_RING( (HC_ParaType_Palette << 16) | (texunit << 24) );
for (j = 0; j < table->Size; j++) {
OUT_RING( tableF[j] );
}
@ -967,6 +968,8 @@ static void viaChooseTextureState(GLcontext *ctx)
return;
}
vmesa->regEnable |= HC_HenTXMP_MASK | HC_HenTXCH_MASK | HC_HenTXPP_MASK;
switch (texObj->MinFilter) {
case GL_NEAREST:
vmesa->regHTXnTB_1 = HC_HTXnFLSs_Nearest |
@ -1001,13 +1004,13 @@ static void viaChooseTextureState(GLcontext *ctx)
}
switch(texObj->MagFilter) {
case GL_NEAREST:
vmesa->regHTXnTB_1 |= HC_HTXnFLSs_Nearest |
HC_HTXnFLTs_Nearest;
break;
case GL_LINEAR:
vmesa->regHTXnTB_1 |= HC_HTXnFLSs_Linear |
HC_HTXnFLTs_Linear;
vmesa->regHTXnTB_1 |= HC_HTXnFLSe_Linear |
HC_HTXnFLTe_Linear;
break;
case GL_NEAREST:
vmesa->regHTXnTB_1 |= HC_HTXnFLSe_Nearest |
HC_HTXnFLTe_Nearest;
break;
default:
break;

11
src/mesa/drivers/dri/unichrome/via_tris.c
View file

@ -736,16 +736,19 @@ static void viaChooseVertexState( GLcontext *ctx )
EMIT_PAD( 1 );
}
/* If Texture unit 1 is enabled, we need to enable the first as well. */
if (index & (_TNL_BIT_TEX(0) | _TNL_BIT_TEX(1))) {
if (vmesa->ptexHack && (index & _TNL_BIT_TEX(0)))
if (index & _TNL_BIT_TEX(0)) {
if (vmesa->ptexHack)
EMIT_ATTR( _TNL_ATTRIB_TEX0, EMIT_3F_XYW, VIA_EMIT_PTEX0, (HC_HVPMSK_S | HC_HVPMSK_T) );
else
EMIT_ATTR( _TNL_ATTRIB_TEX0, EMIT_2F, VIA_EMIT_TEX0, (HC_HVPMSK_S | HC_HVPMSK_T) );
}
if (index & _TNL_BIT_TEX(1)) {
EMIT_ATTR( _TNL_ATTRIB_TEX1, EMIT_2F, VIA_EMIT_TEX1, 0 ); /* how does the hardware find out about this? */
if (!(index & _TNL_BIT_TEX(0))) {
EMIT_ATTR( _TNL_ATTRIB_TEX1, EMIT_2F, VIA_EMIT_TEX1, (HC_HVPMSK_S | HC_HVPMSK_T) );
} else {
EMIT_ATTR( _TNL_ATTRIB_TEX1, EMIT_2F, VIA_EMIT_TEX1, 0 );
}
}
if (setupIndex != vmesa->setupIndex) {