Committing in .
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
@@ -1,4 +1,4 @@
|
||||
#include "types.h"
|
||||
#include "mtypes.h"
|
||||
#include "mem.h"
|
||||
|
||||
#include "t_context.h"
|
||||
@@ -22,18 +22,18 @@ struct immediate *_mesa_CurrentInput = NULL;
|
||||
#endif
|
||||
|
||||
|
||||
GLboolean
|
||||
GLboolean
|
||||
_tnl_flush_vertices( GLcontext *ctx, GLuint flush_flags )
|
||||
{
|
||||
TNLcontext *tnl = TNL_CONTEXT(ctx);
|
||||
struct immediate *IM = TNL_CURRENT_IM(ctx);
|
||||
|
||||
if ((IM->Flag[IM->Count] & (VERT_BEGIN|VERT_END)) != VERT_END ||
|
||||
(flush_flags & (FLUSH_STORED_VERTICES|FLUSH_UPDATE_CURRENT)))
|
||||
(flush_flags & (FLUSH_STORED_VERTICES|FLUSH_UPDATE_CURRENT)))
|
||||
{
|
||||
if (IM->Flag[IM->Start])
|
||||
if (IM->Flag[IM->Start])
|
||||
_mesa_flush_vb( ctx );
|
||||
|
||||
|
||||
/* Although this code updates the ctx->Current values, that bit
|
||||
* is left set as there is no easy mechanism to set it
|
||||
* elsewhere. This means that each time core wants to examine
|
||||
@@ -57,7 +57,7 @@ _tnl_CreateContext( GLcontext *ctx )
|
||||
static int firsttime = 1;
|
||||
|
||||
/* Onetime initializations. Doesn't really matter if this gets
|
||||
* done twice: no need for mutexes.
|
||||
* done twice: no need for mutexes.
|
||||
*/
|
||||
if (firsttime) {
|
||||
firsttime = 0;
|
||||
@@ -88,7 +88,7 @@ _tnl_CreateContext( GLcontext *ctx )
|
||||
|
||||
ctx->swtnl_im = (void *)TNL_VB(ctx)->IM;
|
||||
|
||||
|
||||
|
||||
/* Initialize tnl state.
|
||||
*/
|
||||
_tnl_dlist_init( ctx );
|
||||
@@ -113,7 +113,7 @@ _tnl_CreateContext( GLcontext *ctx )
|
||||
|
||||
|
||||
/* Set a few default values in the driver struct. This is a
|
||||
* temporary mechanism.
|
||||
* temporary mechanism.
|
||||
*/
|
||||
ctx->Driver.RenderVBCulledTab = _tnl_render_tab_cull;
|
||||
ctx->Driver.RenderVBClippedTab = _tnl_render_tab_clipped;
|
||||
@@ -156,16 +156,16 @@ _tnl_DestroyContext( GLcontext *ctx )
|
||||
}
|
||||
|
||||
|
||||
/* Update all state that references _NeedEyeCoords
|
||||
/* Update all state that references _NeedEyeCoords
|
||||
*/
|
||||
void
|
||||
_tnl_LightingSpaceChange( GLcontext *ctx )
|
||||
{
|
||||
_tnl_update_normal_transform( ctx );
|
||||
_tnl_update_normal_transform( ctx );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
void
|
||||
_tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
|
||||
{
|
||||
if (new_state & _NEW_LIGHT)
|
||||
@@ -177,7 +177,7 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
|
||||
if (new_state & _NEW_TEXTURE)
|
||||
if (ctx->_Enabled & ENABLE_TEXGEN_ANY)
|
||||
_tnl_update_texgen( ctx );
|
||||
|
||||
|
||||
if (new_state & (_NEW_LIGHT|_NEW_TEXTURE|_NEW_FOG|
|
||||
_DD_NEW_TRI_LIGHT_TWOSIDE |
|
||||
_DD_NEW_SEPERATE_SPECULAR |
|
||||
@@ -191,8 +191,8 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
|
||||
}
|
||||
|
||||
void
|
||||
_tnl_MakeCurrent( GLcontext *ctx,
|
||||
GLframebuffer *drawBuffer,
|
||||
_tnl_MakeCurrent( GLcontext *ctx,
|
||||
GLframebuffer *drawBuffer,
|
||||
GLframebuffer *readBuffer )
|
||||
{
|
||||
#ifndef THREADS
|
||||
|
||||
Reference in New Issue
Block a user