remove accidentally commited printf for tiling support

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_subset_tex.c

diff --git a/src/mesa/drivers/dri/radeon/radeon_subset_tex.c b/src/mesa/drivers/dri/radeon/radeon_subset_tex.c
index e401779513f6e6dd95da312acff695f636d122e9..1e3c1afce2f27ba0d3ef358f5bdc42f78313dcf0 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_subset_tex.c
+++ b/src/mesa/drivers/dri/radeon/radeon_subset_tex.c
@@ -75,8 +75,7 @@ void radeonDestroyTexObj( radeonContextPtr rmesa, radeonTexObjPtr t )
    if ( rmesa ) {
       if ( t == rmesa->state.texture.unit[0].texobj ) {
          rmesa->state.texture.unit[0].texobj = NULL;
-        remove_from_list( &rmesa->hw.tex[0] );
-        make_empty_list( &rmesa->hw.tex[0] );
+        rmesa->hw.tex[0].dirty = GL_FALSE;
       }
    }
 
@@ -152,7 +151,7 @@ static void radeonUploadSubImage( radeonContextPtr rmesa,
    drmRadeonTexImage tmp;
 
    level += t->firstLevel;
-   texImage = t->tObj->Image[level];
+   texImage = t->tObj->Image[0][level];
 
    if ( !texImage || !texImage->Data ) 
       return;
@@ -200,7 +199,7 @@ static void radeonSetTexImages( radeonContextPtr rmesa,
                                struct gl_texture_object *tObj )
 {
    radeonTexObjPtr t = (radeonTexObjPtr)tObj->DriverData;
-   const struct gl_texture_image *baseImage = tObj->Image[tObj->BaseLevel];
+   const struct gl_texture_image *baseImage = tObj->Image[0][tObj->BaseLevel];
    GLint totalSize;
    GLint texelsPerDword = 0, blitWidth = 0, blitPitch = 0;
    GLint x, y, width, height;
@@ -273,11 +272,11 @@ static void radeonSetTexImages( radeonContextPtr rmesa,
 
    numLevels = lastLevel - firstLevel + 1;
 
-   log2Width = tObj->Image[firstLevel]->WidthLog2;
-   log2Height = tObj->Image[firstLevel]->HeightLog2;
+   log2Width = tObj->Image[0][firstLevel]->WidthLog2;
+   log2Height = tObj->Image[0][firstLevel]->HeightLog2;
 
    for ( i = 0 ; i < numLevels ; i++ ) {
-      const struct gl_texture_image *texImage = tObj->Image[i + firstLevel];
+      const struct gl_texture_image *texImage = tObj->Image[0][i + firstLevel];
       if ( !texImage )
         break;
 
@@ -524,7 +523,7 @@ static void radeonUpdateTextureEnv( GLcontext *ctx, int unit )
    radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
    const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
    const struct gl_texture_object *tObj = texUnit->_Current;
-   const GLenum format = tObj->Image[tObj->BaseLevel]->Format;
+   const GLenum format = tObj->Image[0][tObj->BaseLevel]->Format;
    GLuint color_combine = radeon_color_combine[unit][RADEON_DISABLE];
    GLuint alpha_combine = radeon_alpha_combine[unit][RADEON_DISABLE];