diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-05-12 15:02:49 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-05-12 15:02:49 +0000 |
| commit | 71e373f18648584ade680bca7840a57e0d3cb725 (patch) | |
| tree | dee9561eb95f812a02dde130897c9039628842d7 | |
| parent | 5726a238d4d0d6dbe19ddb58cd07f7eeefb58fa2 (diff) | |
remove last remnants of NEWTEXSTORE stuff
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_tex.c | 22 | ||||
| -rw-r--r-- | src/mesa/main/texformat.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/texstore.h | 19 |
3 files changed, 0 insertions, 43 deletions
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c index 942b6f29c5..2a386a7c03 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c @@ -1050,16 +1050,6 @@ tdfxTexSubImage2D(GLcontext *ctx, GLenum target, GLint level, return; } -#if !NEWTEXSTORE - _mesa_transfer_teximage(ctx, 2, texImage->Format,/* Tex int format */ - texImage->TexFormat, /* dest format */ - (GLubyte *) tempImage, /* dest */ - width, height, 1, /* subimage size */ - 0, 0, 0, /* subimage pos */ - width * texelBytes, /* dest row stride */ - 0, /* dst image stride */ - format, type, pixels, packing); -#else texImage->TexFormat->StoreImage(ctx, 2, texImage->Format, &texImage->Format, texImage->Data, 0, 0, 0, /* dstX/Y/Zoffset */ @@ -1067,7 +1057,6 @@ tdfxTexSubImage2D(GLcontext *ctx, GLenum target, GLint level, 0, /* dstImageStride */ width, height, 1, format, type, pixels, packing); -#endif /* now rescale */ scaledImage = MALLOC(newWidth * newHeight * texelBytes); @@ -1093,16 +1082,6 @@ tdfxTexSubImage2D(GLcontext *ctx, GLenum target, GLint level, } else { /* no rescaling needed */ -#if !NEWTEXSTORE - _mesa_transfer_teximage(ctx, 2, texImage->Format, /* Tex int format */ - texImage->TexFormat, /* dest format */ - (GLubyte *) texImage->Data,/* dest */ - width, height, 1, /* subimage size */ - xoffset, yoffset, 0, /* subimage pos */ - mml->width * texelBytes, /* dest row stride */ - 0, /* dst image stride */ - format, type, pixels, packing); -#else texImage->TexFormat->StoreImage(ctx, 2, texImage->Format, &texImage->Format, texImage->Data, xoffset, yoffset, 0, @@ -1110,7 +1089,6 @@ tdfxTexSubImage2D(GLcontext *ctx, GLenum target, GLint level, 0, /* dstImageStride */ width, height, 1, format, type, pixels, packing); -#endif } ti->reloadImages = GL_TRUE; /* signal the image needs to be reloaded */ diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h index e67e13b738..8cfd4e8265 100644 --- a/src/mesa/main/texformat.h +++ b/src/mesa/main/texformat.h @@ -34,8 +34,6 @@ #ifndef TEXFORMAT_H #define TEXFORMAT_H -#define NEWTEXSTORE 1 - #include "mtypes.h" diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h index 05270ca16c..ae79afbc51 100644 --- a/src/mesa/main/texstore.h +++ b/src/mesa/main/texstore.h @@ -37,8 +37,6 @@ #include "mtypes.h" -/*** NEWTEXSTORE ***/ - /* Macro just to save some typing */ #define STORE_PARAMS \ GLcontext *ctx, GLuint dims, \ @@ -95,23 +93,6 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims, const struct gl_pixelstore_attrib *srcPacking); -#if !NEWTEXSTORE - -extern void -_mesa_transfer_teximage(GLcontext *ctx, GLuint dimensions, - GLenum baseInternalFormat, - const struct gl_texture_format *texDestFormat, - GLvoid *texDestAddr, - GLint srcWidth, GLint srcHeight, GLint srcDepth, - GLint dstXoffset, GLint dstYoffset, GLint dstZoffset, - GLint dstRowStride, GLint dstImageStride, - GLenum srcFormat, GLenum srcType, - const GLvoid *srcAddr, - const struct gl_pixelstore_attrib *srcPacking); - -#endif /* NEWTEXSTORE */ - - extern void _mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level, GLint internalFormat, |