diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-23 14:16:46 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-23 14:16:46 +0000 |
| commit | 6d460af6af77a0d5a5b568bcd6094b98e249ba93 (patch) | |
| tree | 08656028582b357d5c9730c521cc3e1770604c50 /src/mesa/swrast_setup/ss_triangle.c | |
| parent | 384800fe12e368f3489111de4572dbc8846a7dea (diff) | |
| download | external_mesa3d-6d460af6af77a0d5a5b568bcd6094b98e249ba93.zip external_mesa3d-6d460af6af77a0d5a5b568bcd6094b98e249ba93.tar.gz external_mesa3d-6d460af6af77a0d5a5b568bcd6094b98e249ba93.tar.bz2 | |
Added ctx->Vertex/FragmentProgram._Enable flags. Set when vertex/fragment
program is enabled AND the currently bound program is valid.
Check _Enable instead of Enable to prevent things from blowing up
when someone calls glEnable(GL_VERTEX_PROGRAM_ARB) without actually
defining a program.
Diffstat (limited to 'src/mesa/swrast_setup/ss_triangle.c')
| -rw-r--r-- | src/mesa/swrast_setup/ss_triangle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast_setup/ss_triangle.c b/src/mesa/swrast_setup/ss_triangle.c index 88ae07f..00876fe6 100644 --- a/src/mesa/swrast_setup/ss_triangle.c +++ b/src/mesa/swrast_setup/ss_triangle.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.0.1 + * Version: 6.1 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 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"), @@ -291,7 +291,7 @@ void _swsetup_choose_trifuncs( GLcontext *ctx ) ind |= SS_OFFSET_BIT; if ((ctx->Light.Enabled && ctx->Light.Model.TwoSide) || - (ctx->VertexProgram.Enabled && ctx->VertexProgram.TwoSideEnabled)) + (ctx->VertexProgram._Enabled && ctx->VertexProgram.TwoSideEnabled)) ind |= SS_TWOSIDE_BIT; /* We piggyback the two-sided stencil front/back determination on the |