diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-28 13:55:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-28 13:55:41 +0100 |
| commit | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (patch) | |
| tree | 3fd4cc1783510fb6ce17c4c42b4d012014008e5b /mesalib/src/mesa/swrast/s_triangle.c | |
| parent | c6a1477b0092762299491d79b3a8cb094c6456da (diff) | |
| download | vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.tar.gz vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.tar.bz2 vcxsrv-1aee8dafb5391e093f3a111f906ab0d8b6775510.zip | |
mesa xserver git update 28 jan 2012
Diffstat (limited to 'mesalib/src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_triangle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/swrast/s_triangle.c b/mesalib/src/mesa/swrast/s_triangle.c index 124aa5f8e..ddb4792f7 100644 --- a/mesalib/src/mesa/swrast/s_triangle.c +++ b/mesalib/src/mesa/swrast/s_triangle.c @@ -1038,7 +1038,7 @@ _swrast_choose_triangle( struct gl_context *ctx ) * needs to be interpolated. */ if (ctx->Texture._EnabledCoordUnits || - ctx->FragmentProgram._Current || + _swrast_use_fragment_program(ctx) || ctx->ATIFragmentShader._Enabled || _mesa_need_secondary_color(ctx) || swrast->_FogEnabled) { @@ -1060,7 +1060,7 @@ _swrast_choose_triangle( struct gl_context *ctx ) /* First see if we can use an optimized 2-D texture function */ if (ctx->Texture._EnabledCoordUnits == 0x1 - && !ctx->FragmentProgram._Current + && !_swrast_use_fragment_program(ctx) && !ctx->ATIFragmentShader._Enabled && ctx->Texture._EnabledUnits == 0x1 && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT |