From: Daniel Borca <dborca@users.sourceforge.net>
Date: Wed, 20 Oct 2004 11:59:28 +0000 (+0000)
Subject: fixed compilation errors
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7855e835dc5e806a232a50ee7f2bea0ceb7dc9b;p=mesa.git

fixed compilation errors
---

diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index 2ac3ec005dd..8665db7a93d 100644
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -1267,6 +1267,7 @@ adjust2DRatio (GLcontext *ctx,
             + xoffset * mml->wScale) * texelBytes;
 
       _mesa_rescale_teximage2d(texelBytes,
+                               width,
                                dstRowStride, /* dst stride */
                                width, height,
                                newWidth, newHeight,
@@ -1290,6 +1291,7 @@ adjust2DRatio (GLcontext *ctx,
                               width, height, 1,
                               format, type, pixels, packing);
       _mesa_rescale_teximage2d(rawBytes,
+                               width,
                                newWidth * rawBytes, /* dst stride */
                                width, height, /* src */
                                newWidth, newHeight, /* dst */
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index 71b66fcc1d7..2496d1d8bf6 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -69,11 +69,13 @@ fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj)
 
 #if FX_RESCALE_BIG_TEXURES_HACK
 {
-   extern void _mesa_rescale_teximage2d( GLuint bytesPerPixel,
-                                         GLuint dstRowStride,
-                                         GLint srcWidth, GLint srcHeight,
-                                         GLint dstWidth, GLint dstHeight,
-                                         const GLvoid *srcImage, GLvoid *dstImage );
+extern void
+_mesa_rescale_teximage2d (GLuint bytesPerPixel,
+			  GLuint srcStrideInPixels,
+			  GLuint dstRowStride,
+			  GLint srcWidth, GLint srcHeight,
+			  GLint dstWidth, GLint dstHeight,
+			  const GLvoid *srcImage, GLvoid *dstImage);
    fxMesaContext fxMesa = FX_CONTEXT(ctx);
    /* [dBorca]
     * Fake textures larger than HW supports:
@@ -111,6 +113,7 @@ fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj)
          _h *= mml->hScale;
          texImage->Data = MESA_PBUFFER_ALLOC(_w * _h * texelBytes);
          _mesa_rescale_teximage2d(texelBytes,
+                                  mml->width,
                                   _w * texelBytes, /* dst stride */
                                   mml->width, mml->height, /* src */
                                   _w, _h, /* dst */