summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-04-20 22:51:55 +0000
committerBrian Paul <[email protected]>2001-04-20 22:51:55 +0000
commitcb6ae7b16b196a0995efd8aeaecc992785091fc6 (patch)
treea23dc2998d834d62cd5630e91f4ba354655896d7 /src/mesa/drivers
parentb570a180dada9e54ff55905ff11ea882ad8cb57d (diff)
compilation fixes - texturing isn't working at this time
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/glide/fxddtex.c7
-rw-r--r--src/mesa/drivers/glide/fxsetup.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index 6232144a3b7..23bc9e41f8d 100644
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -1233,6 +1233,8 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level,
/* Apply pixel transfer ops and convert image format to something
* simple (format = simpleFormat, type = CHAN_TYPE).
*/
+#if 000
+ /** XXX THIS HAS TO BE REWRITTEN! **/
_mesa_transfer_teximage(ctx, 2, /* dimensions */
simpleFormat, /* base int format */
simpleFormat, /* dest format */
@@ -1242,7 +1244,7 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level,
width * comps, /* dstRowStride */
0, /* dstImageStride */
format, type, pixels, packing /* src info */ );
-
+#endif
if (mml->width != width || mml->height != height) {
/* Upscale image to accomodate Glide's image aspect limitations. */
const struct gl_texture_format *texFormat
@@ -1350,6 +1352,8 @@ fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,
/* Apply pixel transfer ops and convert image format to something
* simple (format = simpleFormat, type = CHAN_TYPE).
*/
+#if 0
+ /* XXX this has to be rewritten! */
_mesa_transfer_teximage(ctx, 2, /* dimensions */
simpleFormat, /* base int format */
simpleFormat, /* dest format */
@@ -1359,6 +1363,7 @@ fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,
width * comps, /* dstRowStride */
0, /* dstImageStride */
format, type, pixels, packing /* src info */ );
+#endif
if (texImage->Width != mml->width || texImage->Height != mml->height) {
/* Upscale image to accomodate Glide's image aspect limitations. */
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index 9c12f3fb87e..6c5aad326fb 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -108,7 +108,7 @@ fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj)
else
FX_smallLodLog2(ti->info) = FX_largeLodLog2(ti->info);
- fxTexGetFormat(tObj->Image[minl]->TexFormat->IntFormat, &(ti->info.format),
+ fxTexGetFormat(tObj->Image[minl]->TexFormat->BaseFormat, &(ti->info.format),
&(ti->baseLevelInternalFormat));
switch (tObj->WrapS) {