Module: Mesa Branch: master Commit: 976d4f58faecf9356de1ea0dfbc6b76409450239 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=976d4f58faecf9356de1ea0dfbc6b76409450239
Author: Eric Anholt <[email protected]> Date: Fri Oct 14 13:25:06 2011 -0700 radeon: Drop the DRI1 zero-copy TFP code. --- src/mesa/drivers/dri/r200/r200_tex.h | 3 -- src/mesa/drivers/dri/r200/r200_texstate.c | 37 ------------------------- src/mesa/drivers/dri/radeon/radeon_screen.c | 11 ------- src/mesa/drivers/dri/radeon/radeon_tex.h | 4 --- src/mesa/drivers/dri/radeon/radeon_texstate.c | 37 ------------------------- 5 files changed, 0 insertions(+), 92 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_tex.h b/src/mesa/drivers/dri/r200/r200_tex.h index 8bebf8a..756a128 100644 --- 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 0261840..0964c95 100644 --- 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 8a995a6..fed5603 100644 --- 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 05729f1..2f0fbe1 100644 --- 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 b677678..4a4ea02 100644 --- 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) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
