Attachment 25219 Details for Bug 20539 – Increase reference count of texture objects referenced in current hardware state

[patch] Increase reference count of texture objects referenced in current hardware state

r300-texobj-reference.diff (text/plain), 2.88 KB, created by Michel Dänzer on 2009-04-28 01:52:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2009-04-28 01:52:19 UTC

Size: 2.88 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
>index 9c49586..96a3205 100644
>--- a/src/mesa/drivers/dri/r300/r300_context.h
>+++ b/src/mesa/drivers/dri/r300/r300_context.h
>@@ -215,7 +215,7 @@ struct r300_tex_obj {
> };
> 
> struct r300_texture_env_state {
>-	r300TexObjPtr texobj;
>+	struct gl_texture_object *texobj;
> 	GLenum format;
> 	GLenum envMode;
> };
>diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
>index 8095538..618a413 100644
>--- a/src/mesa/drivers/dri/r300/r300_state.c
>+++ b/src/mesa/drivers/dri/r300/r300_state.c
>@@ -1360,7 +1360,7 @@ static void r300SetupTextures(GLcontext * ctx)
> #endif
> 			tmu_mappings[i] = hw_tmu;
> 
>-			t = r300->state.texture.unit[i].texobj;
>+			t = (r300TexObjPtr) r300->state.texture.unit[i].texobj->DriverData;
> 			/* XXX questionable fix for bug 9170: */
> 			if (!t)
> 				continue;
>diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c
>index 6c1c9e8..ee68bf0 100644
>--- a/src/mesa/drivers/dri/r300/r300_texmem.c
>+++ b/src/mesa/drivers/dri/r300/r300_texmem.c
>@@ -44,6 +44,7 @@ SOFTWARE.
> #include "main/colormac.h"
> #include "main/macros.h"
> #include "main/simple_list.h"
>+#include "main/texobj.h"
> #include "r300_context.h"
> #include "r300_state.h"
> #include "r300_cmdbuf.h"
>@@ -69,8 +70,8 @@ void r300DestroyTexObj(r300ContextPtr rmesa, r300TexObjPtr t)
> 	}
> 
> 	for (i = 0; i < rmesa->radeon.glCtx->Const.MaxTextureUnits; i++) {
>-		if (rmesa->state.texture.unit[i].texobj == t) {
>-			rmesa->state.texture.unit[i].texobj = NULL;
>+		if (rmesa->state.texture.unit[i].texobj == t->base.tObj) {
>+			_mesa_reference_texobj(&rmesa->state.texture.unit[i].texobj, NULL);
> 		}
> 	}
> }
>diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c
>index cadec7f..abe613e 100644
>--- a/src/mesa/drivers/dri/r300/r300_texstate.c
>+++ b/src/mesa/drivers/dri/r300/r300_texstate.c
>@@ -567,19 +567,20 @@ static GLboolean r300UpdateTexture(GLcontext * ctx, int unit)
> 	/* Update state if this is a different texture object to last
> 	 * time.
> 	 */
>-	if (rmesa->state.texture.unit[unit].texobj != t) {
>+	if (rmesa->state.texture.unit[unit].texobj != tObj) {
> 		if (rmesa->state.texture.unit[unit].texobj != NULL) {
>+			r300TexObjPtr t_old = (r300TexObjPtr) rmesa->state.texture.unit[unit].texobj->DriverData;
>+
> 			/* The old texture is no longer bound to this texture unit.
> 			 * Mark it as such.
> 			 */
> 
>-			rmesa->state.texture.unit[unit].texobj->base.bound &=
>-			    ~(1 << unit);
>+			t_old->base.bound &= ~(1 << unit);
> 		}
> 
>-		rmesa->state.texture.unit[unit].texobj = t;
>+		_mesa_reference_texobj(&rmesa->state.texture.unit[unit].texobj, tObj);
> 		t->base.bound |= (1 << unit);
>-		driUpdateTextureLRU((driTextureObject *) t);	/* XXX: should be locked! */
>+		driUpdateTextureLRU(&t->base);	/* XXX: should be locked! */
> 	}
> 
> 	return !t->border_fallback;

Actions: View | Splinter Review

Attachments on bug 20539: 23655 | 23827 | 23828 | 23829 | 23845 | 23846 | 23847 | 23848 | 25219

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.