minor clean-ups, renaming

This commit is contained in:
Brian Paul 2000-04-05 14:40:04 +00:00
parent 2f8b4c9d2f
commit 9c4f016d21
3 changed files with 10 additions and 13 deletions

View file

@ -1,4 +1,4 @@
/* $Id: accum.c,v 1.19 2000/04/04 00:54:23 brianp Exp $ */
/* $Id: accum.c,v 1.20 2000/04/05 14:40:04 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -375,7 +375,7 @@ _mesa_Accum( GLenum op, GLfloat value )
rgba[i][ACOMP] = multTable[acc[i4+3]];
}
if (ctx->Color.SWmasking) {
gl_mask_rgba_span( ctx, width, xpos, ypos, rgba );
_mesa_mask_rgba_span( ctx, width, xpos, ypos, rgba );
}
(*ctx->Driver.WriteRGBASpan)( ctx, width, xpos, ypos,
(const GLubyte (*)[4])rgba, NULL );
@ -402,7 +402,7 @@ _mesa_Accum( GLenum op, GLfloat value )
rgba[i][ACOMP] = CLAMP( a, 0, iChanMax );
}
if (ctx->Color.SWmasking) {
gl_mask_rgba_span( ctx, width, xpos, ypos, rgba );
_mesa_mask_rgba_span( ctx, width, xpos, ypos, rgba );
}
(*ctx->Driver.WriteRGBASpan)( ctx, width, xpos, ypos,
(const GLubyte (*)[4])rgba, NULL );

View file

@ -1,4 +1,4 @@
/* $Id: buffers.c,v 1.3 2000/02/02 22:16:04 brianp Exp $ */
/* $Id: buffers.c,v 1.4 2000/04/05 14:40:04 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -110,7 +110,7 @@ clear_color_buffer_with_masking( GLcontext *ctx )
rgba[j][BCOMP] = b;
rgba[j][ACOMP] = a;
}
gl_mask_rgba_span( ctx, width, x, y + i, rgba );
_mesa_mask_rgba_span( ctx, width, x, y + i, rgba );
(*ctx->Driver.WriteRGBASpan)( ctx, width, x, y + i,
(CONST GLubyte (*)[4])rgba, NULL );
}
@ -125,7 +125,7 @@ clear_color_buffer_with_masking( GLcontext *ctx )
for (j=0;j<width;j++) {
span[j] = ctx->Color.ClearIndex;
}
gl_mask_index_span( ctx, width, x, y + i, span );
_mesa_mask_index_span( ctx, width, x, y + i, span );
(*ctx->Driver.WriteCI32Span)( ctx, width, x, y + i, span, mask );
}
}

View file

@ -1,10 +1,10 @@
/* $Id: dlist.h,v 1.2 1999/11/11 01:22:26 brianp Exp $ */
/* $Id: dlist.h,v 1.3 2000/04/05 14:40:04 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.1
* Version: 3.3
*
* Copyright (C) 1999 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2000 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"),
@ -25,15 +25,13 @@
*/
#ifndef DLIST_H
#define DLIST_H
#include "types.h"
struct display_list {
union node *nodes;
GLuint OrFlag;
@ -69,7 +67,6 @@ extern void _mesa_NewList( GLuint list, GLenum mode );
extern void _mesa_init_dlist_table( struct _glapi_table *table );
extern void gl_compile_cassette( GLcontext *ctx );
extern void gl_save_error( GLcontext *ctx, GLenum error, const char *s );