From 6f676f4871b1701ec56298f9d22460677ed0e982 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 2 Nov 2006 18:35:19 +0000 Subject: always load frag prog state params for now (see comments) --- src/mesa/swrast/s_context.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/mesa/swrast') diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 62cf6f2f5a..52d560ffdb 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -227,7 +227,12 @@ _swrast_update_fragment_program(GLcontext *ctx, GLbitfield newState) { if (ctx->FragmentProgram._Enabled) { const struct gl_fragment_program *fp = ctx->FragmentProgram._Current; +#if 0 + /* XXX Need a way to trigger the initial loading of parameters + * even when there's no recent state changes. + */ if (fp->Base.Parameters->StateFlags & newState) +#endif _mesa_load_state_parameters(ctx, fp->Base.Parameters); } } -- cgit v1.2.3 From 6cc5a82206503190c2387266b4ad1b075d9dec62 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Tue, 14 Nov 2006 14:22:43 +0000 Subject: Make sure RENDER_FINISH is called on the zero pixel case. Reported by Haihao Xiang. --- src/mesa/swrast/s_readpix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/swrast') diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index cbfb7712d8..128ce0afb3 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -554,7 +554,7 @@ _swrast_ReadPixels( GLcontext *ctx, /* Do all needed clipping here, so that we can forget about it later */ if (!_mesa_clip_readpixels(ctx, &x, &y, &width, &height, &clippedPacking)) { /* The ReadPixels region is totally outside the window bounds */ - return; + goto end; } if (clippedPacking.BufferObj->Name) { -- cgit v1.2.3 From 3dedeaa0557f17770f6ab7f163dcdde8e93609b8 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 16 Nov 2006 21:28:35 +0000 Subject: Initial implementation work for CAL, RET, and BRA instructions for fragment programs. --- src/mesa/main/config.h | 1 + src/mesa/shader/program_instruction.h | 7 ++++- src/mesa/swrast/s_nvfragprog.c | 53 +++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) (limited to 'src/mesa/swrast') diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index 5a0481328f..13c6281f07 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -198,6 +198,7 @@ #define MAX_PROGRAM_LOCAL_PARAMS 128 /* KW: power of two */ #define MAX_PROGRAM_MATRICES 8 #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4 +#define MAX_PROGRAM_CALL_DEPTH 8 /*@}*/ /** For GL_ARB_fragment_shader */ diff --git a/src/mesa/shader/program_instruction.h b/src/mesa/shader/program_instruction.h index cdec0ceb2a..ad3a6d4dd4 100644 --- a/src/mesa/shader/program_instruction.h +++ b/src/mesa/shader/program_instruction.h @@ -286,7 +286,7 @@ struct prog_instruction GLuint CondUpdate:1; /** - * If prog_instruction::cc_update is \c GL_TRUE, this value selects the + * If prog_instruction::CondUpdate is \c GL_TRUE, this value selects the * condition code register that is to be updated. * * In GL_NV_fragment_program or GL_NV_vertex_program2 mode, only condition @@ -339,6 +339,11 @@ struct prog_instruction */ GLuint TexSrcTarget:3; /*@}*/ + + /** + * For BRA and CAL instructions, the location to jump to. + */ + GLuint BranchTarget; }; diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c index 7a6785b1d2..028ddc0090 100644 --- a/src/mesa/swrast/s_nvfragprog.c +++ b/src/mesa/swrast/s_nvfragprog.c @@ -57,6 +57,9 @@ struct fp_machine GLfloat Inputs[MAX_NV_FRAGMENT_PROGRAM_INPUTS][4]; GLfloat Outputs[MAX_NV_FRAGMENT_PROGRAM_OUTPUTS][4]; GLuint CondCodes[4]; /**< COND_* value for x/y/z/w */ + + GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */ + GLuint StackDepth; /**< Index/ptr to top of CallStack[] */ }; @@ -697,6 +700,37 @@ execute_program( GLcontext *ctx, } } break; + case OPCODE_BRA: /* conditional branch */ + { + /* NOTE: The return is conditional! */ + const GLuint swizzle = inst->DstReg.CondSwizzle; + const GLuint condMask = inst->DstReg.CondMask; + if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) { + /* take branch */ + pc = inst->BranchTarget; + } + } + break; + case OPCODE_CAL: /* Call subroutine */ + { + /* NOTE: The call is conditional! */ + const GLuint swizzle = inst->DstReg.CondSwizzle; + const GLuint condMask = inst->DstReg.CondMask; + if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) { + if (machine->StackDepth >= MAX_PROGRAM_CALL_DEPTH) { + return GL_TRUE; /* Per GL_NV_vertex_program2 spec */ + } + machine->CallStack[machine->StackDepth++] = pc + 1; + pc = inst->BranchTarget; + } + } + break; case OPCODE_CMP: { GLfloat a[4], b[4], c[4], result[4]; @@ -1093,6 +1127,22 @@ execute_program( GLcontext *ctx, store_vector4( inst, machine, result ); } break; + case OPCODE_RET: /* return from subroutine */ + { + /* NOTE: The return is conditional! */ + const GLuint swizzle = inst->DstReg.CondSwizzle; + const GLuint condMask = inst->DstReg.CondMask; + if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) || + test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) { + if (machine->StackDepth == 0) { + return GL_TRUE; /* Per GL_NV_vertex_program2 spec */ + } + pc = machine->CallStack[--machine->StackDepth]; + } + } + break; case OPCODE_RFL: /* reflection vector */ { GLfloat axis[4], dir[4], result[4], tmpX, tmpW; @@ -1539,6 +1589,9 @@ init_machine( GLcontext *ctx, struct fp_machine *machine, machine->CondCodes[1] = COND_EQ; machine->CondCodes[2] = COND_EQ; machine->CondCodes[3] = COND_EQ; + + /* init call stack */ + machine->StackDepth = 0; } -- cgit v1.2.3 From 8f008056b2e6347850ec52fdd6da7928b56c4ef9 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 21 Nov 2006 16:04:22 +0000 Subject: list header files in sources files (Dan Nicholson) --- src/mesa/array_cache/sources | 4 +++ src/mesa/glapi/sources | 9 +++++ src/mesa/main/sources | 76 ++++++++++++++++++++++++++++++++++++++++- src/mesa/math/sources | 16 +++++++++ src/mesa/shader/grammar/sources | 6 ++++ src/mesa/shader/slang/sources | 23 +++++++++++++ src/mesa/shader/sources | 15 ++++++++ src/mesa/swrast/sources | 35 ++++++++++++++++++- src/mesa/swrast_setup/sources | 7 ++++ src/mesa/tnl/sources | 17 ++++++++- 10 files changed, 205 insertions(+), 3 deletions(-) (limited to 'src/mesa/swrast') diff --git a/src/mesa/array_cache/sources b/src/mesa/array_cache/sources index 210ec202d6..fb3328d10e 100644 --- a/src/mesa/array_cache/sources +++ b/src/mesa/array_cache/sources @@ -1,3 +1,7 @@ MESA_ARRAY_CACHE_SOURCES = \ ac_context.c \ ac_import.c + +MESA_ARRAY_CACHE_HEADERS = \ +ac_context.h \ +acache.h diff --git a/src/mesa/glapi/sources b/src/mesa/glapi/sources index 384b0830ac..1d5c252821 100644 --- a/src/mesa/glapi/sources +++ b/src/mesa/glapi/sources @@ -1,3 +1,12 @@ MESA_GLAPI_SOURCES = \ glapi.c \ glthread.c + +MESA_GLAPI_HEADERS = \ +dispatch.h \ +glapi.h \ +glapioffsets.h \ +glapitable.h \ +glapitemp.h \ +glprocs.h \ +glthread.h diff --git a/src/mesa/main/sources b/src/mesa/main/sources index 8820461f91..dfcff89e4b 100644 --- a/src/mesa/main/sources +++ b/src/mesa/main/sources @@ -1,4 +1,4 @@ -# List of ource files in this directory used for X.org xserver build +# List of source files in this directory used for X.org xserver build MESA_MAIN_SOURCES = \ accum.c \ api_arrayelt.c \ @@ -62,3 +62,77 @@ texstore.c \ varray.c \ $(VSNPRINTF_SOURCES) \ vtxfmt.c + +MESA_VSNPRINTF_SOURCES = \ +vsnprintf.c + +MESA_MAIN_HEADERS = \ +accum.h \ +api_arrayelt.h \ +api_eval.h \ +api_loopback.h \ +api_noop.h \ +api_validate.h \ +arrayobj.h \ +attrib.h \ +bitset.h \ +blend.h \ +bufferobj.h \ +buffers.h \ +clip.h \ +colormac.h \ +colortab.h \ +config.h \ +context.h \ +convolve.h \ +dd.h \ +debug.h \ +depth.h \ +depthstencil.h \ +dlist.h \ +drawpix.h \ +enable.h \ +enums.h \ +eval.h \ +extensions.h \ +fbobject.h \ +feedback.h \ +fog.h \ +framebuffer.h \ +get.h \ +glheader.h \ +hash.h \ +hint.h \ +histogram.h \ +image.h \ +imports.h \ +light.h \ +lines.h \ +macros.h \ +matrix.h \ +mipmap.h \ +mm.h \ +mtypes.h \ +occlude.h \ +pixel.h \ +points.h \ +polygon.h \ +rastpos.h \ +rbadaptors.h \ +renderbuffer.h \ +simple_list.h \ +state.h \ +stencil.h \ +texcompress.h \ +texenvprogram.h \ +texformat.h \ +texformat_tmp.h \ +teximage.h \ +texobj.h \ +texrender.h \ +texstate.h \ +texstore.h \ +varray.h \ +version.h \ +vtxfmt.h \ +vtxfmt_tmp.h diff --git a/src/mesa/math/sources b/src/mesa/math/sources index 2374be80eb..7c7dcccedf 100644 --- a/src/mesa/math/sources +++ b/src/mesa/math/sources @@ -7,3 +7,19 @@ m_matrix.c \ m_translate.c \ m_vector.c \ m_xform.c + +MESA_MATH_HEADERS = \ +m_clip_tmp.h \ +m_copy_tmp.h \ +m_debug.h \ +m_debug_util.h \ +m_dotprod_tmp.h \ +m_eval.h \ +m_matrix.h \ +m_norm_tmp.h \ +m_trans_tmp.h \ +m_translate.h \ +m_vector.h \ +m_xform.h \ +m_xform_tmp.h \ +mathmod.h diff --git a/src/mesa/shader/grammar/sources b/src/mesa/shader/grammar/sources index b1f8530ee5..a6bbfd3ffd 100644 --- a/src/mesa/shader/grammar/sources +++ b/src/mesa/shader/grammar/sources @@ -1,2 +1,8 @@ MESA_SHADER_GRAMMAR_SOURCES = \ grammar_mesa.c + +MESA_SHADER_GRAMMAR_HEADERS = \ +grammar.c \ +grammar.h \ +grammar_mesa.h \ +grammar_syn.h diff --git a/src/mesa/shader/slang/sources b/src/mesa/shader/slang/sources index f03f1ed187..00d617fa8a 100644 --- a/src/mesa/shader/slang/sources +++ b/src/mesa/shader/slang/sources @@ -19,3 +19,26 @@ slang_link.c \ slang_preprocess.c \ slang_storage.c \ slang_utility.c + +MESA_SHADER_SLANG_HEADERS = \ +slang_analyse.h \ +slang_assemble.h \ +slang_assemble_assignment.h \ +slang_assemble_conditional.h \ +slang_assemble_constructor.h \ +slang_assemble_typeinfo.h \ +slang_compile.h \ +slang_compile_function.h \ +slang_compile_operation.h \ +slang_compile_struct.h \ +slang_compile_variable.h \ +slang_execute.h \ +slang_export.h \ +slang_library_noise.h \ +slang_library_texsample.h \ +slang_link.h \ +slang_mesa.h \ +slang_preprocess.h \ +slang_storage.h \ +slang_utility.h \ +traverse_wrap.h diff --git a/src/mesa/shader/sources b/src/mesa/shader/sources index 573be89b9a..3db2de92e0 100644 --- a/src/mesa/shader/sources +++ b/src/mesa/shader/sources @@ -11,3 +11,18 @@ program.c \ programopt.c \ shaderobjects.c \ shaderobjects_3dlabs.c + +MESA_SHADER_HEADERS = \ +arbprogparse.h \ +arbprogram.h \ +arbprogram_syn.h \ +atifragshader.h \ +nvfragparse.h \ +nvprogram.h \ +nvvertexec.h \ +nvvertparse.h \ +programopt.h \ +program.h \ +program_instruction.h \ +shaderobjects.h \ +shaderobjects_3dlabs.h diff --git a/src/mesa/swrast/sources b/src/mesa/swrast/sources index 8807b56a61..9ffd4cca72 100644 --- a/src/mesa/swrast/sources +++ b/src/mesa/swrast/sources @@ -1,4 +1,4 @@ -# List of ource files in this directory used for X.org xserver build +# List of source files in this directory used for X.org xserver build MESA_SWRAST_SOURCES = \ s_aaline.c \ s_aatriangle.c \ @@ -30,3 +30,36 @@ s_texfilter.c \ s_texstore.c \ s_triangle.c \ s_zoom.c + +MESA_SWRAST_HEADERS = \ +s_aaline.h \ +s_aalinetemp.h \ +s_aatriangle.h \ +s_aatritemp.h \ +s_accum.h \ +s_alpha.h \ +s_arbshader.h \ +s_atifragshader.h \ +s_blend.h \ +s_context.h \ +s_depth.h \ +s_drawpix.h \ +s_feedback.h \ +s_fog.h \ +s_lines.h \ +s_linetemp.h \ +s_logic.h \ +s_masking.h \ +s_nvfragprog.h \ +s_points.h \ +s_pointtemp.h \ +s_span.h \ +s_spantemp.h \ +s_stencil.h \ +s_texcombine.h \ +s_texfilter.h \ +s_triangle.h \ +s_trispan.h \ +s_tritemp.h \ +s_zoom.h \ +swrast.h diff --git a/src/mesa/swrast_setup/sources b/src/mesa/swrast_setup/sources index d5b606d65e..dee14b6774 100644 --- a/src/mesa/swrast_setup/sources +++ b/src/mesa/swrast_setup/sources @@ -1,3 +1,10 @@ MESA_SWRAST_SETUP_SOURCES = \ ss_context.c \ ss_triangle.c + +MESA_SWRAST_SETUP_HEADERS = \ +ss_context.h \ +ss_triangle.h \ +ss_tritmp.h \ +ss_vb.h \ +swrast_setup.h diff --git a/src/mesa/tnl/sources b/src/mesa/tnl/sources index 2c4f4c49ea..e01f55dbaf 100644 --- a/src/mesa/tnl/sources +++ b/src/mesa/tnl/sources @@ -1,4 +1,4 @@ -# List of ource files in this directory used for X.org xserver build +# List of source files in this directory used for X.org xserver build MESA_TNL_SOURCES = \ t_array_api.c \ t_array_import.c \ @@ -29,3 +29,18 @@ t_vtx_eval.c \ t_vtx_exec.c \ t_vtx_generic.c \ t_vtx_x86.c + +MESA_TNL_HEADERS = \ +t_array_api.h \ +t_array_import.h \ +t_context.h \ +t_pipeline.h \ +t_save_api.h \ +t_vb_arbprogram.h \ +t_vb_cliptmp.h \ +t_vb_lighttmp.h \ +t_vb_rendertmp.h \ +t_vertex.h \ +t_vp_build.h \ +t_vtx_api.h \ +tnl.h -- cgit v1.2.3 From 6d982e53ee079dc6a9a20bd5d80b7f856e943e5d Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 16 Dec 2006 11:07:00 -0700 Subject: don't allow fog when using a fragment shader (bug 9346) --- src/mesa/swrast/s_context.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mesa/swrast') diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 52d560ffdb..d4b8080ddc 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 + * Version: 6.5.3 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -201,7 +201,10 @@ _swrast_update_fog_state( GLcontext *ctx ) /* determine if fog is needed, and if so, which fog mode */ swrast->_FogEnabled = GL_FALSE; - if (ctx->FragmentProgram._Enabled) { + if (ctx->ShaderObjects._FragmentShaderPresent) { + swrast->_FogEnabled = GL_FALSE; + } + else if (ctx->FragmentProgram._Enabled) { if (ctx->FragmentProgram._Current->Base.Target==GL_FRAGMENT_PROGRAM_ARB) { const struct gl_fragment_program *fp = ctx->FragmentProgram._Current; -- cgit v1.2.3 From b497a0cb7c607bfad3389c6831de0dfdc37ee5af Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 16 Dec 2006 11:17:41 -0700 Subject: Don't update span->array->z[] values from SLANG_FRAGMENT_FIXED_FRAGDEPTH. This restores the behaviour of Mesa 6.5.1, fixing a regression in 6.5.2. See bug 9345. Revisit someday... --- src/mesa/swrast/s_arbshader.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/mesa/swrast') diff --git a/src/mesa/swrast/s_arbshader.c b/src/mesa/swrast/s_arbshader.c index ee971a36ec..356e43c819 100644 --- a/src/mesa/swrast/s_arbshader.c +++ b/src/mesa/swrast/s_arbshader.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.6 + * Version: 6.5.3 * * Copyright (C) 2006 Brian Paul All Rights Reserved. * @@ -103,18 +103,20 @@ _swrast_exec_arbshader(GLcontext *ctx, SWspan *span) span->writeAll = GL_FALSE; } else { + GLboolean zWritten = GL_FALSE; /* temp hack (bug 9345) */ (**pro).UpdateFixedVarying(pro, SLANG_FRAGMENT_FIXED_FRAGCOLOR, vec, 0, 4 * sizeof(GLfloat), GL_FALSE); COPY_4V(span->array->color.sz4.rgba[i], vec); - - (**pro).UpdateFixedVarying(pro, SLANG_FRAGMENT_FIXED_FRAGDEPTH, vec, 0, - sizeof (GLfloat), GL_FALSE); - if (vec[0] <= 0.0f) - span->array->z[i] = 0; - else if (vec[0] >= 1.0f) - span->array->z[i] = ctx->DrawBuffer->_DepthMax; - else - span->array->z[i] = IROUND(vec[0] * ctx->DrawBuffer->_DepthMaxF); + if (zWritten) { + (**pro).UpdateFixedVarying(pro, SLANG_FRAGMENT_FIXED_FRAGDEPTH, + vec, 0, sizeof (GLfloat), GL_FALSE); + if (vec[0] <= 0.0f) + span->array->z[i] = 0; + else if (vec[0] >= 1.0f) + span->array->z[i] = ctx->DrawBuffer->_DepthMax; + else + span->array->z[i] = IROUND(vec[0] * ctx->DrawBuffer->_DepthMaxF); + } } } } -- cgit v1.2.3 From 113b0a7f2e83f02ae9da6977ff416df5cf9671de Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 6 Jan 2007 12:55:17 -0700 Subject: Use GLuint instead of GLint to store intermediate Z values. Fixes problems when using 32-bit Z buffer. --- src/mesa/swrast/s_linetemp.h | 11 ++++++----- src/mesa/swrast/s_pointtemp.h | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/mesa/swrast') diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h index f5b2d95653..8b3918511d 100644 --- a/src/mesa/swrast/s_linetemp.h +++ b/src/mesa/swrast/s_linetemp.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5 + * Version: 6.5.3 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 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"), @@ -80,14 +80,15 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 ) GLint numPixels; GLint xstep, ystep; #if defined(DEPTH_TYPE) - const GLint depthBits = ctx->Visual.depthBits; + const GLint depthBits = ctx->DrawBuffer->Visual.depthBits; const GLint fixedToDepthShift = depthBits <= 16 ? FIXED_SHIFT : 0; struct gl_renderbuffer *zrb = ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer; #define FixedToDepth(F) ((F) >> fixedToDepthShift) GLint zPtrXstep, zPtrYstep; DEPTH_TYPE *zPtr; #elif defined(INTERP_Z) - const GLint depthBits = ctx->Visual.depthBits; + const GLint depthBits = ctx->DrawBuffer->Visual.depthBits; +/*ctx->Visual.depthBits;*/ #endif #ifdef PIXEL_ADDRESS PIXEL_TYPE *pixelPtr; @@ -268,7 +269,7 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 ) } else { /* don't use fixed point */ - span.z = (GLint) vert0->win[2]; + span.z = (GLuint) vert0->win[2]; span.zStep = (GLint) ((vert1->win[2] - vert0->win[2]) / numPixels); } } diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h index 6316833a68..083f1ebe83 100644 --- a/src/mesa/swrast/s_pointtemp.h +++ b/src/mesa/swrast/s_pointtemp.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 + * Version: 6.5.3 * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 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"), @@ -194,7 +194,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert ) {{ GLint x, y; const GLfloat radius = 0.5F * size; - const GLint z = (GLint) (vert->win[2] + 0.5F); + const GLuint z = (GLuint) (vert->win[2] + 0.5F); GLuint count; #if FLAGS & SMOOTH const GLfloat rmin = radius - 0.7071F; /* 0.7071 = sqrt(2)/2 */ -- cgit v1.2.3