Attachment 30501 Details for Bug 24584 – Patch for handling huge textures together with that 11-th bit

[patch] Patch for handling huge textures together with that 11-th bit

huge-texture-handling.diff (text/plain), 2.39 KB, created by Mathias Fröhlich on 2009-10-17 08:08:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathias Fröhlich

Created: 2009-10-17 08:08:33 UTC

Size: 2.39 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
>index f030451..65cabcc 100644
>--- a/src/mesa/drivers/dri/r300/r300_texstate.c
>+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
>@@ -225,10 +225,10 @@ static void setup_hardware_state(r300ContextPtr rmesa, radeonTexObj *t)
> 	if (t->image_override && t->bo)
> 		return;
> 
>-	t->pp_txsize = (((firstImage->Width - 1) << R300_TX_WIDTHMASK_SHIFT)
>-			| ((firstImage->Height - 1) << R300_TX_HEIGHTMASK_SHIFT)
>-			| ((firstImage->DepthLog2) << R300_TX_DEPTHMASK_SHIFT)
>-			| ((t->mt->lastLevel - t->mt->firstLevel) << R300_TX_MAX_MIP_LEVEL_SHIFT));
>+	t->pp_txsize = (((R300_TX_WIDTHMASK_MASK & ((firstImage->Width - 1) << R300_TX_WIDTHMASK_SHIFT)))
>+			| ((R300_TX_HEIGHTMASK_MASK & ((firstImage->Height - 1) << R300_TX_HEIGHTMASK_SHIFT)))
>+			| ((R300_TX_DEPTHMASK_MASK & ((firstImage->DepthLog2) << R300_TX_DEPTHMASK_SHIFT)))
>+			| ((R300_TX_MAX_MIP_LEVEL_MASK & ((t->mt->lastLevel - t->mt->firstLevel) << R300_TX_MAX_MIP_LEVEL_SHIFT))));
> 
> 	t->tile_bits = 0;
> 
>@@ -248,8 +248,12 @@ static void setup_hardware_state(r300ContextPtr rmesa, radeonTexObj *t)
> 	if (rmesa->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) {
> 	    if (firstImage->Width > 2048)
> 		t->pp_txpitch |= R500_TXWIDTH_BIT11;
>+            else
>+		t->pp_txpitch &= ~R500_TXWIDTH_BIT11;
> 	    if (firstImage->Height > 2048)
> 		t->pp_txpitch |= R500_TXHEIGHT_BIT11;
>+            else
>+		t->pp_txpitch &= ~R500_TXHEIGHT_BIT11;
> 	}
> }
> 
>@@ -479,16 +483,20 @@ void r300SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_fo
> 		break;
> 	}
> 	pitch_val--;
>-	t->pp_txsize = ((rb->base.Width - 1) << R300_TX_WIDTHMASK_SHIFT) |
>-              ((rb->base.Height - 1) << R300_TX_HEIGHTMASK_SHIFT);
>+	t->pp_txsize = (((R300_TX_WIDTHMASK_MASK & ((rb->base.Width - 1) << R300_TX_WIDTHMASK_SHIFT)))
>+			| ((R300_TX_HEIGHTMASK_MASK & ((rb->base.Height - 1) << R300_TX_HEIGHTMASK_SHIFT))));
> 	t->pp_txsize |= R300_TX_SIZE_TXPITCH_EN;
> 	t->pp_txpitch |= pitch_val;
> 
> 	if (rmesa->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) {
> 	    if (rb->base.Width > 2048)
> 		t->pp_txpitch |= R500_TXWIDTH_BIT11;
>+            else
>+		t->pp_txpitch &= ~R500_TXWIDTH_BIT11;
> 	    if (rb->base.Height > 2048)
> 		t->pp_txpitch |= R500_TXHEIGHT_BIT11;
>+            else
>+		t->pp_txpitch &= ~R500_TXHEIGHT_BIT11;
> 	}
> 	t->validated = GL_TRUE;
> 	_mesa_unlock_texture(radeon->glCtx, texObj);

Actions: View | Splinter Review

Attachments on bug 24584: 30501

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.