AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove last remnants of NEWTEXSTORE stuff

Browse Source
This commit is contained in:
Brian Paul
2004-05-12 15:02:49 +00:00
parent 5726a238d4
commit 71e373f186
3 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/tdfx/tdfx_tex.c
-22
View File
@@ -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 */
src/mesa/main/texformat.h
-2
View File
@@ -34,8 +34,6 @@
#ifndef TEXFORMAT_H
#define TEXFORMAT_H
#define NEWTEXSTORE 1
#include "mtypes.h"
src/mesa/main/texstore.h
-19
View File
@@ -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,