Attachment 3863 Details for Bug 5115 – Proposed fix

[patch] Proposed fix

mesa-ati-nofbtex.diff (text/plain), 3.23 KB, created by Michel Dänzer on 2005-11-22 01:04:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2005-11-22 01:04:11 UTC

Size: 3.23 KB

patch

obsolete

>Index: src/mesa/drivers/dri/r128/r128_screen.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r128/r128_screen.c,v
>retrieving revision 1.25
>diff -p -u -r1.25 r128_screen.c
>--- src/mesa/drivers/dri/r128/r128_screen.c	27 Oct 2005 20:26:24 -0000	1.25
>+++ src/mesa/drivers/dri/r128/r128_screen.c	21 Nov 2005 13:56:59 -0000
>@@ -198,11 +196,19 @@ r128CreateScreen( __DRIscreenPrivate *sP
>    r128Screen->depthPitch	= r128DRIPriv->depthPitch;
>    r128Screen->spanOffset	= r128DRIPriv->spanOffset;
> 
>-   r128Screen->texOffset[R128_LOCAL_TEX_HEAP] = r128DRIPriv->textureOffset;
>-   r128Screen->texSize[R128_LOCAL_TEX_HEAP] = r128DRIPriv->textureSize;
>-   r128Screen->logTexGranularity[R128_LOCAL_TEX_HEAP] = r128DRIPriv->log2TexGran;
>+   if ( r128DRIPriv->textureSize == 0 ) {
>+      r128Screen->texOffset[R128_LOCAL_TEX_HEAP] =
>+	 r128DRIPriv->agpTexOffset + R128_AGP_TEX_OFFSET;
>+      r128Screen->texSize[R128_LOCAL_TEX_HEAP] = r128DRIPriv->agpTexMapSize;
>+      r128Screen->logTexGranularity[R128_LOCAL_TEX_HEAP] =
>+	 r128DRIPriv->log2AGPTexGran;
>+   } else {
>+      r128Screen->texOffset[R128_LOCAL_TEX_HEAP] = r128DRIPriv->textureOffset;
>+      r128Screen->texSize[R128_LOCAL_TEX_HEAP] = r128DRIPriv->textureSize;
>+      r128Screen->logTexGranularity[R128_LOCAL_TEX_HEAP] = r128DRIPriv->log2TexGran;
>+   }
> 
>-   if ( r128Screen->IsPCI ) {
>+   if ( !r128Screen->agpTextures.map || r128DRIPriv->textureSize == 0 ) {
>       r128Screen->numTexHeaps = R128_NR_TEX_HEAPS - 1;
>       r128Screen->texOffset[R128_AGP_TEX_HEAP] = 0;
>       r128Screen->texSize[R128_AGP_TEX_HEAP] = 0;
>Index: src/mesa/drivers/dri/radeon/radeon_screen.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/radeon/radeon_screen.c,v
>retrieving revision 1.45
>diff -p -u -r1.45 radeon_screen.c
>--- src/mesa/drivers/dri/radeon/radeon_screen.c	2 Nov 2005 01:15:07 -0000	1.45
>+++ src/mesa/drivers/dri/radeon/radeon_screen.c	21 Nov 2005 13:56:59 -0000
>@@ -617,13 +632,20 @@ radeonCreateScreen( __DRIscreenPrivate *
>    screen->depthHasSurface = ((sPriv->ddxMajor > 4) &&
>       (screen->chip_flags & RADEON_CHIPSET_TCL));
> 
>-   screen->texOffset[RADEON_LOCAL_TEX_HEAP] = dri_priv->textureOffset
>-				       + screen->fbLocation;
>-   screen->texSize[RADEON_LOCAL_TEX_HEAP] = dri_priv->textureSize;
>-   screen->logTexGranularity[RADEON_LOCAL_TEX_HEAP] =
>-      dri_priv->log2TexGran;
>+   if ( dri_priv->textureSize == 0 ) {
>+      screen->texOffset[RADEON_LOCAL_TEX_HEAP] = screen->gart_texture_offset;
>+      screen->texSize[RADEON_LOCAL_TEX_HEAP] = dri_priv->gartTexMapSize;
>+      screen->logTexGranularity[RADEON_LOCAL_TEX_HEAP] =
>+	 dri_priv->log2GARTTexGran;
>+   } else {
>+      screen->texOffset[RADEON_LOCAL_TEX_HEAP] = dri_priv->textureOffset
>+				               + screen->fbLocation;
>+      screen->texSize[RADEON_LOCAL_TEX_HEAP] = dri_priv->textureSize;
>+      screen->logTexGranularity[RADEON_LOCAL_TEX_HEAP] =
>+	 dri_priv->log2TexGran;
>+   }
> 
>-   if ( !screen->gartTextures.map
>+   if ( !screen->gartTextures.map || dri_priv->textureSize == 0
> 	|| getenv( "RADEON_GARTTEXTURING_FORCE_DISABLE" ) ) {
>       screen->numTexHeaps = RADEON_NR_TEX_HEAPS - 1;
>       screen->texOffset[RADEON_GART_TEX_HEAP] = 0;

Actions: View | Splinter Review

Attachments on bug 5115: 3863

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.