diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-01-28 00:10:31 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-01-28 00:10:31 +0000 |
| commit | 8829f949f85aa14e5977a3d7aa40f5f6dcb31a13 (patch) | |
| tree | 7d0bd671708be65bb8218921ad43d24541042a51 | |
| parent | 015c4787d7c231d2b2ee8d4bf739b98984af9ded (diff) | |
some casts (Evgeny Kotsuba)
| -rw-r--r-- | src/mesa/main/texstore.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index de0adcc8db..637cb93ddb 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -1,10 +1,10 @@ -/* $Id: texstore.c,v 1.47.2.2 2002/12/03 00:06:09 brianp Exp $ */ +/* $Id: texstore.c,v 1.47.2.3 2003/01/28 00:10:31 brianp Exp $ */ /* * Mesa 3-D graphics library * Version: 5.0.1 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -980,7 +980,7 @@ _mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level, GLubyte *dest = _mesa_compressed_image_address(xoffset, 0, 0, texImage->IntFormat, texImage->Width, - texImage->Data); + (GLubyte*) texImage->Data); transfer_compressed_teximage(ctx, 1, /* dimensions */ width, 1, 1, /* size to replace */ format, type, /* source format/type */ @@ -1029,7 +1029,7 @@ _mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level, GLubyte *dest = _mesa_compressed_image_address(xoffset, yoffset, 0, texImage->IntFormat, texImage->Width, - texImage->Data); + (GLubyte*) texImage->Data); transfer_compressed_teximage(ctx, 2, /* dimensions */ width, height, 1, /* size to replace */ format, type, /* source format/type */ @@ -1077,7 +1077,7 @@ _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level, GLubyte *dest = _mesa_compressed_image_address(xoffset, yoffset, zoffset, texImage->IntFormat, texImage->Width, - texImage->Data); + (GLubyte*) texImage->Data); transfer_compressed_teximage(ctx, 3, /* dimensions */ width, height, depth,/* size to replace */ format, type, /* source format/type */ @@ -1231,7 +1231,8 @@ _mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target, texImage->Width); dest = _mesa_compressed_image_address(xoffset, yoffset, 0, texImage->IntFormat, - texImage->Width, texImage->Data); + texImage->Width, + (GLubyte*) texImage->Data); bytesPerRow = srcRowStride; rows = height / 4; @@ -1933,12 +1934,12 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target, size = _mesa_bytes_per_pixel(srcImage->Format, CHAN_TYPE) * srcImage->Width * srcImage->Height * srcImage->Depth + 20; /* 20 extra bytes, just be safe when calling last FetchTexel */ - srcData = MALLOC(size); + srcData = (GLubyte *) MALLOC(size); if (!srcData) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps"); return; } - dstData = MALLOC(size / 2); /* 1/4 would probably be OK */ + dstData = (GLubyte *) MALLOC(size / 2); /* 1/4 would probably be OK */ if (!dstData) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps"); FREE((void *) srcData); @@ -2105,7 +2106,7 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target, dstData, /* source buffer */ dstWidth, /* source row stride */ dstImage->TexFormat, /* dest format */ - dstImage->Data, /* dest buffer */ + (GLubyte*) dstImage->Data, /* dest buffer */ dstRowStride ); /* dest row stride */ /* swap src and dest pointers */ |