diff options
| author | Ben Crossman <bencrossman@freedesktop.org> | 2005-04-14 16:58:25 +0000 |
|---|---|---|
| committer | Ben Crossman <bencrossman@freedesktop.org> | 2005-04-14 16:58:25 +0000 |
| commit | b2b01a60dbba4ebd130898509c14ca80a847a679 (patch) | |
| tree | 2e82d913496c2d9568fc15813deed2a532500158 /src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c | |
| parent | 60e2810ae45b358699e6db0ddc95e0a4c1f45338 (diff) | |
Some initial compile fixes. Still some left and warnings that need fixing. No where near runnable yet.
Diffstat (limited to 'src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c')
| -rw-r--r-- | src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c index 282d6a130e..53935b2630 100644 --- a/src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c +++ b/src/mesa/drivers/windows/gldirect/dx8/gld_texture_dx8.c @@ -1031,7 +1031,7 @@ void gld_ReadPixels_DX8( // We need to flip the data. Yuck. // Perhaps Mesa has a span packer we can use in future... for (i=0; i<height; i++) { - BYTE *pDestRow = (BYTE*)_mesa_image_address(pack, dest, width, height, format, type, 0, i, 0); + BYTE *pDestRow = (BYTE*)_mesa_image_address2d(pack, dest, width, height, format, type, 0, i, 0); BYTE *pSrcRow = (BYTE*)d3dLockedRect.pBits + (d3dLockedRect.Pitch * (height-i-1)); _mesa_transfer_teximage( ctx, @@ -1203,8 +1203,8 @@ void gld_Bitmap_DX8( for (i=0; i<height; i++) { GLubyte byte; pBits = (D3DCOLOR*)((BYTE*)d3dLockedRect.pBits + (i*d3dLockedRect.Pitch)); - src = (const GLubyte *) _mesa_image_address( - &_mesa_native_packing, pTempBitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, + src = (const GLubyte *) _mesa_image_address2d( + &ctx->DefaultPacking, pTempBitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, i, 0); for (j=0; j<(width>>3); j++) { byte = *src++; |