r600: fix Elts handling

[mesa.git] / src / mesa / drivers / d3d / D3Dvbrender.c

diff --git a/src/mesa/drivers/d3d/D3Dvbrender.c b/src/mesa/drivers/d3d/D3Dvbrender.c
index a3a18323fec6c3f50ba3f9057d10999ae9573b82..09857f1dc8de5f18a3d0eb4d0b4b101c83a7ffe4 100644 (file)
--- a/src/mesa/drivers/d3d/D3Dvbrender.c
+++ b/src/mesa/drivers/d3d/D3Dvbrender.c
@@ -1511,12 +1511,12 @@ static void SetRenderStates( GLcontext *ctx )
    /*================================================*/
    /* Check too see if there are new TEXTURE states. */
    /*================================================*/
-   if ( ctx->Texture._ReallyEnabled )
+   if ( ctx->Texture._EnabledUnits )
    {
       switch( ctx->Texture.Set[ctx->Texture.CurrentSet].EnvMode )
       {
         case GL_MODULATE:
-               if ( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Format == GL_RGBA )
+               if ( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Format == GL_RGBA )
                  dwFunc = pContext->pShared->dwTexFunc[d3dtblend_modulatealpha];
                else
                  dwFunc = pContext->pShared->dwTexFunc[d3dtblend_modulate];
@@ -1531,7 +1531,7 @@ static void SetRenderStates( GLcontext *ctx )
                break;
 
         case GL_DECAL:
-               if ( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Format == GL_RGBA )
+               if ( ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Format == GL_RGBA )
                  dwFunc = pContext->pShared->dwTexFunc[d3dtblend_decalalpha];
                else
                  dwFunc = pContext->pShared->dwTexFunc[d3dtblend_decal];
@@ -1592,12 +1592,12 @@ static void SetRenderStates( GLcontext *ctx )
           CreateTMgrHAL( pContext->pShared,
                                   texName,
                                   0,
-                                  ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Format,
+                                  ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Format,
                                   (RECT *)NULL,
-                                  ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Width,
-                                  ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Height,
+                                  ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Width,
+                                  ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Height,
                                   TM_ACTION_BIND,
-                                  (void *)ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Data );
+                                  (void *)ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Data );
           //    }
         bTexture = TRUE;
    }
@@ -1871,9 +1871,9 @@ static void DebugRenderStates( GLcontext *ctx, BOOL bForce )
    /*================================================*/
    /* Check too see if there are new TEXTURE states. */
    /*================================================*/
-   if ( texture != ctx->Texture._ReallyEnabled )
+   if ( texture != ctx->Texture._EnabledUnits )
    {
-       texture = ctx->Texture._ReallyEnabled;
+       texture = ctx->Texture._EnabledUnits;
        DPF(( 0, "\tTexture\t\t%s", (texture) ? "ENABLED" : "--------" ));
    }   
 
@@ -1884,7 +1884,7 @@ static void DebugRenderStates( GLcontext *ctx, BOOL bForce )
          textName = ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Name;
          DPF(( 0, "\tTexture Name:\t%d", textName ));
          DPF(( 0, "\tTexture Format:\t%s",
-                  (ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0]->Format == GL_RGBA) ?
+                  (ctx->Texture.Set[ctx->Texture.CurrentSet].Current->Image[0][0]->Format == GL_RGBA) ?
                   "GL_RGBA" : "GLRGB" ));
        }