radeon: Drop the DRI1 zero-copy TFP code.

diff --git a/src/mesa/drivers/dri/r200/r200_tex.h b/src/mesa/drivers/dri/r200/r200_tex.h
index 8bebf8a037b9e9e12b0270855f97b94e332055ff..756a128a196e0da12988aa57ace4bdcf5f634a2c 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_tex.h
+++ b/src/mesa/drivers/dri/r200/r200_tex.h
@@ -38,9 +38,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 extern void r200SetTexBuffer(__DRIcontext *pDRICtx, GLint target, __DRIdrawable *dPriv);
 extern void r200SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_format,
                              __DRIdrawable *dPriv);
-extern void r200SetTexOffset(__DRIcontext *pDRICtx, GLint texname,
-                            unsigned long long offset, GLint depth,
-                            GLuint pitch);
 
 extern void r200UpdateTextureState( struct gl_context *ctx );
 

diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c
index 0261840a1d18b1a741ec91bee038af52fe43a808..0964c951065e44ceb1a99b154787b674601c0bc7 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -725,43 +725,6 @@ static GLboolean r200UpdateTextureEnv( struct gl_context *ctx, int unit, int slo
    return GL_TRUE;
 }
 
-void r200SetTexOffset(__DRIcontext * pDRICtx, GLint texname,
-                     unsigned long long offset, GLint depth, GLuint pitch)
-{
-       r200ContextPtr rmesa = pDRICtx->driverPrivate;
-       struct gl_texture_object *tObj =
-           _mesa_lookup_texture(rmesa->radeon.glCtx, texname);
-       radeonTexObjPtr t = radeon_tex_obj(tObj);
-
-       if (!tObj)
-               return;
-
-       t->image_override = GL_TRUE;
-
-       if (!offset)
-               return;
-
-       t->bo = NULL;
-       t->override_offset = offset;
-       t->pp_txpitch = pitch - 32;
-
-       switch (depth) {
-       case 32:
-               t->pp_txformat = tx_table_le[MESA_FORMAT_ARGB8888].format;
-               t->pp_txfilter |= tx_table_le[MESA_FORMAT_ARGB8888].filter;
-               break;
-       case 24:
-       default:
-               t->pp_txformat = tx_table_le[MESA_FORMAT_RGB888].format;
-               t->pp_txfilter |= tx_table_le[MESA_FORMAT_RGB888].filter;
-               break;
-       case 16:
-               t->pp_txformat = tx_table_le[MESA_FORMAT_RGB565].format;
-               t->pp_txfilter |= tx_table_le[MESA_FORMAT_RGB565].filter;
-               break;
-       }
-}
-
 void r200SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format,
                       __DRIdrawable *dPriv)
 {

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 8a995a63d77609bb34b3f59276fa30a35ceadef7..fed56031fbc4edb5460cdd2055b3b22cad61e1bf 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -177,11 +177,6 @@ radeonGetParam(__DRIscreen *sPriv, int param, void *value)
 }
 
 #if defined(RADEON_R100)
-static const __DRItexOffsetExtension radeonTexOffsetExtension = {
-    { __DRI_TEX_OFFSET, __DRI_TEX_OFFSET_VERSION },
-    radeonSetTexOffset,
-};
-
 static const __DRItexBufferExtension radeonTexBufferExtension = {
     { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
    radeonSetTexBuffer,
@@ -190,12 +185,6 @@ static const __DRItexBufferExtension radeonTexBufferExtension = {
 #endif
 
 #if defined(RADEON_R200)
-
-static const __DRItexOffsetExtension r200texOffsetExtension = {
-    { __DRI_TEX_OFFSET, __DRI_TEX_OFFSET_VERSION },
-   r200SetTexOffset,
-};
-
 static const __DRItexBufferExtension r200TexBufferExtension = {
     { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
    r200SetTexBuffer,

diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.h b/src/mesa/drivers/dri/radeon/radeon_tex.h
index 05729f1e0b6373d0090a5f602c17c439ee81c208..2f0fbe1d73ec0cb8167a516aeb89a06075d5d0ab 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_tex.h
+++ b/src/mesa/drivers/dri/radeon/radeon_tex.h
@@ -37,10 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_TEX_H__
 #define __RADEON_TEX_H__
 
-extern void radeonSetTexOffset(__DRIcontext *pDRICtx, GLint texname,
-                               unsigned long long offset, GLint depth,
-                               GLuint pitch);
-
 extern void radeonSetTexBuffer(__DRIcontext *pDRICtx, GLint target, __DRIdrawable *dPriv);
 extern void radeonSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_format,
                               __DRIdrawable *dPriv);

diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c
index b67767893d97998377338ce71fc97d842b27698b..4a4ea0232a5aa1cf2fe3210ed013c9151fd9ec02 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_texstate.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c
@@ -601,43 +601,6 @@ static GLboolean radeonUpdateTextureEnv( struct gl_context *ctx, int unit )
    return GL_TRUE;
 }
 
-void radeonSetTexOffset(__DRIcontext * pDRICtx, GLint texname,
-                        unsigned long long offset, GLint depth, GLuint pitch)
-{
-       r100ContextPtr rmesa = pDRICtx->driverPrivate;
-       struct gl_texture_object *tObj =
-           _mesa_lookup_texture(rmesa->radeon.glCtx, texname);
-       radeonTexObjPtr t = radeon_tex_obj(tObj);
-
-       if (tObj == NULL)
-               return;
-
-       t->image_override = GL_TRUE;
-
-       if (!offset)
-               return;
-       
-       t->bo = NULL;
-       t->override_offset = offset;
-       t->pp_txpitch = pitch - 32;
-
-       switch (depth) {
-       case 32:
-               t->pp_txformat = tx_table[MESA_FORMAT_ARGB8888].format;
-               t->pp_txfilter |= tx_table[MESA_FORMAT_ARGB8888].filter;
-               break;
-       case 24:
-       default:
-               t->pp_txformat = tx_table[MESA_FORMAT_RGB888].format;
-               t->pp_txfilter |= tx_table[MESA_FORMAT_RGB888].filter;
-               break;
-       case 16:
-               t->pp_txformat = tx_table[MESA_FORMAT_RGB565].format;
-               t->pp_txfilter |= tx_table[MESA_FORMAT_RGB565].filter;
-               break;
-       }
-}
-
 void radeonSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format,
                         __DRIdrawable *dPriv)
 {