Minor fixes for Win32 (Karl Schultz).
This commit is contained in:
Brian Paul
parent
0a31a67269
commit
b570a180da
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: colortab.c,v 1.39 2001/04/10 15:25:45 brianp Exp $ */
|
||||
/* $Id: colortab.c,v 1.40 2001/04/20 19:21:41 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
|
@ -812,7 +812,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
|
|||
return;
|
||||
}
|
||||
|
||||
_mesa_pack_rgba_span(ctx, table->Size, (const GLchan (*)[]) rgba,
|
||||
_mesa_pack_rgba_span(ctx, table->Size, (const GLchan (*)[4]) rgba,
|
||||
format, type, data, &ctx->Pack, GL_FALSE);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: texstate.c,v 1.45 2001/04/19 22:39:50 brianp Exp $ */
|
||||
/* $Id: texstate.c,v 1.46 2001/04/20 19:21:41 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
|
@ -1058,7 +1058,7 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
|
|||
|
||||
|
||||
void
|
||||
_mesa_TexParameteri( GLenum target, GLenum pname, const GLint param )
|
||||
_mesa_TexParameteri( GLenum target, GLenum pname, GLint param )
|
||||
{
|
||||
GLfloat fparam[4];
|
||||
fparam[0] = (GLfloat) param;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: texutil.c,v 1.22 2001/03/30 14:44:43 gareth Exp $ */
|
||||
/* $Id: texutil.c,v 1.23 2001/04/20 19:21:41 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
#include "texutil.h"
|
||||
#endif
|
||||
|
||||
#define DBG 0
|
||||
#define DEBUG_TEXUTIL 0
|
||||
|
||||
|
||||
struct gl_texture_convert {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: texutil_tmp.h,v 1.7 2001/03/30 14:44:43 gareth Exp $ */
|
||||
/* $Id: texutil_tmp.h,v 1.8 2001/04/20 19:21:41 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
|
@ -28,12 +28,9 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* NOTE: All 3D code is untested and most definitely broken...
|
||||
* NOTE: All 3D teximage code is untested and most definitely broken...
|
||||
*/
|
||||
|
||||
#ifdef VMS
|
||||
#define __FUNCTION__
|
||||
#endif
|
||||
|
||||
#define DST_TEXEL_BYTES (4 / DST_TEXELS_PER_DWORD)
|
||||
#define DST_ROW_WIDTH (convert->width * DST_TEXEL_BYTES)
|
||||
|
|
@ -55,8 +52,9 @@ TAG(texsubimage2d)( struct gl_texture_convert *convert )
|
|||
GLint dwords, i;
|
||||
(void) dwords; (void) i;
|
||||
|
||||
if ( DBG )
|
||||
fprintf( stderr, __FUNCTION__ "\n" );
|
||||
#if DEBUG_TEXUTIL
|
||||
fprintf( stderr, __FUNCTION__ "\n" );
|
||||
#endif
|
||||
|
||||
#ifdef CONVERT_DIRECT
|
||||
MEMCPY( dst, src, convert->height * DST_ROW_WIDTH );
|
||||
|
|
@ -86,8 +84,9 @@ TAG(texsubimage3d)( struct gl_texture_convert *convert )
|
|||
GLint dwords, i;
|
||||
(void) dwords; (void) i;
|
||||
|
||||
if ( DBG )
|
||||
fprintf( stderr, __FUNCTION__ "\n" );
|
||||
#if DEBUG_TEXUTIL
|
||||
fprintf( stderr, __FUNCTION__ "\n" );
|
||||
#endif
|
||||
|
||||
#ifdef CONVERT_DIRECT
|
||||
MEMCPY( dst, src, convert->depth * convert->height * DST_ROW_WIDTH );
|
||||
|
|
@ -121,13 +120,13 @@ TAG(texsubimage2d_stride)( struct gl_texture_convert *convert )
|
|||
|
||||
adjust = convert->dstImageWidth - convert->width;
|
||||
|
||||
if ( DBG ) {
|
||||
fprintf( stderr, __FUNCTION__ ":\n" );
|
||||
fprintf( stderr, " x=%d y=%d w=%d h=%d s=%d\n",
|
||||
convert->xoffset, convert->yoffset, convert->width,
|
||||
convert->height, convert->dstImageWidth );
|
||||
fprintf( stderr, " adjust=%d\n", adjust );
|
||||
}
|
||||
#if DEBUG_TEXUTIL
|
||||
fprintf( stderr, __FUNCTION__ ":\n" );
|
||||
fprintf( stderr, " x=%d y=%d w=%d h=%d s=%d\n",
|
||||
convert->xoffset, convert->yoffset, convert->width,
|
||||
convert->height, convert->dstImageWidth );
|
||||
fprintf( stderr, " adjust=%d\n", adjust );
|
||||
#endif
|
||||
|
||||
for ( row = 0 ; row < convert->height ; row++ ) {
|
||||
for ( col = 0 ; col < convert->width ; col++ ) {
|
||||
|
|
@ -155,13 +154,13 @@ TAG(texsubimage3d_stride)( struct gl_texture_convert *convert )
|
|||
|
||||
adjust = convert->dstImageWidth - convert->width;
|
||||
|
||||
if ( DBG ) {
|
||||
fprintf( stderr, __FUNCTION__ ":\n" );
|
||||
fprintf( stderr, " x=%d y=%d w=%d h=%d s=%d\n",
|
||||
convert->xoffset, convert->yoffset, convert->width,
|
||||
convert->height, convert->dstImageWidth );
|
||||
fprintf( stderr, " adjust=%d\n", adjust );
|
||||
}
|
||||
#if DEBUG_TEXUTIL
|
||||
fprintf( stderr, __FUNCTION__ ":\n" );
|
||||
fprintf( stderr, " x=%d y=%d w=%d h=%d s=%d\n",
|
||||
convert->xoffset, convert->yoffset, convert->width,
|
||||
convert->height, convert->dstImageWidth );
|
||||
fprintf( stderr, " adjust=%d\n", adjust );
|
||||
#endif
|
||||
|
||||
for ( img = 0 ; img < convert->depth ; img++ ) {
|
||||
for ( row = 0 ; row < convert->height ; row++ ) {
|
||||
|
|
@ -199,8 +198,9 @@ TAG(texsubimage2d_pack)( struct gl_texture_convert *convert )
|
|||
GLint row, col;
|
||||
(void) col;
|
||||
|
||||
if ( DBG )
|
||||
fprintf( stderr, __FUNCTION__ "\n" );
|
||||
#if DEBUG_TEXUTIL
|
||||
fprintf( stderr, __FUNCTION__ "\n" );
|
||||
#endif
|
||||
|
||||
width = ((convert->width + DST_TEXELS_PER_DWORD - 1)
|
||||
& ~(DST_TEXELS_PER_DWORD - 1));
|
||||
|
|
@ -243,8 +243,9 @@ TAG(texsubimage3d_pack)( struct gl_texture_convert *convert )
|
|||
GLint row, col, img;
|
||||
(void) col;
|
||||
|
||||
if ( DBG )
|
||||
fprintf( stderr, __FUNCTION__ "\n" );
|
||||
#if DEBUG_TEXUTIL
|
||||
fprintf( stderr, __FUNCTION__ "\n" );
|
||||
#endif
|
||||
|
||||
width = ((convert->width + DST_TEXELS_PER_DWORD - 1)
|
||||
& ~(DST_TEXELS_PER_DWORD - 1));
|
||||
|
|
@ -293,13 +294,13 @@ TAG(texsubimage2d_stride_pack)( struct gl_texture_convert *convert )
|
|||
|
||||
adjust = convert->dstImageWidth - convert->width;
|
||||
|
||||
if ( DBG ) {
|
||||
fprintf( stderr, __FUNCTION__ ":\n" );
|
||||
fprintf( stderr, " x=%d y=%d w=%d h=%d s=%d\n",
|
||||
convert->xoffset, convert->yoffset, convert->width,
|
||||
convert->height, convert->dstImageWidth );
|
||||
fprintf( stderr, " adjust=%d\n", adjust );
|
||||
}
|
||||
#if DEBUG_TEXUTIL
|
||||
fprintf( stderr, __FUNCTION__ ":\n" );
|
||||
fprintf( stderr, " x=%d y=%d w=%d h=%d s=%d\n",
|
||||
convert->xoffset, convert->yoffset, convert->width,
|
||||
convert->height, convert->dstImageWidth );
|
||||
fprintf( stderr, " adjust=%d\n", adjust );
|
||||
#endif
|
||||
|
||||
for ( row = 0 ; row < convert->height ; row++ ) {
|
||||
#ifdef CONVERT_DIRECT
|
||||
|
|
@ -342,13 +343,13 @@ TAG(texsubimage3d_stride_pack)( struct gl_texture_convert *convert )
|
|||
|
||||
adjust = convert->dstImageWidth - convert->width;
|
||||
|
||||
if ( DBG ) {
|
||||
fprintf( stderr, __FUNCTION__ ":\n" );
|
||||
fprintf( stderr, " x=%d y=%d w=%d h=%d s=%d\n",
|
||||
convert->xoffset, convert->yoffset, convert->width,
|
||||
convert->height, convert->dstImageWidth );
|
||||
fprintf( stderr, " adjust=%d\n", adjust );
|
||||
}
|
||||
#if DEBUG_TEXUTIL
|
||||
fprintf( stderr, __FUNCTION__ ":\n" );
|
||||
fprintf( stderr, " x=%d y=%d w=%d h=%d s=%d\n",
|
||||
convert->xoffset, convert->yoffset, convert->width,
|
||||
convert->height, convert->dstImageWidth );
|
||||
fprintf( stderr, " adjust=%d\n", adjust );
|
||||
#endif
|
||||
|
||||
for ( img = 0 ; img < convert->depth ; img++ ) {
|
||||
for ( row = 0 ; row < convert->height ; row++ ) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: s_accum.c,v 1.10 2001/04/10 15:25:45 brianp Exp $ */
|
||||
/* $Id: s_accum.c,v 1.11 2001/04/20 19:21:41 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
|
@ -25,6 +25,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "glheader.h"
|
||||
#include "context.h"
|
||||
#include "macros.h"
|
||||
#include "mmath.h"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: s_drawpix.c,v 1.16 2001/04/10 15:25:45 brianp Exp $ */
|
||||
/* $Id: s_drawpix.c,v 1.17 2001/04/20 19:21:41 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
|
@ -833,11 +833,11 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
|
|||
|
||||
if (quickDraw) {
|
||||
(*swrast->Driver.WriteRGBASpan)( ctx, width, x, y,
|
||||
(CONST GLchan (*)[]) rgba, NULL);
|
||||
(CONST GLchan (*)[4]) rgba, NULL);
|
||||
}
|
||||
else if (zoom) {
|
||||
_mesa_write_zoomed_rgba_span( ctx, width, x, y, zspan, 0,
|
||||
(CONST GLchan (*)[]) rgba, desty );
|
||||
(CONST GLchan (*)[4]) rgba, desty );
|
||||
}
|
||||
else {
|
||||
_mesa_write_rgba_span( ctx, (GLuint) width, x, y, zspan, 0,
|
||||
|
|
|
|||
Loading…
Reference in New Issue