fixed compilation errors

This commit is contained in:
Daniel Borca
2004-10-20 11:59:28 +00:00
parent 05517d02be
commit a7855e835d
2 changed files with 10 additions and 5 deletions
+2
View File
@@ -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 */
+8 -5
View File
@@ -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 */