summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texformat.h2
-rw-r--r--src/mesa/main/texstore.h19
2 files changed, 0 insertions, 21 deletions
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index e67e13b7383..8cfd4e8265e 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 05270ca16c9..ae79afbc513 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,