Module: Mesa
Branch: radeon-rewrite
Commit: f363a97d2586a8487bfa64f882fbfc204a56fd05
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f363a97d2586a8487bfa64f882fbfc204a56fd05

Author: Dave Airlie <[email protected]>
Date:   Fri Feb 13 23:29:27 2009 +1000

radeon/r200: fix set tex offset functions

---

 src/mesa/drivers/dri/r200/r200_texstate.c     |    4 +---
 src/mesa/drivers/dri/radeon/radeon_texstate.c |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c 
b/src/mesa/drivers/dri/r200/r200_texstate.c
index e47c7cc..e6aff02 100644
--- a/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -733,13 +733,11 @@ void r200SetTexOffset(__DRIcontext * pDRICtx, GLint 
texname,
        r200ContextPtr rmesa = pDRICtx->driverPrivate;
        struct gl_texture_object *tObj =
            _mesa_lookup_texture(rmesa->radeon.glCtx, texname);
-       radeonTexObjPtr t;
+       radeonTexObjPtr t = radeon_tex_obj(tObj);
 
        if (!tObj)
                return;
 
-       t = (radeonTexObjPtr) tObj->DriverData;
-
        t->image_override = GL_TRUE;
 
        if (!offset)
diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c 
b/src/mesa/drivers/dri/radeon/radeon_texstate.c
index cabac6c..2e064cf 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
@@ -605,13 +605,11 @@ void radeonSetTexOffset(__DRIcontext * pDRICtx, GLint 
texname,
        r100ContextPtr rmesa = pDRICtx->driverPrivate;
        struct gl_texture_object *tObj =
            _mesa_lookup_texture(rmesa->radeon.glCtx, texname);
-       radeonTexObjPtr t;
+       radeonTexObjPtr t = radeon_tex_obj(tObj);
 
        if (tObj == NULL)
                return;
 
-       t = (radeonTexObjPtr) tObj->DriverData;
-
        t->image_override = GL_TRUE;
 
        if (!offset)

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to