fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Committing in .

Browse source 
Modified Files:
 	Mesa/macos/gli_api/gliapi1.h Mesa/macos/gli_api/gliapi2.h
 	Mesa/macos/gli_api/gliapiext.h Mesa/macos/src-gli/fxgli.c
 	Mesa/macos/src-gli/fxgli.h Mesa/macos/src-gli/fxgli2.c
 	Mesa/macos/src-gli/fxgli_tridebug.c Mesa/src/accum.c
 	Mesa/src/accum.h Mesa/src/all.h Mesa/src/alpha.c
 	Mesa/src/alpha.h Mesa/src/attrib.c Mesa/src/attrib.h
 	Mesa/src/bitmap.c Mesa/src/bitmap.h Mesa/src/blend.c
 	Mesa/src/blend.h Mesa/src/buffers.c Mesa/src/buffers.h
 	Mesa/src/clip.c Mesa/src/clip.h Mesa/src/colortab.h
 	Mesa/src/config.c Mesa/src/context.c Mesa/src/context.h
 	Mesa/src/convolve.c Mesa/src/convolve.h Mesa/src/copypix.c
 	Mesa/src/copypix.h Mesa/src/debug.c Mesa/src/depth.c
 	Mesa/src/depth.h Mesa/src/dlist.c Mesa/src/dlist.h
 	Mesa/src/drawpix.c Mesa/src/drawpix.h Mesa/src/enable.c
 	Mesa/src/enable.h Mesa/src/eval.c Mesa/src/eval.h
 	Mesa/src/extensions.c Mesa/src/extensions.h
 	Mesa/src/feedback.c Mesa/src/feedback.h Mesa/src/fog.c
 	Mesa/src/fog.h Mesa/src/get.c Mesa/src/get.h Mesa/src/glapi.c
 	Mesa/src/glthread.h Mesa/src/highpc.c Mesa/src/hint.h
 	Mesa/src/histogram.h Mesa/src/image.c Mesa/src/image.h
 	Mesa/src/imports.c Mesa/src/light.c Mesa/src/light.h
 	Mesa/src/lines.c Mesa/src/lines.h Mesa/src/logic.c
 	Mesa/src/logic.h Mesa/src/masking.c Mesa/src/masking.h
 	Mesa/src/matrix.c Mesa/src/matrix.h Mesa/src/pixel.c
 	Mesa/src/pixel.h Mesa/src/points.c Mesa/src/points.h
 	Mesa/src/polygon.c Mesa/src/polygon.h Mesa/src/rastpos.c
 	Mesa/src/readpix.c Mesa/src/scissor.c Mesa/src/scissor.h
 	Mesa/src/state.c Mesa/src/state.h Mesa/src/stencil.c
 	Mesa/src/stencil.h Mesa/src/teximage.c Mesa/src/teximage.h
 	Mesa/src/texobj.c Mesa/src/texobj.h Mesa/src/texstate.c
 	Mesa/src/texstate.h Mesa/src/texture.c Mesa/src/texture.h
 	Mesa/src/texutil.c Mesa/src/texutil.h Mesa/src/varray.c
 	Mesa/src/varray.h Mesa/src/X/fakeglx.c Mesa/src/X/xm_api.c
 	Mesa/src/X/xm_dd.c Mesa/src/X/xm_line.c Mesa/src/X/xm_span.c
 	Mesa/src/X/xm_tri.c Mesa/src/swrast/s_aaline.c
 	Mesa/src/swrast/s_aaline.h Mesa/src/swrast/s_aatriangle.h
 	Mesa/src/swrast/s_accum.h Mesa/src/swrast/s_alpha.h
 	Mesa/src/swrast/s_alphabuf.h Mesa/src/swrast/s_blend.h
 	Mesa/src/swrast/s_context.c Mesa/src/swrast/s_context.h
 	Mesa/src/swrast/s_depth.h Mesa/src/swrast/s_drawpix.h
 	Mesa/src/swrast/s_feedback.h Mesa/src/swrast/s_fog.h
 	Mesa/src/swrast/s_histogram.h Mesa/src/swrast/s_lines.h
 	Mesa/src/swrast/s_logic.h Mesa/src/swrast/s_masking.h
 	Mesa/src/swrast/s_pb.h Mesa/src/swrast/s_pixeltex.h
 	Mesa/src/swrast/s_points.h Mesa/src/swrast/s_quads.c
 	Mesa/src/swrast/s_quads.h Mesa/src/swrast/s_scissor.h
 	Mesa/src/swrast/s_span.h Mesa/src/swrast/s_stencil.h
 	Mesa/src/swrast/s_texture.h Mesa/src/swrast/s_triangle.h
 	Mesa/src/swrast/s_zoom.h Mesa/src/swrast/swrast.h
 	Mesa/src/swrast_setup/ss_context.h
 	Mesa/src/swrast_setup/ss_triangle.c
 	Mesa/src/swrast_setup/ss_triangle.h
 	Mesa/src/swrast_setup/ss_vb.h Mesa/src/tnl/t_clip.c
 	Mesa/src/tnl/t_clip.h Mesa/src/tnl/t_context.c
 	Mesa/src/tnl/t_context.h Mesa/src/tnl/t_cva.c
 	Mesa/src/tnl/t_cva.h Mesa/src/tnl/t_debug.c
 	Mesa/src/tnl/t_debug.h Mesa/src/tnl/t_dlist.h
 	Mesa/src/tnl/t_eval.c Mesa/src/tnl/t_eval.h
 	Mesa/src/tnl/t_fog.c Mesa/src/tnl/t_fog.h
 	Mesa/src/tnl/t_light.c Mesa/src/tnl/t_light.h
 	Mesa/src/tnl/t_pipeline.c Mesa/src/tnl/t_pipeline.h
 	Mesa/src/tnl/t_shade.c Mesa/src/tnl/t_shade.h
 	Mesa/src/tnl/t_stages.c Mesa/src/tnl/t_stages.h
 	Mesa/src/tnl/t_texture.c Mesa/src/tnl/t_texture.h
 	Mesa/src/tnl/t_trans_elt.c Mesa/src/tnl/t_trans_elt.h
 	Mesa/src/tnl/t_varray.c Mesa/src/tnl/t_varray.h
 	Mesa/src/tnl/t_vb.c Mesa/src/tnl/t_vb.h
 	Mesa/src/tnl/t_vbcull.c Mesa/src/tnl/t_vbcull.h
 	Mesa/src/tnl/t_vbfill.c Mesa/src/tnl/t_vbfill.h
 	Mesa/src/tnl/t_vbindirect.c Mesa/src/tnl/t_vbindirect.h
 	Mesa/src/tnl/t_vbrender.c Mesa/src/tnl/t_vbrender.h
 	Mesa/src/tnl/t_vbxform.c Mesa/src/tnl/t_vbxform.h
 	Mesa/src/tnl/tnl.h
 Added Files:
 	Mesa/src/mtypes.h
 Removed Files:
 	Mesa/src/types.h

 Changed Mesa/src/types to Mesa/src/mtypes.h to avoid conflicts while
compiling on a VMS system.

----------------------------------------------------------------------
This commit is contained in:
Jouk Jansen 2000-11-22 07:32:16 +00:00
parent fbe3726050
commit 5e3bc0c2a2
108 changed files with 2823 additions and 1117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/drivers/x11/fakeglx.c
View file

@ -1,21 +1,21 @@
/* $Id: fakeglx.c,v 1.39 2000/11/10 17:23:03 brianp Exp $ */
/* $Id: fakeglx.c,v 1.40 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -49,7 +49,7 @@
#include "config.h"
#include "macros.h"
#include "mmath.h"
#include "types.h"
#include "mtypes.h"
#include "xfonts.h"
#include "xmesaP.h"
@ -987,7 +987,7 @@ Fake_glXChooseVisual( Display *dpy, int screen, int *list )
parselist++;
parselist++;
break;
/*
* GLX_EXT_visual_info extension
*/

32
src/mesa/drivers/x11/xm_api.c
View file

@ -1,21 +1,21 @@
/* $Id: xm_api.c,v 1.9 2000/11/17 21:01:48 brianp Exp $ */
/* $Id: xm_api.c,v 1.10 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -71,7 +71,7 @@
#include "glthread.h"
#include "matrix.h"
#include "mem.h"
#include "types.h"
#include "mtypes.h"
#ifdef HAVE_CONFIG_H
#include "conf.h"
#endif
@ -149,7 +149,7 @@ static short hpcr_rgbTbl[3][256] = {
176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223
}
}
};
@ -783,7 +783,7 @@ noFaultXAllocColor( int client,
subColor.pixel = (unsigned long) bestmatch;
subColor.red = ctable[bestmatch].red;
subColor.green = ctable[bestmatch].green;
subColor.blue = ctable[bestmatch].blue;
subColor.blue = ctable[bestmatch].blue;
subColor.flags = DoRed | DoGreen | DoBlue;
*alloced = 0;
}
@ -821,7 +821,7 @@ static GLboolean setup_grayscale( int client, XMesaVisual v,
prevBuffer = find_xmesa_buffer(v->display, cmap, buffer);
if (prevBuffer &&
(buffer->xm_visual->gl_visual->RGBAflag ==
(buffer->xm_visual->gl_visual->RGBAflag ==
prevBuffer->xm_visual->gl_visual->RGBAflag)) {
/* Copy colormap stuff from previous XMesaBuffer which uses same
* X colormap. Do this to avoid time spent in noFaultXAllocColor.
@ -909,7 +909,7 @@ static GLboolean setup_dithered_color( int client, XMesaVisual v,
prevBuffer = find_xmesa_buffer(v->display, cmap, buffer);
if (prevBuffer &&
(buffer->xm_visual->gl_visual->RGBAflag ==
(buffer->xm_visual->gl_visual->RGBAflag ==
prevBuffer->xm_visual->gl_visual->RGBAflag)) {
/* Copy colormap stuff from previous, matching XMesaBuffer.
* Do this to avoid time spent in noFaultXAllocColor.
@ -982,8 +982,8 @@ static void setup_8bit_hpcr( XMesaVisual v )
int i;
double g;
g = 1.0 / v->RedGamma;
for (i=0; i<256; i++) {
g = 1.0 / v->RedGamma;
for (i=0; i<256; i++) {
GLint red = (GLint) (255.0 * pow( hpcr_rgbTbl[0][i]/255.0, g ) + 0.5);
v->hpcr_rgbTbl[0][i] = CLAMP( red, 16, 239 );
}
@ -1670,7 +1670,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
xmesa_register_swrast_functions( ctx );
/* Run the config file
/* Run the config file
*/
_mesa_context_initialize( ctx );
@ -1852,7 +1852,7 @@ XMesaBuffer XMesaCreateWindowBuffer2( XMesaVisual v, XMesaWindow w,
attribs[numAttribs++] = (int) c->gl_ctx;
}
attribs[numAttribs++] = FXMESA_NONE;
if ((hw = fxQueryHardware())==GR_SSTTYPE_VOODOO) {
b->FXctx = fxMesaCreateBestContext(0, b->width, b->height, attribs);
if ((v->undithered_pf!=PF_INDEX) && (b->backimage)) {
@ -2280,7 +2280,7 @@ static void FXgetImage( XMesaBuffer b )
/* read row from 3Dfx frame buffer */
grLfbReadRegion( GR_BUFFER_FRONTBUFFER,
0, xmesa->xm_buffer->FXctx->height-(b->height-y),
b->width, 1,
b->width, 1,
0,
pixbuf );
@ -2299,7 +2299,7 @@ static void FXgetImage( XMesaBuffer b )
/* read row from 3Dfx frame buffer */
grLfbReadRegion( GR_BUFFER_FRONTBUFFER,
0, xmesa->xm_buffer->FXctx->height-(b->height-y),
b->width, 1,
b->width, 1,
0,
pixbuf );

22
src/mesa/drivers/x11/xm_dd.c
View file

@ -1,21 +1,21 @@
/* $Id: xm_dd.c,v 1.6 2000/11/16 21:05:40 keithw Exp $ */
/* $Id: xm_dd.c,v 1.7 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -32,7 +32,7 @@
#include "state.h"
#include "depth.h"
#include "macros.h"
#include "types.h"
#include "mtypes.h"
#include "xmesaP.h"
#include "extensions.h"
#include "swrast/swrast.h"
@ -434,14 +434,14 @@ clear_16bit_ximage( GLcontext *ctx, GLboolean all,
}
else {
pixel = pixel | (pixel<<16);
n = xmesa->xm_buffer->backimage->bytes_per_line
n = xmesa->xm_buffer->backimage->bytes_per_line
* xmesa->xm_buffer->height / 4;
do {
*ptr4++ = pixel;
n--;
} while (n!=0);
if ((xmesa->xm_buffer->backimage->bytes_per_line *
if ((xmesa->xm_buffer->backimage->bytes_per_line *
xmesa->xm_buffer->height) & 0x2)
*(GLushort *)ptr4 = pixel & 0xffff;
}
@ -905,7 +905,7 @@ void xmesa_update_state( GLcontext *ctx )
break;
}
xmesa_update_span_funcs(ctx);
xmesa_update_span_funcs(ctx);
}
@ -919,7 +919,7 @@ void xmesa_init_pointers( GLcontext *ctx )
ctx->Driver.GetBufferSize = get_buffer_size;
ctx->Driver.Flush = flush;
ctx->Driver.Finish = finish;
ctx->Driver.RenderStart = 0;
ctx->Driver.RenderFinish = _swrast_flush;

28
src/mesa/drivers/x11/xm_line.c
View file

@ -1,21 +1,21 @@
/* $Id: xm_line.c,v 1.11 2000/11/19 23:10:26 brianp Exp $ */
/* $Id: xm_line.c,v 1.12 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -35,7 +35,7 @@
#include "glxheader.h"
#include "depth.h"
#include "macros.h"
#include "types.h"
#include "mtypes.h"
#include "xmesaP.h"
/* Internal swrast includes:
@ -65,8 +65,8 @@ static void draw_points_ANY_pixmap( GLcontext *ctx, const SWvertex *vert )
register int x, y;
const GLubyte *color = vert->color;
unsigned long pixel = xmesa_color_to_pixel( xmesa,
color[0], color[1],
color[2], color[3],
color[0], color[1],
color[2], color[3],
xmesa->pixelformat);
XMesaSetForeground( dpy, gc, pixel );
x = (GLint) vert->win[0];
@ -95,13 +95,13 @@ void xmesa_choose_point( GLcontext *ctx )
SWcontext *swrast = SWRAST_CONTEXT(ctx);
if (ctx->RenderMode == GL_RENDER
&& ctx->Point.Size == 1.0F && !ctx->Point.SmoothFlag
&& ctx->Point.Size == 1.0F && !ctx->Point.SmoothFlag
&& swrast->_RasterMask == 0
&& !ctx->Texture._ReallyEnabled
&& xmesa->xm_buffer->buffer != XIMAGE) {
swrast->Point = draw_points_ANY_pixmap;
}
else {
else {
_swrast_choose_point( ctx );
}
}
@ -615,7 +615,7 @@ static swrast_line_func get_line_func( GLcontext *ctx )
/* Override for the swrast line-selection function. Try to use one
* of our internal line functions, otherwise fall back to the
* standard swrast functions.
* standard swrast functions.
*/
void xmesa_choose_line( GLcontext *ctx )
{
@ -645,17 +645,17 @@ void xmesa_choose_line( GLcontext *ctx )
_SWRAST_NEW_RASTERMASK)
/* Extend the software rasterizer with our line/point/triangle
/* Extend the software rasterizer with our line/point/triangle
* functions.
*/
void xmesa_register_swrast_functions( GLcontext *ctx )
{
SWcontext *swrast = SWRAST_CONTEXT( ctx );
swrast->choose_point = xmesa_choose_point;
swrast->choose_line = xmesa_choose_line;
swrast->choose_triangle = xmesa_choose_triangle;
swrast->invalidate_point |= XMESA_NEW_POINT;
swrast->invalidate_line |= XMESA_NEW_LINE;
swrast->invalidate_triangle |= XMESA_NEW_TRIANGLE;

20
src/mesa/drivers/x11/xm_span.c
View file

@ -1,21 +1,21 @@
/* $Id: xm_span.c,v 1.3 2000/11/16 21:05:40 keithw Exp $ */
/* $Id: xm_span.c,v 1.4 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -32,7 +32,7 @@
#include "state.h"
#include "depth.h"
#include "macros.h"
#include "types.h"
#include "mtypes.h"
#include "xmesaP.h"
#include "extensions.h"
@ -4190,7 +4190,7 @@ clear_color_HPCR_pixmap( GLcontext *ctx,
xmesa->clearcolor[2] = b;
xmesa->clearcolor[3] = a;
if (0x0==r && 0x0==g && 0x0==b) {
/* black is black */
for (i=0; i<16; i++) {
@ -4205,9 +4205,9 @@ clear_color_HPCR_pixmap( GLcontext *ctx,
}
}
/* change tile pixmap content */
XMesaPutImage(xmesa->display,
(XMesaDrawable)xmesa->xm_visual->hpcr_clear_pixmap,
xmesa->xm_buffer->cleargc,
XMesaPutImage(xmesa->display,
(XMesaDrawable)xmesa->xm_visual->hpcr_clear_pixmap,
xmesa->xm_buffer->cleargc,
xmesa->xm_visual->hpcr_clear_ximage, 0, 0, 0, 0, 16, 2);
}

82
src/mesa/drivers/x11/xm_tri.c
View file

@ -1,21 +1,21 @@
/* $Id: xm_tri.c,v 1.11 2000/11/19 23:10:26 brianp Exp $ */
/* $Id: xm_tri.c,v 1.12 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -35,7 +35,7 @@
#include "glxheader.h"
#include "depth.h"
#include "macros.h"
#include "types.h"
#include "mtypes.h"
#include "xmesaP.h"
/* Internal swrast includes:
@ -368,7 +368,7 @@ static void smooth_DITHER_z_triangle( GLcontext *ctx,
/*
* XImage, smooth, depth-buffered, 8-bit PF_LOOKUP triangle.
*/
static void smooth_LOOKUP8_z_triangle( GLcontext *ctx,
static void smooth_LOOKUP8_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -404,7 +404,7 @@ static void smooth_LOOKUP8_z_triangle( GLcontext *ctx,
/*
* XImage, smooth, depth-buffered, 8-bit PF_HPCR triangle.
*/
static void smooth_HPCR_z_triangle( GLcontext *ctx,
static void smooth_HPCR_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -471,7 +471,7 @@ static void flat_TRUECOLOR_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, PF_8A8B8G8R triangle.
*/
static void flat_8A8B8G8R_z_triangle( GLcontext *ctx,
static void flat_8A8B8G8R_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -505,7 +505,7 @@ static void flat_8A8B8G8R_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, PF_8R8G8B triangle.
*/
static void flat_8R8G8B_z_triangle( GLcontext *ctx,
static void flat_8R8G8B_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -539,7 +539,7 @@ static void flat_8R8G8B_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, PF_8R8G8B24 triangle.
*/
static void flat_8R8G8B24_z_triangle( GLcontext *ctx,
static void flat_8R8G8B24_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -574,7 +574,7 @@ static void flat_8R8G8B24_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, PF_TRUEDITHER triangle.
*/
static void flat_TRUEDITHER_z_triangle( GLcontext *ctx,
static void flat_TRUEDITHER_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -606,7 +606,7 @@ static void flat_TRUEDITHER_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, PF_5R6G5B triangle.
*/
static void flat_5R6G5B_z_triangle( GLcontext *ctx,
static void flat_5R6G5B_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -640,7 +640,7 @@ static void flat_5R6G5B_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, PF_DITHER_5R6G5B triangle.
*/
static void flat_DITHER_5R6G5B_z_triangle( GLcontext *ctx,
static void flat_DITHER_5R6G5B_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -673,7 +673,7 @@ static void flat_DITHER_5R6G5B_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, 8-bit PF_DITHER triangle.
*/
static void flat_DITHER8_z_triangle( GLcontext *ctx,
static void flat_DITHER8_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -708,7 +708,7 @@ static void flat_DITHER8_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, PF_DITHER triangle.
*/
static void flat_DITHER_z_triangle( GLcontext *ctx,
static void flat_DITHER_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -742,7 +742,7 @@ static void flat_DITHER_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, 8-bit PF_HPCR triangle.
*/
static void flat_HPCR_z_triangle( GLcontext *ctx,
static void flat_HPCR_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -777,7 +777,7 @@ static void flat_HPCR_z_triangle( GLcontext *ctx,
/*
* XImage, flat, depth-buffered, 8-bit PF_LOOKUP triangle.
*/
static void flat_LOOKUP8_z_triangle( GLcontext *ctx,
static void flat_LOOKUP8_z_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -815,7 +815,7 @@ static void flat_LOOKUP8_z_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, PF_TRUECOLOR triangle.
*/
static void smooth_TRUECOLOR_triangle( GLcontext *ctx,
static void smooth_TRUECOLOR_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -840,7 +840,7 @@ static void smooth_TRUECOLOR_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, PF_8A8B8G8R triangle.
*/
static void smooth_8A8B8G8R_triangle( GLcontext *ctx,
static void smooth_8A8B8G8R_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -867,7 +867,7 @@ static void smooth_8A8B8G8R_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, PF_8R8G8B triangle.
*/
static void smooth_8R8G8B_triangle( GLcontext *ctx,
static void smooth_8R8G8B_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -894,7 +894,7 @@ static void smooth_8R8G8B_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, PF_8R8G8B triangle.
*/
static void smooth_8R8G8B24_triangle( GLcontext *ctx,
static void smooth_8R8G8B24_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -923,7 +923,7 @@ static void smooth_8R8G8B24_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, PF_TRUEDITHER triangle.
*/
static void smooth_TRUEDITHER_triangle( GLcontext *ctx,
static void smooth_TRUEDITHER_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -949,7 +949,7 @@ static void smooth_TRUEDITHER_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, PF_5R6G5B triangle.
*/
static void smooth_5R6G5B_triangle( GLcontext *ctx,
static void smooth_5R6G5B_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -976,7 +976,7 @@ static void smooth_5R6G5B_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, PF_DITHER_5R6G5B triangle.
*/
static void smooth_DITHER_5R6G5B_triangle( GLcontext *ctx,
static void smooth_DITHER_5R6G5B_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1003,7 +1003,7 @@ static void smooth_DITHER_5R6G5B_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, 8-bit PF_DITHER triangle.
*/
static void smooth_DITHER8_triangle( GLcontext *ctx,
static void smooth_DITHER8_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1031,7 +1031,7 @@ static void smooth_DITHER8_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, PF_DITHER triangle.
*/
static void smooth_DITHER_triangle( GLcontext *ctx,
static void smooth_DITHER_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1058,7 +1058,7 @@ static void smooth_DITHER_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, 8-bit PF_LOOKUP triangle.
*/
static void smooth_LOOKUP8_triangle( GLcontext *ctx,
static void smooth_LOOKUP8_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1088,7 +1088,7 @@ static void smooth_LOOKUP8_triangle( GLcontext *ctx,
/*
* XImage, smooth, NON-depth-buffered, 8-bit PF_HPCR triangle.
*/
static void smooth_HPCR_triangle( GLcontext *ctx,
static void smooth_HPCR_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1116,7 +1116,7 @@ static void smooth_HPCR_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, PF_TRUECOLOR triangle.
*/
static void flat_TRUECOLOR_triangle( GLcontext *ctx,
static void flat_TRUECOLOR_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1141,7 +1141,7 @@ static void flat_TRUECOLOR_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, PF_8A8B8G8R triangle.
*/
static void flat_8A8B8G8R_triangle( GLcontext *ctx,
static void flat_8A8B8G8R_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1168,7 +1168,7 @@ static void flat_8A8B8G8R_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, PF_8R8G8B triangle.
*/
static void flat_8R8G8B_triangle( GLcontext *ctx,
static void flat_8R8G8B_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1195,7 +1195,7 @@ static void flat_8R8G8B_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, PF_8R8G8B24 triangle.
*/
static void flat_8R8G8B24_triangle( GLcontext *ctx,
static void flat_8R8G8B24_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1222,7 +1222,7 @@ static void flat_8R8G8B24_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, PF_TRUEDITHER triangle.
*/
static void flat_TRUEDITHER_triangle( GLcontext *ctx,
static void flat_TRUEDITHER_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1247,7 +1247,7 @@ static void flat_TRUEDITHER_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, PF_5R6G5B triangle.
*/
static void flat_5R6G5B_triangle( GLcontext *ctx,
static void flat_5R6G5B_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1274,7 +1274,7 @@ static void flat_5R6G5B_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, PF_DITHER_5R6G5B triangle.
*/
static void flat_DITHER_5R6G5B_triangle( GLcontext *ctx,
static void flat_DITHER_5R6G5B_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1300,7 +1300,7 @@ static void flat_DITHER_5R6G5B_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, 8-bit PF_DITHER triangle.
*/
static void flat_DITHER8_triangle( GLcontext *ctx,
static void flat_DITHER8_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1328,7 +1328,7 @@ static void flat_DITHER8_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, PF_DITHER triangle.
*/
static void flat_DITHER_triangle( GLcontext *ctx,
static void flat_DITHER_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1354,7 +1354,7 @@ static void flat_DITHER_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, 8-bit PF_HPCR triangle.
*/
static void flat_HPCR_triangle( GLcontext *ctx,
static void flat_HPCR_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1382,7 +1382,7 @@ static void flat_HPCR_triangle( GLcontext *ctx,
/*
* XImage, flat, NON-depth-buffered, 8-bit PF_LOOKUP triangle.
*/
static void flat_LOOKUP8_triangle( GLcontext *ctx,
static void flat_LOOKUP8_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -1648,7 +1648,7 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
/* Override for the swrast tri-selection function. Try to use one
* of our internal tri functions, otherwise fall back to the
* standard swrast functions.
* standard swrast functions.
*/
void xmesa_choose_triangle( GLcontext *ctx )
{

8
src/mesa/glapi/glapi.c
View file

@ -1,4 +1,4 @@
/* $Id: glapi.c,v 1.47 2000/10/27 18:31:22 brianp Exp $ */
/* $Id: glapi.c,v 1.48 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
@ -50,7 +50,7 @@
#include "glthread.h"
#if defined(MESA_TRACE)
#include "types.h"
#include "mtypes.h"
#endif
/* This is used when thread safety is disabled */
@ -835,7 +835,7 @@ static struct name_address_offset static_functions[] = {
{ "glCopyTexSubImage1DEXT", NAME(glCopyTexSubImage1DEXT), _gloffset_CopyTexSubImage1D },
{ "glCopyTexSubImage2DEXT", NAME(glCopyTexSubImage2DEXT), _gloffset_CopyTexSubImage2D },
#undef NAME
/* 11. GL_EXT_histogram */
#ifdef GL_EXT_histogram
#define NAME(X) (GLvoid *) X
@ -874,7 +874,7 @@ static struct name_address_offset static_functions[] = {
{ "glGetSeparableFilterEXT", NAME(glGetSeparableFilterEXT), _gloffset_GetSeparableFilterEXT },
{ "glSeparableFilter2DEXT", NAME(glSeparableFilter2DEXT), _gloffset_SeparableFilter2D },
#undef NAME
/* 14. GL_SGI_color_table */
#ifdef GL_SGI_color_table
#define NAME(X) (GLvoid *) X

26
src/mesa/glapi/glthread.h
View file

@ -1,21 +1,21 @@
/* $Id: glthread.h,v 1.6 2000/11/17 11:00:56 joukj Exp $ */
/* $Id: glthread.h,v 1.7 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -57,17 +57,11 @@
*/
/*
* If this file is accidentally included by a non-threaded build,
* If this file is accidentally included by a non-threaded build,
* it should not cause the build to fail, or otherwise cause problems.
* In general, it should only be included when needed however.
*/
#ifdef VMS
# if defined(PTHREADS)
#include "types.h"
#endif
#endif
#ifndef GLTHREAD_H
#define GLTHREAD_H
@ -119,9 +113,9 @@ typedef pthread_mutex_t _glthread_Mutex;
/*
* Solaris threads. Use only up to Solaris 2.4.
* Solaris threads. Use only up to Solaris 2.4.
* Solaris 2.5 and higher provide POSIX threads.
* Be sure to compile with -mt on the Solaris compilers, or
* Be sure to compile with -mt on the Solaris compilers, or
* use -D_REENTRANT if using gcc.
*/
#ifdef SOLARIS_THREADS
@ -149,7 +143,7 @@ typedef mutex_t _glthread_Mutex;
/*
* Windows threads. Should work with Windows NT and 95.
* Windows threads. Should work with Windows NT and 95.
* IMPORTANT: Link with multithreaded runtime library when THREADS are
* used!
*/
@ -234,7 +228,7 @@ typedef GLuint _glthread_Mutex;
/*
* Platform independent thread specific data API.
* Platform independent thread specific data API.
*/
extern unsigned long

14
src/mesa/main/accum.c
View file

@ -1,21 +1,21 @@
/* $Id: accum.c,v 1.31 2000/10/31 18:09:44 keithw Exp $ */
/* $Id: accum.c,v 1.32 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -34,7 +34,7 @@
#include "macros.h"
#include "mem.h"
#include "state.h"
#include "types.h"
#include "mtypes.h"
#include "swrast/swrast.h"
#endif
@ -60,7 +60,7 @@ _mesa_Accum( GLenum op, GLfloat value )
{
GET_CURRENT_CONTEXT(ctx);
GLuint xpos, ypos, width, height;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glAccum");
if (ctx->Visual.AccumRedBits == 0 || ctx->DrawBuffer != ctx->ReadBuffer) {

12
src/mesa/main/accum.h
View file

@ -1,21 +1,21 @@
/* $Id: accum.h,v 1.4 2000/10/31 18:09:44 keithw Exp $ */
/* $Id: accum.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.1
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define ACCUM_H
#include "types.h"
#include "mtypes.h"
extern void

18
src/mesa/main/attrib.c
View file

@ -1,21 +1,21 @@
/* $Id: attrib.c,v 1.35 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: attrib.c,v 1.36 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -38,7 +38,7 @@
#include "mem.h"
#include "simple_list.h"
#include "texstate.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -761,7 +761,7 @@ _mesa_PopAttrib(void)
case GL_POLYGON_STIPPLE_BIT:
MEMCPY( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );
ctx->NewState |= _NEW_POLYGONSTIPPLE;
if (ctx->Driver.PolygonStipple)
if (ctx->Driver.PolygonStipple)
ctx->Driver.PolygonStipple( ctx, (const GLubyte *) attr->data );
break;
case GL_SCISSOR_BIT:
@ -838,9 +838,9 @@ _mesa_PopAttrib(void)
}
}
break;
case GL_VIEWPORT_BIT:
case GL_VIEWPORT_BIT:
{
struct gl_viewport_attrib *v =
struct gl_viewport_attrib *v =
(struct gl_viewport_attrib *)attr->data;
ctx->NewState |= _NEW_VIEWPORT;

12
src/mesa/main/attrib.h
View file

@ -1,21 +1,21 @@
/* $Id: attrib.h,v 1.3 2000/02/02 22:03:31 brianp Exp $ */
/* $Id: attrib.h,v 1.4 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define ATTRIB_h
#include "types.h"
#include "mtypes.h"
extern void

14
src/mesa/main/blend.c
View file

@ -1,21 +1,21 @@
/* $Id: blend.c,v 1.25 2000/11/05 18:40:57 keithw Exp $ */
/* $Id: blend.c,v 1.26 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -34,7 +34,7 @@
#include "context.h"
#include "enums.h"
#include "macros.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -298,7 +298,7 @@ _mesa_BlendEquation( GLenum mode )
}
ctx->NewState |= _NEW_COLOR;
if (ctx->Driver.BlendEquation)
ctx->Driver.BlendEquation( ctx, mode );
}

12
src/mesa/main/blend.h
View file

@ -1,21 +1,21 @@
/* $Id: blend.h,v 1.6 2000/10/31 18:09:44 keithw Exp $ */
/* $Id: blend.h,v 1.7 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define BLEND_H
#include "types.h"
#include "mtypes.h"
extern void
_mesa_BlendFunc( GLenum sfactor, GLenum dfactor );

14
src/mesa/main/buffers.c
View file

@ -1,21 +1,21 @@
/* $Id: buffers.c,v 1.19 2000/11/13 20:02:56 keithw Exp $ */
/* $Id: buffers.c,v 1.20 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -39,7 +39,7 @@
#include "mem.h"
#include "stencil.h"
#include "state.h"
#include "types.h"
#include "mtypes.h"
#include "swrast/swrast.h"
#endif
@ -88,7 +88,7 @@ _mesa_ClearColor( GLclampf red, GLclampf green,
void
void
_mesa_Clear( GLbitfield mask )
{
GET_CURRENT_CONTEXT(ctx);

12
src/mesa/main/buffers.h
View file

@ -1,21 +1,21 @@
/* $Id: buffers.h,v 1.1 2000/02/02 19:15:03 brianp Exp $ */
/* $Id: buffers.h,v 1.2 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define BUFFERS_H
#include "types.h"
#include "mtypes.h"
extern void

22
src/mesa/main/clip.c
View file

@ -1,21 +1,21 @@
/* $Id: clip.c,v 1.15 2000/11/16 21:05:34 keithw Exp $ */
/* $Id: clip.c,v 1.16 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -33,7 +33,7 @@
#include "context.h"
#include "macros.h"
#include "mmath.h"
#include "types.h"
#include "mtypes.h"
#include "math/m_xform.h"
#include "math/m_matrix.h"
@ -77,7 +77,7 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
* clipping now takes place. The clip-space equations are recalculated
* whenever the projection matrix changes.
*/
if (ctx->ModelView.flags & MAT_DIRTY)
if (ctx->ModelView.flags & MAT_DIRTY)
_math_matrix_analyze( &ctx->ModelView );
gl_transform_vector( ctx->Transform.EyeUserPlane[p], equation,
@ -89,11 +89,11 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
* code in gl_update_state().
*/
if (ctx->Transform.ClipEnabled[p]) {
if (ctx->ProjectionMatrix.flags & MAT_DIRTY)
if (ctx->ProjectionMatrix.flags & MAT_DIRTY)
_math_matrix_analyze( &ctx->ProjectionMatrix );
gl_transform_vector( ctx->Transform._ClipUserPlane[p],
ctx->Transform.EyeUserPlane[p],
gl_transform_vector( ctx->Transform._ClipUserPlane[p],
ctx->Transform.EyeUserPlane[p],
ctx->ProjectionMatrix.inv );
}

12
src/mesa/main/clip.h
View file

@ -1,21 +1,21 @@
/* $Id: clip.h,v 1.4 2000/11/16 21:05:34 keithw Exp $ */
/* $Id: clip.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.1
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -31,7 +31,7 @@
#ifndef CLIP_H
#define CLIP_H
#include "types.h"
#include "mtypes.h"
extern void _mesa_ClipPlane( GLenum plane, const GLdouble *equation );

12
src/mesa/main/colortab.h
View file

@ -1,21 +1,21 @@
/* $Id: colortab.h,v 1.7 2000/04/17 17:57:04 brianp Exp $ */
/* $Id: colortab.h,v 1.8 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define COLORTAB_H
#include "types.h"
#include "mtypes.h"
extern void

22
src/mesa/main/context.c
View file

@ -1,4 +1,4 @@
/* $Id: context.c,v 1.107 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: context.c,v 1.108 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
@ -52,7 +52,7 @@
#include "teximage.h"
#include "texobj.h"
#include "texture.h"
#include "types.h"
#include "mtypes.h"
#include "varray.h"
#include "math/m_translate.h"
@ -69,7 +69,7 @@
#ifndef MESA_VERBOSE
int MESA_VERBOSE = 0
int MESA_VERBOSE = 0
/* | VERBOSE_PIPELINE */
/* | VERBOSE_IMMEDIATE */
/* | VERBOSE_VARRAY */
@ -83,7 +83,7 @@ int MESA_VERBOSE = 0
#endif
#ifndef MESA_DEBUG_FLAGS
int MESA_DEBUG_FLAGS = 0
int MESA_DEBUG_FLAGS = 0
/* | DEBUG_ALWAYS_FLUSH */
;
#endif
@ -1457,7 +1457,7 @@ _mesa_initialize_context( GLcontext *ctx,
ctx->Visual = *visual;
ctx->DrawBuffer = NULL;
ctx->ReadBuffer = NULL;
if (share_list) {
/* share the group of display lists of another context */
ctx->Shared = share_list->Shared;
@ -1808,13 +1808,13 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *buffer )
static void print_info( void )
{
fprintf(stderr, "Mesa GL_VERSION = %s\n",
fprintf(stderr, "Mesa GL_VERSION = %s\n",
(char *) _mesa_GetString(GL_VERSION));
fprintf(stderr, "Mesa GL_RENDERER = %s\n",
fprintf(stderr, "Mesa GL_RENDERER = %s\n",
(char *) _mesa_GetString(GL_RENDERER));
fprintf(stderr, "Mesa GL_VENDOR = %s\n",
fprintf(stderr, "Mesa GL_VENDOR = %s\n",
(char *) _mesa_GetString(GL_VENDOR));
fprintf(stderr, "Mesa GL_EXTENSIONS = %s\n",
fprintf(stderr, "Mesa GL_EXTENSIONS = %s\n",
(char *) _mesa_GetString(GL_EXTENSIONS));
#if defined(THREADS)
fprintf(stderr, "Mesa thread-safe: YES\n");
@ -1837,7 +1837,7 @@ void
_mesa_make_current2( GLcontext *newCtx, GLframebuffer *drawBuffer,
GLframebuffer *readBuffer )
{
if (MESA_VERBOSE)
if (MESA_VERBOSE)
fprintf(stderr, "_mesa_make_current2()\n");
/* We call this function periodically (just here for now) in
@ -1863,7 +1863,7 @@ _mesa_make_current2( GLcontext *newCtx, GLframebuffer *drawBuffer,
/* gl_update_state( newCtx ); */
}
if (newCtx->Driver.MakeCurrent)
if (newCtx->Driver.MakeCurrent)
newCtx->Driver.MakeCurrent( newCtx, drawBuffer, readBuffer );
/* We can use this to help debug user's problems. Tell them to set

12
src/mesa/main/context.h
View file

@ -1,21 +1,21 @@
/* $Id: context.h,v 1.21 2000/11/16 21:05:34 keithw Exp $ */
/* $Id: context.h,v 1.22 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -30,7 +30,7 @@
#include "glapi.h"
#include "types.h"
#include "mtypes.h"
/*

6
src/mesa/main/convolve.c
View file

@ -1,4 +1,4 @@
/* $Id: convolve.c,v 1.13 2000/11/21 23:26:13 brianp Exp $ */
/* $Id: convolve.c,v 1.14 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
@ -41,7 +41,7 @@
#include "convolve.h"
#include "context.h"
#include "image.h"
#include "types.h"
#include "mtypes.h"
#include "swrast/s_span.h" /* XXX SWRAST hack */
#endif
@ -885,7 +885,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
ctx->Separable2D.Filter[i * 4 + 3 + colStart] = a;
}
}
ctx->NewState |= _NEW_PIXEL;
}

4
src/mesa/main/convolve.h
View file

@ -1,4 +1,4 @@
/* $Id: convolve.h,v 1.2 2000/08/23 14:31:25 brianp Exp $ */
/* $Id: convolve.h,v 1.3 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
@ -29,7 +29,7 @@
#define CONVOLVE_H
#include "types.h"
#include "mtypes.h"
extern void

14
src/mesa/main/debug.c
View file

@ -1,4 +1,4 @@
#include "types.h"
#include "mtypes.h"
#include "debug.h"
void gl_print_state( const char *msg, GLuint state )
@ -59,9 +59,9 @@ void gl_print_enable_flags( const char *msg, GLuint flags )
(flags & ENABLE_RESCALE) ? "rescale, " : "");
}
void gl_print_tri_caps( const char *name, GLuint flags )
void gl_print_tri_caps( const char *name, GLuint flags )
{
fprintf(stderr,
fprintf(stderr,
"%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
name,
flags,
@ -79,10 +79,10 @@ void gl_print_tri_caps( const char *name, GLuint flags )
(flags & DD_LINE_SMOOTH) ? "line-smooth, " : "",
(flags & DD_LINE_STIPPLE) ? "line-stipple, " : "",
(flags & DD_LINE_WIDTH) ? "line-wide, " : "",
(flags & DD_POINT_SMOOTH) ? "point-smooth, " : "",
(flags & DD_POINT_SIZE) ? "point-size, " : "",
(flags & DD_POINT_ATTEN) ? "point-atten, " : "",
(flags & DD_LIGHTING_CULL) ? "lighting-cull, " : "",
(flags & DD_POINT_SMOOTH) ? "point-smooth, " : "",
(flags & DD_POINT_SIZE) ? "point-size, " : "",
(flags & DD_POINT_ATTEN) ? "point-atten, " : "",
(flags & DD_LIGHTING_CULL) ? "lighting-cull, " : "",
(flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : "",
(flags & DD_STENCIL) ? "stencil, " : ""
);

12
src/mesa/main/depth.c
View file

@ -1,21 +1,21 @@
/* $Id: depth.c,v 1.23 2000/11/05 18:40:57 keithw Exp $ */
/* $Id: depth.c,v 1.24 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -34,7 +34,7 @@
#include "depth.h"
#include "macros.h"
#include "mem.h"
#include "types.h"
#include "mtypes.h"
#endif

12
src/mesa/main/depth.h
View file

@ -1,21 +1,21 @@
/* $Id: depth.h,v 1.9 2000/10/31 18:09:44 keithw Exp $ */
/* $Id: depth.h,v 1.10 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define DEPTH_H
#include "types.h"
#include "mtypes.h"
/*

48
src/mesa/main/dlist.c
View file

@ -1,21 +1,21 @@
/* $Id: dlist.c,v 1.51 2000/11/16 21:05:34 keithw Exp $ */
/* $Id: dlist.c,v 1.52 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -67,7 +67,7 @@
#include "texobj.h"
#include "teximage.h"
#include "texstate.h"
#include "types.h"
#include "mtypes.h"
#include "varray.h"
#include "math/m_matrix.h"
@ -109,7 +109,7 @@ Functions which cause errors if called while compiling a display list:
*/
/* How many nodes to allocate at a time:
/* How many nodes to allocate at a time:
* - reduced now that we hold vertices etc. elsewhere.
*/
#define BLOCK_SIZE 64
@ -440,7 +440,7 @@ void gl_destroy_list( GLcontext *ctx, GLuint list )
}
}
}
_mesa_HashRemove(ctx->Shared->DisplayList, list);
}
@ -695,7 +695,7 @@ _mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz )
*/
int
_mesa_alloc_opcode( GLcontext *ctx,
GLuint sz,
GLuint sz,
void (*execute)( GLcontext *, void * ),
void (*destroy)( GLcontext *, void * ),
void (*print)( GLcontext *, void * ) )
@ -713,7 +713,7 @@ _mesa_alloc_opcode( GLcontext *ctx,
/* Mimic the old behaviour of alloc_instruction:
/* Mimic the old behaviour of alloc_instruction:
* - sz is in units of sizeof(Node)
* - return value a pointer to sizeof(Node) before the actual
* usable data area.
@ -1681,7 +1681,7 @@ static void save_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
}
static void save_EvalMesh2(
static void save_EvalMesh2(
GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
{
GET_CURRENT_CONTEXT(ctx);
@ -2883,7 +2883,7 @@ static void save_Rectfv( const GLfloat *v1, const GLfloat *v2 )
{
save_Rectf(v1[0], v1[1], v2[0], v2[1]);
}
static void save_Recti(GLint x1, GLint y1, GLint x2, GLint y2)
{
save_Rectf(x1, y1, x2, y2);
@ -3322,7 +3322,7 @@ static void save_TexImage3D( GLenum target,
n[3].i = internalFormat;
n[4].i = (GLint) width;
n[5].i = (GLint) height;
n[6].i = (GLint) depth;
n[6].i = (GLint) depth;
n[7].i = border;
n[8].e = format;
n[9].e = type;
@ -3989,10 +3989,10 @@ static void save_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value)
}
/* KW: Compile commands
*
/* KW: Compile commands
*
* Will appear in the list before the vertex buffer containing the
* command that provoked the error. I don't see this as a problem.
* command that provoked the error. I don't see this as a problem.
*/
void gl_save_error( GLcontext *ctx, GLenum error, const char *s )
{
@ -4056,7 +4056,7 @@ static void execute_list( GLcontext *ctx, GLuint list )
else {
switch (opcode) {
case OPCODE_ERROR:
gl_error( ctx, n[1].e, (const char *) n[2].data );
gl_error( ctx, n[1].e, (const char *) n[2].data );
break;
case OPCODE_ACCUM:
(*ctx->Exec->Accum)( n[1].e, n[2].f );
@ -4442,7 +4442,7 @@ static void execute_list( GLcontext *ctx, GLuint list )
params[0] = n[2].f;
params[1] = n[3].f;
params[2] = n[4].f;
(*ctx->Exec->PointParameterfvEXT)( n[1].e, params );
(*ctx->Exec->PointParameterfvEXT)( n[1].e, params );
}
break;
case OPCODE_POLYGON_MODE:
@ -4881,12 +4881,12 @@ _mesa_CallList( GLuint list )
if (MESA_VERBOSE&VERBOSE_API) {
fprintf(stderr, "glCallList %u\n", list);
mesa_print_display_list( list );
mesa_print_display_list( list );
}
save_compile_flag = ctx->CompileFlag;
save_compile_flag = ctx->CompileFlag;
ctx->CompileFlag = GL_FALSE;
FLUSH_TNL( ctx, (FLUSH_STORED_VERTICES | FLUSH_UPDATE_CURRENT) );
execute_list( ctx, list );
ctx->CompileFlag = save_compile_flag;
@ -5363,7 +5363,7 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
table->SeparableFilter2D = _mesa_SeparableFilter2D;
/* 2. GL_EXT_blend_color */
#if 0
#if 0
table->BlendColorEXT = save_BlendColorEXT;
#endif
@ -5636,11 +5636,11 @@ static void print_list( GLcontext *ctx, FILE *f, GLuint list )
fprintf(f,"Translate %g %g %g\n", n[1].f, n[2].f, n[3].f );
break;
case OPCODE_BIND_TEXTURE:
fprintf(f,"BindTexture %s %d\n", gl_lookup_enum_by_nr(n[1].ui),
fprintf(f,"BindTexture %s %d\n", gl_lookup_enum_by_nr(n[1].ui),
n[2].ui);
break;
case OPCODE_SHADE_MODEL:
fprintf(f,"ShadeModel %s\n", gl_lookup_enum_by_nr(n[1].ui));
fprintf(f,"ShadeModel %s\n", gl_lookup_enum_by_nr(n[1].ui));
break;
/*

14
src/mesa/main/dlist.h
View file

@ -1,21 +1,21 @@
/* $Id: dlist.h,v 1.7 2000/11/16 21:05:34 keithw Exp $ */
/* $Id: dlist.h,v 1.8 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define DLIST_H
#include "types.h"
#include "mtypes.h"
extern void gl_init_lists( void );
@ -61,7 +61,7 @@ void *
_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz );
int
_mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
_mesa_alloc_opcode( GLcontext *ctx, GLuint sz,
void (*execute)( GLcontext *, void * ),
void (*destroy)( GLcontext *, void * ),
void (*print)( GLcontext *, void * ) );

12
src/mesa/main/drawpix.c
View file

@ -1,21 +1,21 @@
/* $Id: drawpix.c,v 1.45 2000/11/16 21:05:34 keithw Exp $ */
/* $Id: drawpix.c,v 1.46 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -37,7 +37,7 @@
#include "mem.h"
#include "mmath.h"
#include "state.h"
#include "types.h"
#include "mtypes.h"
#include "swrast/swrast.h"
#endif

12
src/mesa/main/drawpix.h
View file

@ -1,21 +1,21 @@
/* $Id: drawpix.h,v 1.4 2000/10/31 18:09:44 keithw Exp $ */
/* $Id: drawpix.h,v 1.5 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define DRAWPIXELS_H
#include "types.h"
#include "mtypes.h"
extern void
_mesa_DrawPixels( GLsizei width, GLsizei height,

38
src/mesa/main/enable.c
View file

@ -1,21 +1,21 @@
/* $Id: enable.c,v 1.32 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: enable.c,v 1.33 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -35,7 +35,7 @@
#include "macros.h"
#include "mmath.h"
#include "simple_list.h"
#include "types.h"
#include "mtypes.h"
#include "enums.h"
#include "math/m_matrix.h"
@ -52,8 +52,8 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
{
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx, "gl_enable/disable" );
if (MESA_VERBOSE & VERBOSE_API)
fprintf(stderr, "%s %s (newstate is %x)\n",
if (MESA_VERBOSE & VERBOSE_API)
fprintf(stderr, "%s %s (newstate is %x)\n",
state ? "glEnable" : "glDisable",
gl_lookup_enum_by_nr(cap),
ctx->NewState);
@ -88,7 +88,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
case GL_CLIP_PLANE3:
case GL_CLIP_PLANE4:
case GL_CLIP_PLANE5:
if (ctx->Transform.ClipEnabled[cap-GL_CLIP_PLANE0] != state)
if (ctx->Transform.ClipEnabled[cap-GL_CLIP_PLANE0] != state)
{
GLuint p = cap-GL_CLIP_PLANE0;
@ -98,11 +98,11 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
if (state) {
ctx->_Enabled |= ENABLE_USERCLIP;
ctx->Transform._AnyClip++;
if (ctx->ProjectionMatrix.flags & MAT_DIRTY) {
_math_matrix_analyze( &ctx->ProjectionMatrix );
}
/* This derived state also calculated in clip.c and
* from gl_update_state() on changes to EyeUserPlane
* and ctx->ProjectionMatrix respectively.
@ -112,8 +112,8 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
ctx->ProjectionMatrix.inv );
} else {
if (--ctx->Transform._AnyClip == 0)
ctx->_Enabled &= ~ENABLE_USERCLIP;
}
ctx->_Enabled &= ~ENABLE_USERCLIP;
}
}
break;
case GL_COLOR_MATERIAL:
@ -183,7 +183,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
ctx->Light.Light[cap-GL_LIGHT0].Enabled = state;
if (state) {
insert_at_tail(&ctx->Light.EnabledList,
insert_at_tail(&ctx->Light.EnabledList,
&ctx->Light.Light[cap-GL_LIGHT0]);
if (ctx->Light.Enabled)
ctx->_Enabled |= ENABLE_LIGHT;
@ -279,7 +279,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
ctx->Eval.Map2Normal = state;
ctx->NewState |= _NEW_EVAL;
break;
case GL_MAP2_TEXTURE_COORD_1:
case GL_MAP2_TEXTURE_COORD_1:
ctx->Eval.Map2TextureCoord1 = state;
ctx->NewState |= _NEW_EVAL;
break;
@ -691,7 +691,7 @@ _mesa_IsEnabled( GLenum cap )
return ctx->Eval.Map2Index;
case GL_MAP2_NORMAL:
return ctx->Eval.Map2Normal;
case GL_MAP2_TEXTURE_COORD_1:
case GL_MAP2_TEXTURE_COORD_1:
return ctx->Eval.Map2TextureCoord1;
case GL_MAP2_TEXTURE_COORD_2:
return ctx->Eval.Map2TextureCoord2;
@ -837,9 +837,9 @@ _mesa_IsEnabled( GLenum cap )
static void
client_state( GLcontext *ctx, GLenum cap, GLboolean state )
{
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx,
(state
? "glEnableClientState"
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx,
(state
? "glEnableClientState"
: "glDisableClientState") );
switch (cap) {

12
src/mesa/main/enable.h
View file

@ -1,21 +1,21 @@
/* $Id: enable.h,v 1.2 1999/11/11 01:22:26 brianp Exp $ */
/* $Id: enable.h,v 1.3 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define ENABLE_H
#include "types.h"
#include "mtypes.h"
extern void

24
src/mesa/main/eval.c
View file

@ -1,21 +1,21 @@
/* $Id: eval.c,v 1.15 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: eval.c,v 1.16 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -48,7 +48,7 @@
#include "macros.h"
#include "mem.h"
#include "mmath.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -89,7 +89,7 @@ GLuint _mesa_evaluator_components( GLenum target )
/*
* Copy 1-parametric evaluator control points from user-specified
* Copy 1-parametric evaluator control points from user-specified
* memory space to a buffer of contiguous control points.
* Input: see glMap1f for details
* Return: pointer to buffer of contiguous control points or NULL if out
@ -107,7 +107,7 @@ GLfloat *gl_copy_map_points1f( GLenum target, GLint ustride, GLint uorder,
buffer = (GLfloat *) MALLOC(uorder * size * sizeof(GLfloat));
if(buffer)
if(buffer)
for(i=0, p=buffer; i<uorder; i++, points+=ustride)
for(k=0; k<size; k++)
*p++ = points[k];
@ -143,7 +143,7 @@ GLfloat *gl_copy_map_points1d( GLenum target, GLint ustride, GLint uorder,
/*
* Copy 2-parametric evaluator control points from user-specified
* Copy 2-parametric evaluator control points from user-specified
* memory space to a buffer of contiguous control points.
* Additional memory is allocated to be used by the horner and
* de Casteljau evaluation schemes.
@ -181,7 +181,7 @@ GLfloat *gl_copy_map_points2f( GLenum target,
/* compute the increment value for the u-loop */
uinc = ustride - vorder*vstride;
if (buffer)
if (buffer)
for (i=0, p=buffer; i<uorder; i++, points += uinc)
for (j=0; j<vorder; j++, points += vstride)
for (k=0; k<size; k++)
@ -224,7 +224,7 @@ GLfloat *gl_copy_map_points2d(GLenum target,
/* compute the increment value for the u-loop */
uinc = ustride - vorder*vstride;
if (buffer)
if (buffer)
for (i=0, p=buffer; i<uorder; i++, points += uinc)
for (j=0; j<vorder; j++, points += vstride)
for (k=0; k<size; k++)
@ -691,7 +691,7 @@ _mesa_Map2d( GLenum target,
}
void
_mesa_GetMapdv( GLenum target, GLenum query, GLdouble *v )
{

12
src/mesa/main/eval.h
View file

@ -1,21 +1,21 @@
/* $Id: eval.h,v 1.3 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: eval.h,v 1.4 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define EVAL_H
#include "types.h"
#include "mtypes.h"
extern void gl_init_eval( void );

62
src/mesa/main/extensions.c
View file

@ -1,21 +1,21 @@
/* $Id: extensions.c,v 1.41 2000/11/17 21:01:25 brianp Exp $ */
/* $Id: extensions.c,v 1.42 2000/11/22 07:32:16 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -33,7 +33,7 @@
#include "extensions.h"
#include "mem.h"
#include "simple_list.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -44,17 +44,17 @@ struct extension {
GLint enabled;
GLboolean *flag; /* optional flag stored elsewhere */
char name[MAX_EXT_NAMELEN+1];
void (*notify)( GLcontext *, GLboolean );
void (*notify)( GLcontext *, GLboolean );
};
#define F(x) (int)&(((struct gl_extensions *)0)->x)
#define ON GL_TRUE
#define OFF GL_FALSE
static struct {
GLboolean enabled;
const char *name;
int flag_offset;
static struct {
GLboolean enabled;
const char *name;
int flag_offset;
} default_extensions[] = {
{ ON, "GL_ARB_imaging", F(ARB_imaging) },
{ ON, "GL_ARB_multitexture", F(ARB_multitexture) },
@ -80,7 +80,7 @@ static struct {
{ ON, "GL_EXT_point_parameters", F(EXT_point_parameters) },
{ ON, "GL_EXT_polygon_offset", F(EXT_polygon_offset) },
{ ON, "GL_EXT_rescale_normal", F(EXT_rescale_normal) },
{ ON, "GL_EXT_secondary_color", F(EXT_secondary_color) },
{ ON, "GL_EXT_secondary_color", F(EXT_secondary_color) },
{ ON, "GL_EXT_shared_texture_palette", F(EXT_shared_texture_palette) },
{ ON, "GL_EXT_stencil_wrap", F(EXT_stencil_wrap) },
{ ON, "GL_EXT_texture3D", F(EXT_texture3D) },
@ -125,9 +125,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
int gl_extensions_add( GLcontext *ctx,
GLboolean enabled,
const char *name,
int gl_extensions_add( GLcontext *ctx,
GLboolean enabled,
const char *name,
GLboolean *flag_ptr )
{
if (ctx->Extensions.ext_string == 0) {
@ -151,23 +151,23 @@ int gl_extensions_add( GLcontext *ctx,
static int set_extension( GLcontext *ctx, const char *name, GLint state )
{
struct extension *i;
foreach( i, ctx->Extensions.ext_list )
if (strncmp(i->name, name, MAX_EXT_NAMELEN) == 0)
foreach( i, ctx->Extensions.ext_list )
if (strncmp(i->name, name, MAX_EXT_NAMELEN) == 0)
break;
if (i == ctx->Extensions.ext_list)
return 1;
if (i->flag)
*(i->flag) = state;
*(i->flag) = state;
i->enabled = state;
return 0;
}
}
int gl_extensions_enable( GLcontext *ctx, const char *name )
{
if (ctx->Extensions.ext_string == 0)
if (ctx->Extensions.ext_string == 0)
return set_extension( ctx, name, 1 );
return 1;
}
@ -175,11 +175,11 @@ int gl_extensions_enable( GLcontext *ctx, const char *name )
int gl_extensions_disable( GLcontext *ctx, const char *name )
{
if (ctx->Extensions.ext_string == 0)
if (ctx->Extensions.ext_string == 0)
return set_extension( ctx, name, 0 );
return 1;
}
/*
* Test if the named extension is enabled in this context.
@ -213,10 +213,10 @@ void gl_extensions_dtr( GLcontext *ctx )
remove_from_list( i );
FREE( i );
}
FREE(ctx->Extensions.ext_list);
ctx->Extensions.ext_list = 0;
}
}
}
@ -235,7 +235,7 @@ void gl_extensions_ctr( GLcontext *ctx )
if (default_extensions[i].flag_offset)
ptr = base + default_extensions[i].flag_offset;
gl_extensions_add( ctx,
gl_extensions_add( ctx,
default_extensions[i].enabled,
default_extensions[i].name,
ptr);
@ -245,22 +245,22 @@ void gl_extensions_ctr( GLcontext *ctx )
const char *gl_extensions_get_string( GLcontext *ctx )
{
if (ctx->Extensions.ext_string == 0)
if (ctx->Extensions.ext_string == 0)
{
struct extension *i;
char *str;
GLuint len = 0;
foreach (i, ctx->Extensions.ext_list)
foreach (i, ctx->Extensions.ext_list)
if (i->enabled)
len += strlen(i->name) + 1;
if (len == 0)
if (len == 0)
return "";
str = (char *)MALLOC(len * sizeof(char));
ctx->Extensions.ext_string = str;
foreach (i, ctx->Extensions.ext_list)
foreach (i, ctx->Extensions.ext_list)
if (i->enabled) {
strcpy(str, i->name);
str += strlen(str);
@ -269,6 +269,6 @@ const char *gl_extensions_get_string( GLcontext *ctx )
*(str-1) = 0;
}
return ctx->Extensions.ext_string;
}

14
src/mesa/main/extensions.h
View file

@ -1,21 +1,21 @@
/* $Id: extensions.h,v 1.10 2000/11/17 21:01:25 brianp Exp $ */
/* $Id: extensions.h,v 1.11 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,7 +28,7 @@
#ifndef _EXTENSIONS_H_
#define _EXTENSIONS_H_
#include "types.h"
#include "mtypes.h"
extern void
@ -37,7 +37,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx);
/* Return 0 on success.
*/
extern int gl_extensions_add( GLcontext *ctx, GLboolean enabled,
extern int gl_extensions_add( GLcontext *ctx, GLboolean enabled,
const char *name, GLboolean *flag_ptr );
extern int gl_extensions_enable( GLcontext *ctx, const char *name );

14
src/mesa/main/feedback.c
View file

@ -1,21 +1,21 @@
/* $Id: feedback.c,v 1.16 2000/11/05 18:40:57 keithw Exp $ */
/* $Id: feedback.c,v 1.17 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -35,7 +35,7 @@
#include "feedback.h"
#include "macros.h"
#include "mmath.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -127,7 +127,7 @@ _mesa_PassThrough( GLfloat token )
*/
void gl_feedback_vertex( GLcontext *ctx,
const GLfloat win[4],
const GLfloat color[4],
const GLfloat color[4],
GLuint index,
const GLfloat texcoord[4] )
{

14
src/mesa/main/feedback.h
View file

@ -1,21 +1,21 @@
/* $Id: feedback.h,v 1.4 2000/11/05 18:40:58 keithw Exp $ */
/* $Id: feedback.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define FEEDBACK_H
#include "types.h"
#include "mtypes.h"
#define FEEDBACK_TOKEN( CTX, T ) \
@ -41,7 +41,7 @@
extern void gl_feedback_vertex( GLcontext *ctx,
const GLfloat win[4],
const GLfloat color[4],
const GLfloat color[4],
GLuint index,
const GLfloat texcoord[4] );

14
src/mesa/main/fog.c
View file

@ -1,21 +1,21 @@
/* $Id: fog.c,v 1.29 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: fog.c,v 1.30 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -32,7 +32,7 @@
#include "colormac.h"
#include "context.h"
#include "fog.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -79,7 +79,7 @@ _mesa_Fogiv(GLenum pname, const GLint *params )
}
void
void
_mesa_Fogfv( GLenum pname, const GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);

12
src/mesa/main/fog.h
View file

@ -1,21 +1,21 @@
/* $Id: fog.h,v 1.10 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: fog.h,v 1.11 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define FOG_H
#include "types.h"
#include "mtypes.h"

108
src/mesa/main/get.c
View file

@ -1,21 +1,21 @@
/* $Id: get.c,v 1.42 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: get.c,v 1.43 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -37,7 +37,7 @@
#include "get.h"
#include "macros.h"
#include "mmath.h"
#include "types.h"
#include "mtypes.h"
#include "math/m_matrix.h"
#endif
@ -97,7 +97,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
if (!params)
return;
if (MESA_VERBOSE & VERBOSE_API)
if (MESA_VERBOSE & VERBOSE_API)
fprintf(stderr, "glGetBooleanv %s\n", gl_lookup_enum_by_nr(pname));
if (ctx->Driver.GetBooleanv
@ -844,7 +844,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
break;
case GL_TEXTURE_MATRIX:
for (i=0;i<16;i++) {
params[i] =
params[i] =
FLOAT_TO_BOOL(ctx->TextureMatrix[texTransformUnit].m[i]);
}
break;
@ -1035,12 +1035,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
break;
case GL_ALWAYS_FAST_HINT_PGI:
*params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawMem == GL_FALSE);
break;
case GL_ALWAYS_SOFT_HINT_PGI:
*params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawMem == GL_TRUE);
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@ -1235,12 +1235,12 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
*params = ctx->Pixel.PostColorMatrixColorTableEnabled;
break;
/* GL_EXT_secondary_color */
case GL_COLOR_SUM_EXT:
case GL_COLOR_SUM_EXT:
*params = ctx->Fog.ColorSumEnabled;
break;
case GL_CURRENT_SECONDARY_COLOR_EXT:
case GL_CURRENT_SECONDARY_COLOR_EXT:
FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
params[0] = INT_TO_BOOL(ctx->Current.SecondaryColor[0]);
params[1] = INT_TO_BOOL(ctx->Current.SecondaryColor[1]);
@ -1249,28 +1249,28 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
case GL_SECONDARY_COLOR_ARRAY_EXT:
*params = ctx->Array.SecondaryColor.Enabled;
break;
case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
*params = ENUM_TO_BOOL(ctx->Array.SecondaryColor.Type);
break;
case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
*params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
break;
case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
*params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
break;
/* GL_EXT_fog_coord */
case GL_CURRENT_FOG_COORDINATE_EXT:
case GL_CURRENT_FOG_COORDINATE_EXT:
FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
*params = FLOAT_TO_BOOL(ctx->Current.FogCoord);
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
*params = ctx->Array.FogCoord.Enabled;
break;
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
*params = ENUM_TO_BOOL(ctx->Array.FogCoord.Type);
break;
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
*params = INT_TO_BOOL(ctx->Array.FogCoord.Stride);
break;
@ -1296,7 +1296,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
if (!params)
return;
if (MESA_VERBOSE & VERBOSE_API)
if (MESA_VERBOSE & VERBOSE_API)
fprintf(stderr, "glGetDoublev %s\n", gl_lookup_enum_by_nr(pname));
if (ctx->Driver.GetDoublev && (*ctx->Driver.GetDoublev)(ctx, pname, params))
@ -2233,12 +2233,12 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
break;
case GL_ALWAYS_FAST_HINT_PGI:
*params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawMem == GL_FALSE);
break;
case GL_ALWAYS_SOFT_HINT_PGI:
*params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawMem == GL_TRUE);
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@ -2435,10 +2435,10 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
break;
/* GL_EXT_secondary_color */
case GL_COLOR_SUM_EXT:
case GL_COLOR_SUM_EXT:
*params = (GLdouble) ctx->Fog.ColorSumEnabled;
break;
case GL_CURRENT_SECONDARY_COLOR_EXT:
case GL_CURRENT_SECONDARY_COLOR_EXT:
FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[0]);
params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[1]);
@ -2447,28 +2447,28 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
case GL_SECONDARY_COLOR_ARRAY_EXT:
*params = (GLdouble) ctx->Array.SecondaryColor.Enabled;
break;
case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
*params = (GLdouble) ctx->Array.SecondaryColor.Type;
break;
case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
*params = (GLdouble) ctx->Array.SecondaryColor.Stride;
break;
case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
*params = (GLdouble) ctx->Array.SecondaryColor.Stride;
break;
/* GL_EXT_fog_coord */
case GL_CURRENT_FOG_COORDINATE_EXT:
case GL_CURRENT_FOG_COORDINATE_EXT:
FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
*params = (GLdouble) ctx->Current.FogCoord;
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
*params = (GLdouble) ctx->Array.FogCoord.Enabled;
break;
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
*params = (GLdouble) ctx->Array.FogCoord.Type;
break;
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
*params = (GLdouble) ctx->Array.FogCoord.Stride;
break;
@ -2495,7 +2495,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
if (!params)
return;
if (MESA_VERBOSE & VERBOSE_API)
if (MESA_VERBOSE & VERBOSE_API)
fprintf(stderr, "glGetFloatv %s\n", gl_lookup_enum_by_nr(pname));
if (ctx->Driver.GetFloatv && (*ctx->Driver.GetFloatv)(ctx, pname, params))
@ -3434,12 +3434,12 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
break;
case GL_ALWAYS_FAST_HINT_PGI:
*params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawMem == GL_FALSE);
break;
case GL_ALWAYS_SOFT_HINT_PGI:
*params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawMem == GL_TRUE);
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@ -3608,10 +3608,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
break;
/* GL_EXT_secondary_color */
case GL_COLOR_SUM_EXT:
case GL_COLOR_SUM_EXT:
*params = (GLfloat) ctx->Fog.ColorSumEnabled;
break;
case GL_CURRENT_SECONDARY_COLOR_EXT:
case GL_CURRENT_SECONDARY_COLOR_EXT:
FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[0]);
params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[1]);
@ -3620,28 +3620,28 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
case GL_SECONDARY_COLOR_ARRAY_EXT:
*params = (GLfloat) ctx->Array.SecondaryColor.Enabled;
break;
case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
*params = (GLfloat) ctx->Array.SecondaryColor.Type;
break;
case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
*params = (GLfloat) ctx->Array.SecondaryColor.Stride;
break;
case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
*params = (GLfloat) ctx->Array.SecondaryColor.Stride;
break;
/* GL_EXT_fog_coord */
case GL_CURRENT_FOG_COORDINATE_EXT:
case GL_CURRENT_FOG_COORDINATE_EXT:
FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
*params = (GLfloat) ctx->Current.FogCoord;
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
*params = (GLfloat) ctx->Array.FogCoord.Enabled;
break;
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
*params = (GLfloat) ctx->Array.FogCoord.Type;
break;
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
*params = (GLfloat) ctx->Array.FogCoord.Stride;
break;
@ -3668,7 +3668,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
if (!params)
return;
if (MESA_VERBOSE & VERBOSE_API)
if (MESA_VERBOSE & VERBOSE_API)
fprintf(stderr, "glGetIntegerv %s\n", gl_lookup_enum_by_nr(pname));
if (ctx->Driver.GetIntegerv
@ -4607,12 +4607,12 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
break;
case GL_ALWAYS_FAST_HINT_PGI:
*params = (ctx->Hint.AllowDrawWin == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawFrg == GL_FALSE &&
ctx->Hint.AllowDrawMem == GL_FALSE);
break;
case GL_ALWAYS_SOFT_HINT_PGI:
*params = (ctx->Hint.AllowDrawWin == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawFrg == GL_TRUE &&
ctx->Hint.AllowDrawMem == GL_TRUE);
break;
case GL_ALLOW_DRAW_OBJ_HINT_PGI:
@ -4648,7 +4648,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
*params = ctx->Array.LockCount;
break;
/* GL_ARB_transpose_matrix */
case GL_TRANSPOSE_COLOR_MATRIX_ARB:
{
@ -4810,10 +4810,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
/* GL_EXT_secondary_color */
case GL_COLOR_SUM_EXT:
case GL_COLOR_SUM_EXT:
*params = (GLint) ctx->Fog.ColorSumEnabled;
break;
case GL_CURRENT_SECONDARY_COLOR_EXT:
case GL_CURRENT_SECONDARY_COLOR_EXT:
FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
params[0] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[0] ) );
params[1] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[1] ) );
@ -4822,28 +4822,28 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
case GL_SECONDARY_COLOR_ARRAY_EXT:
*params = (GLint) ctx->Array.SecondaryColor.Enabled;
break;
case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
*params = (GLint) ctx->Array.SecondaryColor.Type;
break;
case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
*params = (GLint) ctx->Array.SecondaryColor.Stride;
break;
case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
*params = (GLint) ctx->Array.SecondaryColor.Stride;
break;
/* GL_EXT_fog_coord */
case GL_CURRENT_FOG_COORDINATE_EXT:
case GL_CURRENT_FOG_COORDINATE_EXT:
FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
*params = (GLint) ctx->Current.FogCoord;
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
*params = (GLint) ctx->Array.FogCoord.Enabled;
break;
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
*params = (GLint) ctx->Array.FogCoord.Type;
break;
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
*params = (GLint) ctx->Array.FogCoord.Stride;
break;
@ -4865,7 +4865,7 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
if (!params)
return;
if (MESA_VERBOSE & VERBOSE_API)
if (MESA_VERBOSE & VERBOSE_API)
fprintf(stderr, "glGetPointerv %s\n", gl_lookup_enum_by_nr(pname));
if (ctx->Driver.GetPointerv

12
src/mesa/main/get.h
View file

@ -1,21 +1,21 @@
/* $Id: get.h,v 1.3 1999/11/11 01:22:26 brianp Exp $ */
/* $Id: get.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define GET_H
#include "types.h"
#include "mtypes.h"
extern void

12
src/mesa/main/hint.h
View file

@ -1,21 +1,21 @@
/* $Id: hint.h,v 1.1 2000/02/02 19:14:56 brianp Exp $ */
/* $Id: hint.h,v 1.2 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define HINT_H
#include "types.h"
#include "mtypes.h"
extern GLboolean

4
src/mesa/main/histogram.h
View file

@ -1,4 +1,4 @@
/* $Id: histogram.h,v 1.1 2000/11/10 18:06:14 brianp Exp $ */
/* $Id: histogram.h,v 1.2 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
@ -33,7 +33,7 @@
#include "all.h"
#else
#include "glheader.h"
#include "types.h"
#include "mtypes.h"
#endif

26
src/mesa/main/image.c
View file

@ -1,21 +1,21 @@
/* $Id: image.c,v 1.48 2000/11/10 18:06:14 brianp Exp $ */
/* $Id: image.c,v 1.49 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -37,7 +37,7 @@
#include "mem.h"
#include "mmath.h"
#include "pixel.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -1997,7 +1997,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
alphaIndex = 0;
stride = 1;
break;
case GL_LUMINANCE:
case GL_LUMINANCE:
redIndex = greenIndex = blueIndex = 0;
alphaIndex = -1;
stride = 1;
@ -2345,7 +2345,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
GLuint i;
for (i = 0; i < n; i ++) {
GLuint p = uisrc[i];
rgba[i][rComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 24) );
rgba[i][rComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 24) );
rgba[i][gComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 16) & 0xff);
rgba[i][bComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 8) & 0xff);
rgba[i][aComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p ) & 0xff);
@ -2359,7 +2359,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
rgba[i][rComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p ) & 0xff);
rgba[i][gComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 8) & 0xff);
rgba[i][bComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 16) & 0xff);
rgba[i][aComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 24) );
rgba[i][aComp] = UBYTE_COLOR_TO_FLOAT_COLOR((p >> 24) );
}
}
break;
@ -2447,7 +2447,7 @@ _mesa_unpack_chan_color_span( GLcontext *ctx,
GLuint transferOps )
{
ASSERT(dstFormat == GL_ALPHA ||
dstFormat == GL_LUMINANCE ||
dstFormat == GL_LUMINANCE ||
dstFormat == GL_LUMINANCE_ALPHA ||
dstFormat == GL_INTENSITY ||
dstFormat == GL_RGB ||
@ -2648,7 +2648,7 @@ _mesa_unpack_chan_color_span( GLcontext *ctx,
dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
dstLuminanceIndex = dstIntensityIndex = -1;
break;
case GL_LUMINANCE:
case GL_LUMINANCE:
dstLuminanceIndex = 0;
dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
dstIntensityIndex = -1;
@ -2755,7 +2755,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
GLuint transferOps, GLboolean clamp )
{
ASSERT(dstFormat == GL_ALPHA ||
dstFormat == GL_LUMINANCE ||
dstFormat == GL_LUMINANCE ||
dstFormat == GL_LUMINANCE_ALPHA ||
dstFormat == GL_INTENSITY ||
dstFormat == GL_RGB ||
@ -2906,7 +2906,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
dstRedIndex = dstGreenIndex = dstBlueIndex = -1;
dstLuminanceIndex = dstIntensityIndex = -1;
break;
case GL_LUMINANCE:
case GL_LUMINANCE:
dstLuminanceIndex = 0;
dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
dstIntensityIndex = -1;

12
src/mesa/main/image.h
View file

@ -1,21 +1,21 @@
/* $Id: image.h,v 1.13 2000/10/29 18:12:15 brianp Exp $ */
/* $Id: image.h,v 1.14 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define IMAGE_H
#include "types.h"
#include "mtypes.h"
extern const struct gl_pixelstore_attrib _mesa_native_packing;

4
src/mesa/main/imports.c
View file

@ -1,4 +1,4 @@
/* $Id: imports.c,v 1.2 2000/09/27 03:30:49 brianp Exp $ */
/* $Id: imports.c,v 1.3 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
@ -42,7 +42,7 @@
#include "glheader.h"
#include "imports.h"
#include "mem.h"
#include "types.h"
#include "mtypes.h"
static void *

106
src/mesa/main/light.c
View file

@ -1,21 +1,21 @@
/* $Id: light.c,v 1.26 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: light.c,v 1.27 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -37,7 +37,7 @@
#include "mem.h"
#include "mmath.h"
#include "simple_list.h"
#include "types.h"
#include "mtypes.h"
#include "math/m_xform.h"
#include "math/m_matrix.h"
@ -69,7 +69,7 @@ _mesa_ShadeModel( GLenum mode )
ctx->NewState |= _NEW_LIGHT;
if (ctx->Driver.ShadeModel)
if (ctx->Driver.ShadeModel)
(*ctx->Driver.ShadeModel)( ctx, mode );
}
}
@ -114,7 +114,7 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
case GL_POSITION:
/* transform position by ModelView matrix */
TRANSFORM_POINT( l->EyePosition, ctx->ModelView.m, params );
if (l->EyePosition[3] != 0.0F)
if (l->EyePosition[3] != 0.0F)
l->_Flags |= LIGHT_POSITIONAL;
else
l->_Flags &= ~LIGHT_POSITIONAL;
@ -143,7 +143,7 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
}
l->SpotCutoff = params[0];
l->_CosCutoff = cos(params[0]*DEG2RAD);
if (l->_CosCutoff < 0)
if (l->_CosCutoff < 0)
l->_CosCutoff = 0;
if (l->SpotCutoff != 180.0F)
l->_Flags |= LIGHT_SPOT;
@ -372,7 +372,7 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params )
ctx->Light.Model.LocalViewer = GL_TRUE;
break;
case GL_LIGHT_MODEL_TWO_SIDE:
if (params[0]==0.0)
if (params[0]==0.0)
ctx->Light.Model.TwoSide = GL_FALSE;
else
ctx->Light.Model.TwoSide = GL_TRUE;
@ -396,7 +396,7 @@ _mesa_LightModelfv( GLenum pname, const GLfloat *params )
break;
}
if (ctx->Driver.LightModelfv)
if (ctx->Driver.LightModelfv)
ctx->Driver.LightModelfv( ctx, pname, params );
ctx->NewState |= _NEW_LIGHT;
@ -452,7 +452,7 @@ _mesa_LightModelf( GLenum pname, GLfloat param )
* Given a face and pname value (ala glColorMaterial), compute a bitmask
* of the targeted material values.
*/
GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
GLuint legal,
const char *where )
{
@ -497,7 +497,7 @@ GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
gl_error( ctx, GL_INVALID_ENUM, where );
return 0;
}
if (bitmask & ~legal) {
gl_error( ctx, GL_INVALID_ENUM, where );
return 0;
@ -519,12 +519,12 @@ GLuint gl_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
*
* KW: Added code here to keep the precomputed variables uptodate.
* This means we can use the faster shade functions when using
* GL_COLOR_MATERIAL, and we can also now use the precomputed
* GL_COLOR_MATERIAL, and we can also now use the precomputed
* values in the slower shading functions, which further offsets
* the cost of doing this here.
*/
void gl_update_material( GLcontext *ctx,
const struct gl_material src[2],
void gl_update_material( GLcontext *ctx,
const struct gl_material src[2],
GLuint bitmask )
{
struct gl_light *light, *list = &ctx->Light.EnabledList;
@ -532,10 +532,10 @@ void gl_update_material( GLcontext *ctx,
if (ctx->Light.ColorMaterialEnabled)
bitmask &= ~ctx->Light.ColorMaterialBitmask;
if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
fprintf(stderr, "gl_update_material, mask 0x%x\n", bitmask);
if (!bitmask)
if (!bitmask)
return;
/* update material emission */
@ -605,7 +605,7 @@ void gl_update_material( GLcontext *ctx,
SUB_3V( tmp, src[0].Specular, mat->Specular );
foreach (light, list) {
ACC_SCALE_3V( light->_MatSpecular[0], light->Specular, tmp );
light->_IsMatSpecular[0] =
light->_IsMatSpecular[0] =
(LEN_SQUARED_3FV(light->_MatSpecular[0]) > 1e-16);
}
COPY_4FV( mat->Specular, src[0].Specular );
@ -616,7 +616,7 @@ void gl_update_material( GLcontext *ctx,
SUB_3V( tmp, src[1].Specular, mat->Specular );
foreach (light, list) {
ACC_SCALE_3V( light->_MatSpecular[1], light->Specular, tmp );
light->_IsMatSpecular[1] =
light->_IsMatSpecular[1] =
(LEN_SQUARED_3FV(light->_MatSpecular[1]) > 1e-16);
}
COPY_4FV( mat->Specular, src[1].Specular );
@ -674,7 +674,7 @@ void gl_update_material( GLcontext *ctx,
* according to the bitmask in ColorMaterialBitmask, which is
* set by glColorMaterial().
*/
void gl_update_color_material( GLcontext *ctx,
void gl_update_color_material( GLcontext *ctx,
const GLchan rgba[4] )
{
struct gl_light *light, *list = &ctx->Light.EnabledList;
@ -760,7 +760,7 @@ void gl_update_color_material( GLcontext *ctx,
SUB_3V( tmp, color, mat->Specular );
foreach (light, list) {
ACC_SCALE_3V( light->_MatSpecular[0], light->Specular, tmp );
light->_IsMatSpecular[0] =
light->_IsMatSpecular[0] =
(LEN_SQUARED_3FV(light->_MatSpecular[0]) > 1e-16);
}
COPY_4FV( mat->Specular, color );
@ -772,7 +772,7 @@ void gl_update_color_material( GLcontext *ctx,
SUB_3V( tmp, color, mat->Specular );
foreach (light, list) {
ACC_SCALE_3V( light->_MatSpecular[1], light->Specular, tmp );
light->_IsMatSpecular[1] =
light->_IsMatSpecular[1] =
(LEN_SQUARED_3FV(light->_MatSpecular[1]) > 1e-16);
}
COPY_4FV( mat->Specular, color );
@ -815,8 +815,8 @@ _mesa_ColorMaterial( GLenum face, GLenum mode )
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorMaterial");
if (MESA_VERBOSE&VERBOSE_API)
fprintf(stderr, "glColorMaterial %s %s\n",
if (MESA_VERBOSE&VERBOSE_API)
fprintf(stderr, "glColorMaterial %s %s\n",
gl_lookup_enum_by_nr(face),
gl_lookup_enum_by_nr(mode));
@ -1002,7 +1002,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
* orientation of the facet is later learned, we can determine which
* color (or index) to use for rendering.
*
* KW: We now know orientation in advance and only shade for
* KW: We now know orientation in advance and only shade for
* the side or sides which are actually required.
*
* Variables:
@ -1016,7 +1016,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params )
* // light at infinity
* IF local_viewer THEN
* _VP_inf_norm = unit vector from V to P // Precompute
* ELSE
* ELSE
* // eye at infinity
* _h_inf_norm = Normalize( VP + <0,0,1> ) // Precompute
* ENDIF
@ -1084,7 +1084,7 @@ compute_shine_table( struct gl_shine_tab *tab, GLfloat shininess )
m[i] = t;
else
m[i] = 0.0;
}
}
m[SHINE_TABLE_SIZE] = 1.0;
}
@ -1099,12 +1099,12 @@ gl_compute_shine_table( GLcontext *ctx, GLuint i, GLfloat shininess )
struct gl_shine_tab *list = ctx->_ShineTabList;
struct gl_shine_tab *s;
foreach(s, list)
if ( DISTSQR(s->shininess, shininess) < 1e-4 )
foreach(s, list)
if ( DISTSQR(s->shininess, shininess) < 1e-4 )
break;
if (s == list) {
foreach(s, list)
foreach(s, list)
if (s->refcount == 0)
break;
@ -1135,8 +1135,8 @@ gl_update_lighting( GLcontext *ctx )
ctx->_NeedEyeCoords &= ~NEED_EYE_LIGHT;
ctx->_NeedNormals &= ~NEED_NORMALS_LIGHT;
ctx->Light._Flags = 0;
if (!ctx->Light.Enabled)
if (!ctx->Light.Enabled)
return;
ctx->_NeedNormals |= NEED_NORMALS_LIGHT;
@ -1148,23 +1148,23 @@ gl_update_lighting( GLcontext *ctx )
ctx->Light._Flags |= light->_Flags;
}
ctx->Light._NeedVertices =
ctx->Light._NeedVertices =
((ctx->Light._Flags & (LIGHT_POSITIONAL|LIGHT_SPOT)) ||
ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR ||
ctx->Light.Model.LocalViewer);
if ((ctx->Light._Flags & LIGHT_POSITIONAL) ||
ctx->Light.Model.LocalViewer)
if ((ctx->Light._Flags & LIGHT_POSITIONAL) ||
ctx->Light.Model.LocalViewer)
ctx->_NeedEyeCoords |= NEED_EYE_LIGHT;
/* XXX: This test is overkill & needs to be fixed both for software and
* hardware t&l drivers. The above should be sufficient & should
* be tested to verify this.
* be tested to verify this.
*/
if (ctx->Light._NeedVertices)
ctx->_NeedEyeCoords |= NEED_EYE_LIGHT;
/* Precompute some shading values.
*/
@ -1175,26 +1175,26 @@ gl_update_lighting( GLcontext *ctx )
struct gl_material *mat = &ctx->Light.Material[side];
COPY_3V(ctx->Light._BaseColor[side], mat->Emission);
ACC_SCALE_3V(ctx->Light._BaseColor[side],
ACC_SCALE_3V(ctx->Light._BaseColor[side],
ctx->Light.Model.Ambient,
mat->Ambient);
FLOAT_COLOR_TO_CHAN(ctx->Light._BaseAlpha[side],
ctx->Light.Material[side].Diffuse[3] );
}
foreach (light, &ctx->Light.EnabledList) {
foreach (light, &ctx->Light.EnabledList) {
for (side=0; side< sides; side++) {
const struct gl_material *mat = &ctx->Light.Material[side];
SCALE_3V( light->_MatDiffuse[side], light->Diffuse, mat->Diffuse );
SCALE_3V( light->_MatAmbient[side], light->Ambient, mat->Ambient );
SCALE_3V( light->_MatSpecular[side], light->Specular,
mat->Specular);
light->_IsMatSpecular[side] =
light->_IsMatSpecular[side] =
(LEN_SQUARED_3FV(light->_MatSpecular[side]) > 1e-16);
}
}
}
}
else {
static const GLfloat ci[3] = { .30, .59, .11 };
foreach(light, &ctx->Light.EnabledList) {
@ -1227,14 +1227,14 @@ gl_compute_light_positions( GLcontext *ctx )
else {
TRANSFORM_NORMAL( ctx->_EyeZDir, eye_z, ctx->ModelView.m );
}
foreach (light, &ctx->Light.EnabledList) {
if (ctx->_NeedEyeCoords) {
COPY_4FV( light->_Position, light->EyePosition );
}
else {
TRANSFORM_POINT( light->_Position, ctx->ModelView.inv,
TRANSFORM_POINT( light->_Position, ctx->ModelView.inv,
light->EyePosition );
}
@ -1250,13 +1250,13 @@ gl_compute_light_positions( GLcontext *ctx )
}
light->_VP_inf_spot_attenuation = 1.0;
}
if (light->_Flags & LIGHT_SPOT) {
if (ctx->_NeedEyeCoords) {
COPY_3V( light->_NormDirection, light->EyeDirection );
}
else {
TRANSFORM_NORMAL( light->_NormDirection,
TRANSFORM_NORMAL( light->_NormDirection,
light->EyeDirection,
ctx->ModelView.m);
}
@ -1264,14 +1264,14 @@ gl_compute_light_positions( GLcontext *ctx )
NORMALIZE_3FV( light->_NormDirection );
if (!(light->_Flags & LIGHT_POSITIONAL)) {
GLfloat PV_dot_dir = - DOT3(light->_VP_inf_norm,
GLfloat PV_dot_dir = - DOT3(light->_VP_inf_norm,
light->_NormDirection);
if (PV_dot_dir > light->_CosCutoff) {
double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
int k = (int) x;
light->_VP_inf_spot_attenuation =
(light->_SpotExpTable[k][0] +
light->_VP_inf_spot_attenuation =
(light->_SpotExpTable[k][0] +
(x-k)*light->_SpotExpTable[k][1]);
}
else {

24
src/mesa/main/light.h
View file

@ -1,21 +1,21 @@
/* $Id: light.h,v 1.5 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: light.h,v 1.6 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define LIGHT_H
#include "types.h"
#include "mtypes.h"
extern void
@ -89,7 +89,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
/* Lerp between adjacent values in the f(x) lookup table, giving a
* continuous function, with adequeate overall accuracy. (Though
* still pretty good compared to a straight lookup).
* still pretty good compared to a straight lookup).
*/
#define GET_SHINE_TAB_ENTRY( table, dp, result ) \
do { \
@ -105,8 +105,8 @@ do { \
extern GLuint gl_material_bitmask( GLcontext *ctx,
GLenum face, GLenum pname,
extern GLuint gl_material_bitmask( GLcontext *ctx,
GLenum face, GLenum pname,
GLuint legal,
const char * );
@ -115,15 +115,15 @@ extern void gl_set_material( GLcontext *ctx, GLuint bitmask,
extern void gl_compute_spot_exp_table( struct gl_light *l );
extern void gl_compute_shine_table( GLcontext *ctx, GLuint i,
extern void gl_compute_shine_table( GLcontext *ctx, GLuint i,
GLfloat shininess );
extern void gl_update_lighting( GLcontext *ctx );
extern void gl_compute_light_positions( GLcontext *ctx );
extern void gl_update_material( GLcontext *ctx,
const struct gl_material src[2],
extern void gl_update_material( GLcontext *ctx,
const struct gl_material src[2],
GLuint bitmask );
extern void gl_update_color_material( GLcontext *ctx, const GLchan rgba[4] );

14
src/mesa/main/lines.c
View file

@ -1,21 +1,21 @@
/* $Id: lines.c,v 1.22 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: lines.c,v 1.23 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -36,7 +36,7 @@
#include "macros.h"
#include "mmath.h"
#include "texstate.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -50,7 +50,7 @@ _mesa_LineWidth( GLfloat width )
return;
}
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glLineWidth");
if (ctx->Line.Width != width) {
ctx->Line.Width = width;
ctx->_TriangleCaps &= ~DD_LINE_WIDTH;

12
src/mesa/main/lines.h
View file

@ -1,21 +1,21 @@
/* $Id: lines.h,v 1.3 2000/10/31 18:09:44 keithw Exp $ */
/* $Id: lines.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define LINES_H
#include "types.h"
#include "mtypes.h"
extern void

40
src/mesa/main/matrix.c
View file

@ -1,21 +1,21 @@
/* $Id: matrix.c,v 1.26 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: matrix.c,v 1.27 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -46,7 +46,7 @@
#include "matrix.h"
#include "mem.h"
#include "mmath.h"
#include "types.h"
#include "mtypes.h"
#include "math/m_matrix.h"
#endif
@ -95,15 +95,15 @@ _mesa_Frustum( GLdouble left, GLdouble right,
GET_ACTIVE_MATRIX( ctx, mat, ctx->NewState, "glFrustrum" );
if (nearval <= 0.0 ||
farval <= 0.0 ||
nearval == farval ||
left == right ||
top == bottom)
farval <= 0.0 ||
nearval == farval ||
left == right ||
top == bottom)
{
gl_error( ctx, GL_INVALID_VALUE, "glFrustum" );
return;
}
_math_matrix_frustrum( mat, left, right, bottom, top, nearval, farval );
}
@ -117,10 +117,10 @@ _mesa_Ortho( GLdouble left, GLdouble right,
GLmatrix *mat = 0;
GET_ACTIVE_MATRIX( ctx, mat, ctx->NewState, "glOrtho" );
if (left == right ||
bottom == top ||
nearval == farval)
if (left == right ||
bottom == top ||
nearval == farval)
{
gl_error( ctx, GL_INVALID_VALUE, "gl_Ortho" );
return;
@ -156,7 +156,7 @@ _mesa_PushMatrix( void )
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPushMatrix");
if (MESA_VERBOSE&VERBOSE_API)
fprintf(stderr, "glPushMatrix %s\n",
fprintf(stderr, "glPushMatrix %s\n",
gl_lookup_enum_by_nr(ctx->Transform.MatrixMode));
switch (ctx->Transform.MatrixMode) {
@ -209,7 +209,7 @@ _mesa_PopMatrix( void )
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPopMatrix");
if (MESA_VERBOSE&VERBOSE_API)
fprintf(stderr, "glPopMatrix %s\n",
fprintf(stderr, "glPopMatrix %s\n",
gl_lookup_enum_by_nr(ctx->Transform.MatrixMode));
switch (ctx->Transform.MatrixMode) {
@ -306,7 +306,7 @@ _mesa_MultMatrixf( const GLfloat *m )
/*
* Multiply the active matrix by an arbitary matrix.
* Multiply the active matrix by an arbitary matrix.
*/
void
_mesa_MultMatrixd( const GLdouble *m )
@ -450,7 +450,7 @@ gl_Viewport( GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height )
if (MESA_VERBOSE & VERBOSE_API)
fprintf(stderr, "glViewport %d %d %d %d\n", x, y, width, height);
/* clamp width, and height to implementation dependent range */
width = CLAMP( width, 1, MAX_WIDTH );
height = CLAMP( height, 1, MAX_HEIGHT );
@ -503,7 +503,7 @@ _mesa_DepthRange( GLclampd nearval, GLclampd farval )
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glDepthRange");
if (MESA_VERBOSE&VERBOSE_API)
fprintf(stderr, "glDepthRange %f %f\n", nearval, farval);
fprintf(stderr, "glDepthRange %f %f\n", nearval, farval);
n = (GLfloat) CLAMP( nearval, 0.0, 1.0 );
f = (GLfloat) CLAMP( farval, 0.0, 1.0 );

12
src/mesa/main/matrix.h
View file

@ -1,21 +1,21 @@
/* $Id: matrix.h,v 1.9 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: matrix.h,v 1.10 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define MATRIX_H
#include "types.h"
#include "mtypes.h"
#ifdef VMS

1712
src/mesa/main/mtypes.h Normal file
View file

File diff suppressed because it is too large Load diff

12
src/mesa/main/pixel.c
View file

@ -1,21 +1,21 @@
/* $Id: pixel.c,v 1.18 2000/10/30 16:32:43 brianp Exp $ */
/* $Id: pixel.c,v 1.19 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -34,7 +34,7 @@
#include "macros.h"
#include "mem.h"
#include "pixel.h"
#include "types.h"
#include "mtypes.h"
#endif

12
src/mesa/main/pixel.h
View file

@ -1,21 +1,21 @@
/* $Id: pixel.h,v 1.6 2000/10/29 18:12:15 brianp Exp $ */
/* $Id: pixel.h,v 1.7 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define PIXEL_H
#include "types.h"
#include "mtypes.h"
/*

12
src/mesa/main/points.c
View file

@ -1,21 +1,21 @@
/* $Id: points.c,v 1.23 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: points.c,v 1.24 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.4
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -35,7 +35,7 @@
#include "mmath.h"
#include "points.h"
#include "texstate.h"
#include "types.h"
#include "mtypes.h"
#endif

12
src/mesa/main/points.h
View file

@ -1,21 +1,21 @@
/* $Id: points.h,v 1.3 2000/10/31 18:09:44 keithw Exp $ */
/* $Id: points.h,v 1.4 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -32,7 +32,7 @@
#define POINTS_H
#include "types.h"
#include "mtypes.h"
extern void

16
src/mesa/main/polygon.c
View file

@ -1,21 +1,21 @@
/* $Id: polygon.c,v 1.15 2000/11/05 18:40:58 keithw Exp $ */
/* $Id: polygon.c,v 1.16 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -35,7 +35,7 @@
#include "macros.h"
#include "mem.h"
#include "polygon.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -94,7 +94,7 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glPolygonMode");
if (MESA_VERBOSE&VERBOSE_API)
fprintf(stderr, "glPolygonMode %s %s\n",
fprintf(stderr, "glPolygonMode %s %s\n",
gl_lookup_enum_by_nr(face),
gl_lookup_enum_by_nr(mode));
@ -144,7 +144,7 @@ _mesa_PolygonStipple( const GLubyte *pattern )
_mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
ctx->NewState |= _NEW_POLYGONSTIPPLE;
if (ctx->Driver.PolygonStipple)
ctx->Driver.PolygonStipple( ctx, (const GLubyte *) ctx->PolygonStipple );
}

12
src/mesa/main/polygon.h
View file

@ -1,21 +1,21 @@
/* $Id: polygon.h,v 1.2 1999/11/11 01:22:27 brianp Exp $ */
/* $Id: polygon.h,v 1.3 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define POLYGON_H
#include "types.h"
#include "mtypes.h"
extern void

60
src/mesa/main/rastpos.c
View file

@ -1,21 +1,21 @@
/* $Id: rastpos.c,v 1.14 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: rastpos.c,v 1.15 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -39,7 +39,7 @@
#include "rastpos.h"
#include "state.h"
#include "simple_list.h"
#include "types.h"
#include "mtypes.h"
#include "math/m_matrix.h"
#include "math/m_xform.h"
@ -91,7 +91,7 @@ static GLuint gl_userclip_point( GLcontext* ctx, const GLfloat v[] )
/* This has been split off to allow the normal shade routines to
* get a little closer to the vertex buffer, and to use the
* get a little closer to the vertex buffer, and to use the
* GLvector objects directly.
*/
static void gl_shade_rastpos( GLcontext *ctx,
@ -112,7 +112,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
foreach (light, &ctx->Light.EnabledList) {
GLfloat n_dot_h;
GLfloat attenuation = 1.0;
GLfloat VP[3];
GLfloat VP[3];
GLfloat n_dot_VP;
GLfloat *h;
GLfloat contrib[3];
@ -123,27 +123,27 @@ static void gl_shade_rastpos( GLcontext *ctx,
attenuation = light->_VP_inf_spot_attenuation;
}
else {
GLfloat d;
GLfloat d;
SUB_3V(VP, light->_Position, vertex);
d = LEN_3FV( VP );
if ( d > 1e-6) {
GLfloat invd = 1.0F / d;
SELF_SCALE_SCALAR_3V(VP, invd);
}
attenuation = 1.0F / (light->ConstantAttenuation + d *
(light->LinearAttenuation + d *
attenuation = 1.0F / (light->ConstantAttenuation + d *
(light->LinearAttenuation + d *
light->QuadraticAttenuation));
if (light->_Flags & LIGHT_SPOT)
if (light->_Flags & LIGHT_SPOT)
{
GLfloat PV_dot_dir = - DOT3(VP, light->_NormDirection);
if (PV_dot_dir<light->_CosCutoff) {
continue;
continue;
}
else
else
{
double x = PV_dot_dir * (EXP_TABLE_SIZE-1);
int k = (int) x;
@ -154,7 +154,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
}
}
if (attenuation < 1e-3)
if (attenuation < 1e-3)
continue;
n_dot_VP = DOT3( normal, VP );
@ -162,7 +162,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
if (n_dot_VP < 0.0F) {
ACC_SCALE_SCALAR_3V(color, attenuation, light->_MatAmbient[0]);
continue;
}
}
COPY_3V(contrib, light->_MatAmbient[0]);
ACC_SCALE_SCALAR_3V(contrib, n_dot_VP, light->_MatDiffuse[0]);
@ -186,7 +186,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
h = light->_h_inf_norm;
normalized = 1;
}
n_dot_h = DOT3(normal, h);
if (n_dot_h > 0.0F) {
@ -199,7 +199,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
n_dot_h /= LEN_SQUARED_3FV( h );
shininess *= .5;
}
GET_SHINE_TAB_ENTRY( ctx->_ShineTable[0], n_dot_h, spec_coef );
if (spec_coef > 1.0e-10) {
@ -211,7 +211,7 @@ static void gl_shade_rastpos( GLcontext *ctx,
}
ACC_SCALE_SCALAR_3V( color, attenuation, contrib );
}
}
if (ctx->Visual.RGBAflag) {
Rcolor[0] = CLAMP(color[0], 0.0F, 1.0F);
@ -244,7 +244,7 @@ static void raster_pos4f( GLcontext *ctx,
/* KW: Added this test, which is in the spec. We can't do this
* inside begin/end any more because the ctx->Current values
* aren't uptodate during that period.
* aren't uptodate during that period.
*/
FLUSH_TNL_RETURN(ctx, (FLUSH_INSIDE_BEGIN_END|
FLUSH_STORED_VERTICES|
@ -257,7 +257,7 @@ static void raster_pos4f( GLcontext *ctx,
TRANSFORM_POINT( eye, ctx->ModelView.m, v );
/* raster color */
if (ctx->Light.Enabled)
if (ctx->Light.Enabled)
{
GLfloat *norm, eyenorm[3];
GLfloat *objnorm = ctx->Current.Normal;
@ -270,7 +270,7 @@ static void raster_pos4f( GLcontext *ctx,
norm = objnorm;
}
gl_shade_rastpos( ctx, v, norm,
gl_shade_rastpos( ctx, v, norm,
ctx->Current.RasterColor,
&ctx->Current.RasterIndex );
@ -303,7 +303,7 @@ static void raster_pos4f( GLcontext *ctx,
/* clip to user clipping planes */
if ( ctx->Transform._AnyClip &&
gl_userclip_point(ctx, clip) == 0)
gl_userclip_point(ctx, clip) == 0)
{
ctx->Current.RasterPosValid = GL_FALSE;
return;
@ -316,11 +316,11 @@ static void raster_pos4f( GLcontext *ctx,
ndc[1] = clip[1] * d;
ndc[2] = clip[2] * d;
ctx->Current.RasterPos[0] = (ndc[0] * ctx->Viewport._WindowMap.m[MAT_SX] +
ctx->Current.RasterPos[0] = (ndc[0] * ctx->Viewport._WindowMap.m[MAT_SX] +
ctx->Viewport._WindowMap.m[MAT_TX]);
ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport._WindowMap.m[MAT_SY] +
ctx->Current.RasterPos[1] = (ndc[1] * ctx->Viewport._WindowMap.m[MAT_SY] +
ctx->Viewport._WindowMap.m[MAT_TY]);
ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport._WindowMap.m[MAT_SZ] +
ctx->Current.RasterPos[2] = (ndc[2] * ctx->Viewport._WindowMap.m[MAT_SZ] +
ctx->Viewport._WindowMap.m[MAT_TZ]) / ctx->Visual.DepthMaxF;
ctx->Current.RasterPos[3] = clip[3];
ctx->Current.RasterPosValid = GL_TRUE;

48
src/mesa/main/state.c
View file

@ -1,4 +1,4 @@
/* $Id: state.c,v 1.46 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: state.c,v 1.47 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
@ -76,7 +76,7 @@
#include "texobj.h"
#include "texstate.h"
#include "texture.h"
#include "types.h"
#include "mtypes.h"
#include "varray.h"
#include "winpos.h"
@ -725,7 +725,7 @@ update_polygon( GLcontext *ctx )
ctx->_TriangleCaps |= DD_TRI_OFFSET;
}
static void
static void
calculate_model_project_matrix( GLcontext *ctx )
{
if (!ctx->_NeedEyeCoords) {
@ -756,13 +756,13 @@ update_modelview_scale( GLcontext *ctx )
}
/* Bring uptodate any state that relies on _NeedEyeCoords.
/* Bring uptodate any state that relies on _NeedEyeCoords.
*/
static void
update_tnl_spaces( GLcontext *ctx, GLuint oldneedeyecoords )
{
{
/* Check if the truth-value interpretations of the bitfields have
* changed:
* changed:
*/
if ((oldneedeyecoords == 0) != (ctx->_NeedEyeCoords == 0)) {
/* Recalculate all state that depends on _NeedEyeCoords.
@ -780,12 +780,12 @@ update_tnl_spaces( GLcontext *ctx, GLuint oldneedeyecoords )
/* Recalculate that same state if and only if it has been
* invalidated by other statechanges.
*/
if (new_state & _NEW_MODELVIEW)
if (new_state & _NEW_MODELVIEW)
update_modelview_scale(ctx);
if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
calculate_model_project_matrix(ctx);
if (new_state & (_NEW_LIGHT|_NEW_MODELVIEW))
gl_compute_light_positions( ctx );
}
@ -825,7 +825,7 @@ static void
update_projection( GLcontext *ctx )
{
_math_matrix_analyze( &ctx->ProjectionMatrix );
/* Recompute clip plane positions in clipspace. This is also done
* in _mesa_ClipPlane().
*/
@ -860,7 +860,7 @@ update_image_transfer_state(GLcontext *ctx)
if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset)
mask |= IMAGE_SHIFT_OFFSET_BIT;
if (ctx->Pixel.MapColorFlag)
mask |= IMAGE_MAP_COLOR_BIT;
@ -910,7 +910,7 @@ update_image_transfer_state(GLcontext *ctx)
* state references this value, and must be treated with care to
* ensure that updates are done correctly. All state dependent on
* _NeedEyeCoords is calculated from within _mesa_update_tnl_spaces(),
* and from nowhere else.
* and from nowhere else.
*/
void gl_update_state( GLcontext *ctx )
{
@ -920,18 +920,18 @@ void gl_update_state( GLcontext *ctx )
if (MESA_VERBOSE & VERBOSE_STATE)
gl_print_state("", new_state);
if (new_state & _NEW_MODELVIEW)
if (new_state & _NEW_MODELVIEW)
_math_matrix_analyze( &ctx->ModelView );
if (new_state & _NEW_PROJECTION)
if (new_state & _NEW_PROJECTION)
update_projection( ctx );
if (new_state & _NEW_TEXTURE_MATRIX)
if (new_state & _NEW_TEXTURE_MATRIX)
_mesa_update_texture_matrices( ctx );
if (new_state & _NEW_COLOR_MATRIX)
if (new_state & _NEW_COLOR_MATRIX)
_math_matrix_analyze( &ctx->ColorMatrix );
/* References ColorMatrix.type (derived above).
*/
if (new_state & (_NEW_PIXEL|_NEW_COLOR_MATRIX))
@ -939,18 +939,18 @@ void gl_update_state( GLcontext *ctx )
/* Contributes to NeedEyeCoords, NeedNormals.
*/
if (new_state & _NEW_TEXTURE)
if (new_state & _NEW_TEXTURE)
_mesa_update_texture_state( ctx );
if (new_state & (_NEW_BUFFERS|_NEW_SCISSOR))
if (new_state & (_NEW_BUFFERS|_NEW_SCISSOR))
update_drawbuffer( ctx );
if (new_state & _NEW_POLYGON)
if (new_state & _NEW_POLYGON)
update_polygon( ctx );
/* Contributes to NeedEyeCoords, NeedNormals.
*/
if (new_state & _NEW_LIGHT)
if (new_state & _NEW_LIGHT)
gl_update_lighting( ctx );
/* We can light in object space if the modelview matrix preserves
@ -968,15 +968,15 @@ void gl_update_state( GLcontext *ctx )
* If the truth value of either has changed, update for the new
* lighting space and recompute the positions of lights and the
* normal transform.
*
*
* If the lighting space hasn't changed, may still need to recompute
* light positions & normal transforms for other reasons.
* light positions & normal transforms for other reasons.
*/
if (new_state & (_NEW_MODELVIEW |
_NEW_PROJECTION |
_TNL_NEW_NORMAL_TRANSFORM |
_NEW_LIGHT |
_TNL_NEW_NEED_EYE_COORDS))
_TNL_NEW_NEED_EYE_COORDS))
update_tnl_spaces( ctx, oldneedeyecoords );
/*

12
src/mesa/main/state.h
View file

@ -1,21 +1,21 @@
/* $Id: state.h,v 1.4 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: state.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,7 +28,7 @@
#ifndef STATE_H
#define STATE_H
#include "types.h"
#include "mtypes.h"
extern void

12
src/mesa/main/stencil.c
View file

@ -1,21 +1,21 @@
/* $Id: stencil.c,v 1.22 2000/10/31 18:09:45 keithw Exp $ */
/* $Id: stencil.c,v 1.23 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -34,7 +34,7 @@
#include "macros.h"
#include "mem.h"
#include "stencil.h"
#include "types.h"
#include "mtypes.h"
#include "enable.h"
#endif

12
src/mesa/main/stencil.h
View file

@ -1,21 +1,21 @@
/* $Id: stencil.h,v 1.7 2000/10/31 18:09:45 keithw Exp $ */
/* $Id: stencil.h,v 1.8 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define STENCIL_H
#include "types.h"
#include "mtypes.h"
extern void

24
src/mesa/main/teximage.c
View file

@ -1,21 +1,21 @@
/* $Id: teximage.c,v 1.64 2000/11/21 23:25:40 brianp Exp $ */
/* $Id: teximage.c,v 1.65 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -38,7 +38,7 @@
#include "state.h"
#include "teximage.h"
#include "texstate.h"
#include "types.h"
#include "mtypes.h"
#include "swrast/s_span.h" /* XXX SWRAST hack */
#endif
@ -759,7 +759,7 @@ fill_texture_image( GLcontext *ctx, GLuint dimensions,
}
return; /* all done */
}
}
}
/*
* General case solutions
@ -829,7 +829,7 @@ fill_texture_image( GLcontext *ctx, GLuint dimensions,
ASSERT(ctx->Pixel.Convolution1DEnabled);
_mesa_convolve_1d_image(ctx, &convWidth, tmpImage, convImage);
}
else {
else {
if (ctx->Pixel.Convolution2DEnabled) {
_mesa_convolve_2d_image(ctx, &convWidth, &convHeight,
tmpImage, convImage);
@ -2657,7 +2657,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
if (ctx->NewState & _NEW_PIXEL)
gl_update_state(ctx);
if (ctx->_ImageTransferState || !ctx->Driver.CopyTexImage1D
if (ctx->_ImageTransferState || !ctx->Driver.CopyTexImage1D
|| !(*ctx->Driver.CopyTexImage1D)(ctx, target, level,
internalFormat, x, y, width, border)) {
struct gl_pixelstore_attrib unpackSave;
@ -2754,7 +2754,7 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
gl_error( ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage2D" );
return;
}
/* now call glTexSubImage1D to do the real work */
unpackSave = ctx->Unpack;
ctx->Unpack = _mesa_native_packing;
@ -2808,7 +2808,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
_mesa_TexSubImage2D(target, level, xoffset, yoffset, width, height,
GL_RGBA, GL_UNSIGNED_BYTE, image);
ctx->Unpack = unpackSave;
FREE(image);
}
}
@ -2855,7 +2855,7 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
_mesa_TexSubImage3D(target, level, xoffset, yoffset, zoffset,
width, height, 1, GL_RGBA, GL_UNSIGNED_BYTE, image);
ctx->Unpack = unpackSave;
FREE(image);
}
}

16
src/mesa/main/teximage.h
View file

@ -1,21 +1,21 @@
/* $Id: teximage.h,v 1.14 2000/10/16 23:43:12 brianp Exp $ */
/* $Id: teximage.h,v 1.15 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define TEXIMAGE_H
#include "types.h"
#include "mtypes.h"
/*** Internal functions ***/
@ -143,7 +143,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level,
extern void
_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
GLint x, GLint y, GLsizei width );
@ -153,7 +153,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
GLint x, GLint y, GLsizei width, GLsizei height );
extern void
extern void
_mesa_CopyTexSubImage3D( GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLint x, GLint y, GLsizei width, GLsizei height );

18
src/mesa/main/texobj.c
View file

@ -1,21 +1,21 @@
/* $Id: texobj.c,v 1.34 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: texobj.c,v 1.35 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -38,7 +38,7 @@
#include "teximage.h"
#include "texstate.h"
#include "texobj.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -626,7 +626,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
ctx->NewState |= _NEW_TEXTURE;
/* Pass BindTexture call to device driver */
if (ctx->Driver.BindTexture)
if (ctx->Driver.BindTexture)
(*ctx->Driver.BindTexture)( ctx, target, newTexObj );
if (oldTexObj->Name > 0) {
@ -680,7 +680,7 @@ _mesa_PrioritizeTextures( GLsizei n, const GLuint *texName,
/*
* Execute glAreTexturesResident
* Execute glAreTexturesResident
*/
GLboolean
_mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
@ -690,7 +690,7 @@ _mesa_AreTexturesResident(GLsizei n, const GLuint *texName,
GLboolean allResident = GL_TRUE;
GLint i;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx,
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx,
"glAreTexturesResident", GL_FALSE);
if (n < 0) {
gl_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident(n)");

12
src/mesa/main/texobj.h
View file

@ -1,21 +1,21 @@
/* $Id: texobj.h,v 1.4 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: texobj.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define TEXTOBJ_H
#include "types.h"
#include "mtypes.h"

22
src/mesa/main/texstate.c
View file

@ -1,21 +1,21 @@
/* $Id: texstate.c,v 1.23 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: texstate.c,v 1.24 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -38,7 +38,7 @@
#include "teximage.h"
#include "texstate.h"
#include "texture.h"
#include "types.h"
#include "mtypes.h"
#include "math/m_xform.h"
#include "math/m_matrix.h"
#include "swrast/swrast.h"
@ -343,7 +343,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
}
if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
fprintf(stderr, "glTexEnv %s %s %.1f(%s) ...\n",
fprintf(stderr, "glTexEnv %s %s %.1f(%s) ...\n",
gl_lookup_enum_by_nr(target),
gl_lookup_enum_by_nr(pname),
*param,
@ -608,7 +608,7 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexParameterfv");
if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
fprintf(stderr, "texPARAM %s %s %d...\n",
fprintf(stderr, "texPARAM %s %s %d...\n",
gl_lookup_enum_by_nr(target),
gl_lookup_enum_by_nr(pname),
eparam);
@ -1072,7 +1072,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexGenfv");
if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
fprintf(stderr, "texGEN %s %s %x...\n",
fprintf(stderr, "texGEN %s %s %x...\n",
gl_lookup_enum_by_nr(coord),
gl_lookup_enum_by_nr(pname),
*(int *)params);
@ -1222,7 +1222,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
if (pname==GL_TEXTURE_GEN_MODE) {
GLenum mode = (GLenum) (GLint) *params;
switch (mode) {
case GL_OBJECT_LINEAR:
case GL_OBJECT_LINEAR:
texUnit->GenModeQ = GL_OBJECT_LINEAR;
texUnit->_GenBitQ = TEXGEN_OBJ_LINEAR;
break;
@ -1577,7 +1577,7 @@ _mesa_ActiveTextureARB( GLenum target )
ASSERT_OUTSIDE_BEGIN_END( ctx, "glActiveTextureARB" );
if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
fprintf(stderr, "glActiveTexture %s\n",
fprintf(stderr, "glActiveTexture %s\n",
gl_lookup_enum_by_nr(target));
if (target >= GL_TEXTURE0_ARB && target < GL_TEXTURE0_ARB + maxUnits) {

12
src/mesa/main/texstate.h
View file

@ -1,21 +1,21 @@
/* $Id: texstate.h,v 1.4 2000/11/19 23:10:25 brianp Exp $ */
/* $Id: texstate.h,v 1.5 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.1
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -32,7 +32,7 @@
#define TEXSTATE_H
#include "types.h"
#include "mtypes.h"
/*** Called from API ***/

14
src/mesa/main/texutil.c
View file

@ -1,21 +1,21 @@
/* $Id: texutil.c,v 1.9 2000/11/09 22:41:25 brianp Exp $ */
/* $Id: texutil.c,v 1.10 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.4
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -33,7 +33,7 @@
#include "image.h"
#include "mem.h"
#include "texutil.h"
#include "types.h"
#include "mtypes.h"
#endif
@ -802,7 +802,7 @@ _mesa_convert_texsubimage(MesaIntTexFormat dstFormat,
dstYoffset *= hScale;
/* XXX hscale != 1 and wscale != 1 not tested!!!! */
switch (dstFormat) {
case MESA_I8:
case MESA_L8:

12
src/mesa/main/texutil.h
View file

@ -1,21 +1,21 @@
/* $Id: texutil.h,v 1.5 2000/10/29 18:12:15 brianp Exp $ */
/* $Id: texutil.h,v 1.6 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define TEXUTIL_H
#include "types.h"
#include "mtypes.h"

40
src/mesa/main/varray.c
View file

@ -1,21 +1,21 @@
/* $Id: varray.c,v 1.31 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: varray.c,v 1.32 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -37,7 +37,7 @@
#include "mmath.h"
#include "state.h"
#include "texstate.h"
#include "types.h"
#include "mtypes.h"
#include "varray.h"
#include "math/m_translate.h"
#endif
@ -48,7 +48,7 @@ void
_mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
if (size<2 || size>4) {
gl_error( ctx, GL_INVALID_VALUE, "glVertexPointer(size)" );
return;
@ -57,9 +57,9 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
gl_error( ctx, GL_INVALID_VALUE, "glVertexPointer(stride)" );
return;
}
if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
fprintf(stderr, "glVertexPointer( sz %d type %s stride %d )\n", size,
fprintf(stderr, "glVertexPointer( sz %d type %s stride %d )\n", size,
gl_lookup_enum_by_nr( type ),
stride);
@ -101,14 +101,14 @@ void
_mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
{
GET_CURRENT_CONTEXT(ctx);
if (stride<0) {
gl_error( ctx, GL_INVALID_VALUE, "glNormalPointer(stride)" );
return;
}
if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
fprintf(stderr, "glNormalPointer( type %s stride %d )\n",
fprintf(stderr, "glNormalPointer( type %s stride %d )\n",
gl_lookup_enum_by_nr( type ),
stride);
@ -162,7 +162,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
}
if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
fprintf(stderr, "glColorPointer( sz %d type %s stride %d )\n", size,
fprintf(stderr, "glColorPointer( sz %d type %s stride %d )\n", size,
gl_lookup_enum_by_nr( type ),
stride);
@ -215,7 +215,7 @@ void
_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
if (stride<0) {
gl_error( ctx, GL_INVALID_VALUE, "glFogCoordPointer(stride)" );
return;
@ -250,7 +250,7 @@ void
_mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
if (stride<0) {
gl_error( ctx, GL_INVALID_VALUE, "glIndexPointer(stride)" );
return;
@ -291,7 +291,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
void
_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr)
{
GET_CURRENT_CONTEXT(ctx);
@ -306,7 +306,7 @@ _mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
}
if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
fprintf(stderr, "glColorPointer( sz %d type %s stride %d )\n", size,
fprintf(stderr, "glColorPointer( sz %d type %s stride %d )\n", size,
gl_lookup_enum_by_nr( type ),
stride);
@ -360,7 +360,7 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr
{
GET_CURRENT_CONTEXT(ctx);
GLuint texUnit;
texUnit = ctx->Array.ActiveTexture;
if (size<1 || size>4) {
@ -373,9 +373,9 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr
}
if (MESA_VERBOSE&(VERBOSE_VARRAY|VERBOSE_API))
fprintf(stderr, "glTexCoordPointer( unit %u sz %d type %s stride %d )\n",
fprintf(stderr, "glTexCoordPointer( unit %u sz %d type %s stride %d )\n",
texUnit,
size,
size,
gl_lookup_enum_by_nr( type ),
stride);
@ -510,7 +510,7 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
GLint defstride; /* default stride */
GLint c, f;
GLint coordUnitSave;
f = sizeof(GLfloat);
c = f * ((4*sizeof(GLubyte) + (f-1)) / f);

14
src/mesa/main/varray.h
View file

@ -1,21 +1,21 @@
/* $Id: varray.h,v 1.9 2000/11/16 21:05:35 keithw Exp $ */
/* $Id: varray.h,v 1.10 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define VARRAY_H
#include "types.h"
#include "mtypes.h"
extern void
@ -91,7 +91,7 @@ extern void
_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
extern void
_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr);

12
src/mesa/swrast/s_aaline.c
View file

@ -1,21 +1,21 @@
/* $Id: s_aaline.c,v 1.2 2000/11/13 20:02:57 keithw Exp $ */
/* $Id: s_aaline.c,v 1.3 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -30,7 +30,7 @@
#include "swrast/s_pb.h"
#include "swrast/s_context.h"
#include "swrast/swrast.h"
#include "types.h"
#include "mtypes.h"

12
src/mesa/swrast/s_aaline.h
View file

@ -1,21 +1,21 @@
/* $Id: s_aaline.h,v 1.1 2000/11/05 23:15:16 brianp Exp $ */
/* $Id: s_aaline.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_AALINE_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_aatriangle.h
View file

@ -1,21 +1,21 @@
/* $Id: s_aatriangle.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_aatriangle.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_AATRIANGLE_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_accum.h
View file

@ -1,21 +1,21 @@
/* $Id: s_accum.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_accum.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.1
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_ACCUM_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_alpha.h
View file

@ -1,21 +1,21 @@
/* $Id: s_alpha.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_alpha.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_ALPHA_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_alphabuf.h
View file

@ -1,21 +1,21 @@
/* $Id: s_alphabuf.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_alphabuf.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_ALPHABUF_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_blend.h
View file

@ -1,21 +1,21 @@
/* $Id: s_blend.h,v 1.2 2000/11/05 18:24:40 keithw Exp $ */
/* $Id: s_blend.h,v 1.3 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_BLEND_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

58
src/mesa/swrast/s_context.c
View file

@ -1,21 +1,21 @@
/* $Id: s_context.c,v 1.5 2000/11/19 23:10:26 brianp Exp $ */
/* $Id: s_context.c,v 1.6 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,7 +28,7 @@
*/
#include "glheader.h"
#include "types.h"
#include "mtypes.h"
#include "mem.h"
#include "s_pb.h"
@ -48,7 +48,7 @@
* Recompute the value of swrast->_RasterMask, etc. according to
* the current context.
*/
static void
static void
_swrast_update_rasterflags( GLcontext *ctx )
{
GLuint RasterMask = 0;
@ -147,9 +147,9 @@ _swrast_update_polygon( GLcontext *ctx )
static void
_swrast_update_hint( GLcontext *ctx )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
SWcontext *swrast = SWRAST_CONTEXT(ctx);
swrast->_PreferPixelFog = (!swrast->AllowVertexFog ||
(ctx->Hint.Fog == GL_NICEST &&
(ctx->Hint.Fog == GL_NICEST &&
swrast->AllowPixelFog));
}
@ -185,11 +185,11 @@ _swrast_update_hint( GLcontext *ctx )
/* Stub for swrast->Triangle to select a true triangle function
/* Stub for swrast->Triangle to select a true triangle function
* after a state change.
*/
static void
_swrast_validate_quad( GLcontext *ctx,
_swrast_validate_quad( GLcontext *ctx,
const SWvertex *v0, const SWvertex *v1,
const SWvertex *v2, const SWvertex *v3 )
{
@ -202,7 +202,7 @@ _swrast_validate_quad( GLcontext *ctx,
}
static void
_swrast_validate_triangle( GLcontext *ctx,
_swrast_validate_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@ -237,10 +237,10 @@ _swrast_validate_point( GLcontext *ctx, const SWvertex *v0 )
swrast->Point( ctx, v0 );
}
static void
static void
_swrast_validate_blend_func( GLcontext *ctx, GLuint n,
const GLubyte mask[],
GLchan src[][4],
GLchan src[][4],
CONST GLchan dst[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@ -252,7 +252,7 @@ _swrast_validate_blend_func( GLcontext *ctx, GLuint n,
}
static void
static void
_swrast_validate_texture_sample( GLcontext *ctx, GLuint texUnit,
const struct gl_texture_object *tObj,
GLuint n,
@ -265,7 +265,7 @@ _swrast_validate_texture_sample( GLcontext *ctx, GLuint texUnit,
_swrast_validate_derived( ctx );
_swrast_choose_texture_sample_func( ctx, texUnit, tObj );
swrast->TextureSample[texUnit]( ctx, texUnit, tObj, n, s, t, u,
swrast->TextureSample[texUnit]( ctx, texUnit, tObj, n, s, t, u,
lambda, rgba );
}
@ -285,14 +285,14 @@ _swrast_invalidate_state( GLcontext *ctx, GLuint new_state )
swrast->NewState |= new_state;
/* After 10 statechanges without any swrast functions being called,
* put the module to sleep.
* put the module to sleep.
*/
if (++swrast->StateChanges > 10) {
swrast->InvalidateState = _swrast_sleep;
swrast->NewState = ~0;
new_state = ~0;
}
if (new_state & swrast->invalidate_triangle)
swrast->Triangle = _swrast_validate_triangle;
@ -307,8 +307,8 @@ _swrast_invalidate_state( GLcontext *ctx, GLuint new_state )
if (new_state & _SWRAST_NEW_BLEND_FUNC)
swrast->BlendFunc = _swrast_validate_blend_func;
if (new_state & _SWRAST_NEW_TEXTURE_SAMPLE_FUNC)
if (new_state & _SWRAST_NEW_TEXTURE_SAMPLE_FUNC)
for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++)
swrast->TextureSample[i] = _swrast_validate_texture_sample;
}
@ -320,13 +320,13 @@ _swrast_validate_derived( GLcontext *ctx )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
if (swrast->NewState)
if (swrast->NewState)
{
if (swrast->NewState & _SWRAST_NEW_RASTERMASK)
if (swrast->NewState & _SWRAST_NEW_RASTERMASK)
_swrast_update_rasterflags( ctx );
if (swrast->NewState & _NEW_TEXTURE)
swrast->_MultiTextureEnabled = (ctx->Texture._ReallyEnabled &
swrast->_MultiTextureEnabled = (ctx->Texture._ReallyEnabled &
~ENABLE_TEX0);
if (swrast->NewState & _NEW_POLYGON)
@ -346,7 +346,7 @@ _swrast_validate_derived( GLcontext *ctx )
/* Public entrypoints: See also s_accum.c, s_bitmap.c, etc.
*/
void
_swrast_Quad( GLcontext *ctx,
_swrast_Quad( GLcontext *ctx,
const SWvertex *v0, const SWvertex *v1,
const SWvertex *v2, const SWvertex *v3 )
{
@ -385,14 +385,14 @@ _swrast_get_stipple_counter_ref( GLcontext *ctx )
return &SWRAST_CONTEXT(ctx)->StippleCounter;
}
void
void
_swrast_allow_vertex_fog( GLcontext *ctx, GLboolean value )
{
SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );
SWRAST_CONTEXT(ctx)->AllowVertexFog = value;
}
void
void
_swrast_allow_pixel_fog( GLcontext *ctx, GLboolean value )
{
SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );
@ -415,7 +415,7 @@ _swrast_CreateContext( GLcontext *ctx )
}
swrast->NewState = ~0;
swrast->choose_point = _swrast_choose_point;
swrast->choose_line = _swrast_choose_line;
swrast->choose_triangle = _swrast_choose_triangle;
@ -443,7 +443,7 @@ _swrast_CreateContext( GLcontext *ctx )
for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++)
swrast->TextureSample[i] = _swrast_validate_texture_sample;
ctx->swrast_context = swrast;
return GL_TRUE;
}
@ -455,7 +455,7 @@ _swrast_DestroyContext( GLcontext *ctx )
FREE( swrast->PB );
FREE( swrast );
ctx->swrast_context = 0;
}

18
src/mesa/swrast/s_context.h
View file

@ -1,19 +1,19 @@
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,7 +28,7 @@
#ifndef S_CONTEXT_H
#define S_CONTEXT_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"
/*
@ -103,7 +103,7 @@ typedef void (*swrast_quad_func)( GLcontext *ctx,
typedef struct
{
/* Configuration mechanisms to make software rasterizer match
* characteristics of the hardware rasterizer (if present):
* characteristics of the hardware rasterizer (if present):
*/
GLboolean AllowVertexFog;
GLboolean AllowPixelFog;
@ -117,19 +117,19 @@ typedef struct
GLfloat _backface_sign;
GLboolean _PreferPixelFog;
/* Accum buffer temporaries.
/* Accum buffer temporaries.
*/
GLboolean _IntegerAccumMode; /* Storing unscaled integers? */
GLfloat _IntegerAccumScaler; /* Implicit scale factor */
/* Working values:
*/
struct pixel_buffer* PB;
GLuint StippleCounter; /* Line stipple counter */
GLuint NewState;
GLuint StateChanges;
/* Mechanism to allow driver (like X11) to register further
* software rasterization routines.
*/

12
src/mesa/swrast/s_depth.h
View file

@ -1,21 +1,21 @@
/* $Id: s_depth.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_depth.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_DEPTH_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_drawpix.h
View file

@ -1,21 +1,21 @@
/* $Id: s_drawpix.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_drawpix.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_DRAWPIXELS_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_feedback.h
View file

@ -1,21 +1,21 @@
/* $Id: s_feedback.h,v 1.2 2000/11/19 23:10:26 brianp Exp $ */
/* $Id: s_feedback.h,v 1.3 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_FEEDBACK_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

16
src/mesa/swrast/s_fog.h
View file

@ -1,21 +1,21 @@
/* $Id: s_fog.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_fog.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_FOG_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"
@ -46,8 +46,8 @@ _mesa_fog_ci_pixels( const GLcontext *ctx,
extern void
_mesa_win_fog_coords_from_z( const GLcontext *ctx,
GLuint n,
const GLdepth z[],
GLuint n,
const GLdepth z[],
GLfixed fogcoord[] );
extern void

14
src/mesa/swrast/s_lines.h
View file

@ -1,21 +1,21 @@
/* $Id: s_lines.h,v 1.2 2000/11/19 23:10:26 brianp Exp $ */
/* $Id: s_lines.h,v 1.3 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,9 +28,9 @@
#ifndef S_LINES_H
#define S_LINES_H
#include "types.h"
#include "mtypes.h"
void
void
_swrast_choose_line( GLcontext *ctx );

14
src/mesa/swrast/s_logic.h
View file

@ -1,21 +1,21 @@
/* $Id: s_logic.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_logic.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,11 +29,11 @@
#define S_LOGIC_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"
extern void
extern void
_mesa_logicop_ci_span( GLcontext *ctx,
GLuint n, GLint x, GLint y, GLuint index[],
const GLubyte mask[] );

12
src/mesa/swrast/s_masking.h
View file

@ -1,21 +1,21 @@
/* $Id: s_masking.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_masking.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_MASKING_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_pixeltex.h
View file

@ -1,21 +1,21 @@
/* $Id: s_pixeltex.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_pixeltex.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright noti_mesa_PixelTexGenParameterfvce and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,7 +28,7 @@
#ifndef S_PIXELTEX_H
#define S_PIXELTEX_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"
extern void

14
src/mesa/swrast/s_points.h
View file

@ -1,21 +1,21 @@
/* $Id: s_points.h,v 1.2 2000/11/19 23:10:26 brianp Exp $ */
/* $Id: s_points.h,v 1.3 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,9 +28,9 @@
#ifndef S_POINTS_H
#define S_POINTS_H
#include "types.h"
#include "mtypes.h"
void
void
_swrast_choose_point( GLcontext *ctx );

12
src/mesa/swrast/s_span.h
View file

@ -1,21 +1,21 @@
/* $Id: s_span.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_span.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -32,7 +32,7 @@
#define S_SPAN_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_stencil.h
View file

@ -1,21 +1,21 @@
/* $Id: s_stencil.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
/* $Id: s_stencil.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.3
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_STENCIL_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

12
src/mesa/swrast/s_texture.h
View file

@ -1,21 +1,21 @@
/* $Id: s_texture.h,v 1.2 2000/11/05 18:24:41 keithw Exp $ */
/* $Id: s_texture.h,v 1.3 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -32,7 +32,7 @@
#define S_TEXTURE_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"

16
src/mesa/swrast/s_triangle.h
View file

@ -1,21 +1,21 @@
/* $Id: s_triangle.h,v 1.3 2000/11/19 23:10:26 brianp Exp $ */
/* $Id: s_triangle.h,v 1.4 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.1
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -32,17 +32,17 @@
#define S_TRIANGLES_H
#include "types.h"
#include "mtypes.h"
#include "swrast.h"
GLboolean gl_cull_triangle( GLcontext *ctx,
GLboolean gl_cull_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2);
void
void
_swrast_choose_triangle( GLcontext *ctx );

12
src/mesa/swrast/s_zoom.h
View file

@ -1,21 +1,21 @@
/* $Id: s_zoom.h,v 1.1 2000/10/31 18:00:05 keithw Exp $ */
/* $Id: s_zoom.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -29,7 +29,7 @@
#define S_ZOOM_H
#include "types.h"
#include "mtypes.h"
extern void

40
src/mesa/swrast/swrast.h
View file

@ -1,19 +1,19 @@
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,7 +28,7 @@
#ifndef SWRAST_H
#define SWRAST_H
#include "types.h"
#include "mtypes.h"
@ -40,10 +40,10 @@
* drivers.
*
* Full software drivers:
* - Register the rastersetup and triangle functions from
* - Register the rastersetup and triangle functions from
* utils/software_helper.
* - On statechange, update the rasterization pointers in that module.
*
*
* Rasterization hardware drivers:
* - Keep native rastersetup.
* - Implement native twoside,offset and unfilled triangle setup.
@ -52,7 +52,7 @@
* prims), call a pass-through function which translates native
* vertices to SWvertices and calls the appropriate swrast function.
* - On total fallback (vertex format insufficient for state or all
* primitives unaccelerated), hook in swrast_setup instead.
* primitives unaccelerated), hook in swrast_setup instead.
*/
typedef struct {
GLfloat win[4];
@ -67,7 +67,7 @@ typedef struct {
/* These are the public-access functions exported from swrast.
/* These are the public-access functions exported from swrast.
*/
extern void
_swrast_alloc_buffers( GLcontext *ctx );
@ -80,25 +80,25 @@ _swrast_DestroyContext( GLcontext *ctx );
extern void
_swrast_Bitmap( GLcontext *ctx,
extern void
_swrast_Bitmap( GLcontext *ctx,
GLint px, GLint py,
GLsizei width, GLsizei height,
const struct gl_pixelstore_attrib *unpack,
const GLubyte *bitmap );
extern void
_swrast_CopyPixels( GLcontext *ctx,
GLint srcx, GLint srcy,
GLint destx, GLint desty,
_swrast_CopyPixels( GLcontext *ctx,
GLint srcx, GLint srcy,
GLint destx, GLint desty,
GLsizei width, GLsizei height,
GLenum type );
extern void
_swrast_DrawPixels( GLcontext *ctx,
_swrast_DrawPixels( GLcontext *ctx,
GLint x, GLint y,
GLsizei width, GLsizei height,
GLenum format, GLenum type,
GLenum format, GLenum type,
const struct gl_pixelstore_attrib *unpack,
const GLvoid *pixels );
@ -109,13 +109,13 @@ _swrast_ReadPixels( GLcontext *ctx,
const struct gl_pixelstore_attrib *unpack,
GLvoid *pixels );
extern void
extern void
_swrast_Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
GLint x, GLint y, GLint width, GLint height );
extern void
_swrast_Accum( GLcontext *ctx, GLenum op,
GLfloat value, GLint xpos, GLint ypos,
_swrast_Accum( GLcontext *ctx, GLenum op,
GLfloat value, GLint xpos, GLint ypos,
GLint width, GLint height );
@ -143,7 +143,7 @@ _swrast_Quad( GLcontext *ctx,
const SWvertex *v0, const SWvertex *v1,
const SWvertex *v2, const SWvertex *v3);
extern void
extern void
_swrast_flush( GLcontext *ctx );

14
src/mesa/swrast_setup/ss_context.h
View file

@ -1,19 +1,19 @@
/*
* Mesa 3-D graphics library
* Version: 3.5
*
*
* Copyright (C) 1999 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"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@ -28,7 +28,7 @@
#ifndef SS_CONTEXT_H
#define SS_CONTEXT_H
#include "types.h"
#include "mtypes.h"
#include "swrast/swrast.h"
#include "swrast_setup.h"
@ -42,10 +42,10 @@ typedef struct {
void (*RasterSetup)( struct vertex_buffer *VB, GLuint start, GLuint end );
void (*Quad)( GLcontext *ctx, GLuint v0, GLuint v1,
void (*Quad)( GLcontext *ctx, GLuint v0, GLuint v1,
GLuint v2, GLuint v3, GLuint pv );
void (*Triangle)( GLcontext *ctx, GLuint v0, GLuint v1,
void (*Triangle)( GLcontext *ctx, GLuint v0, GLuint v1,
GLuint v2, GLuint pv );
void (*Line)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint pv );

Some files were not shown because too many files have changed in this diff Show more