diff options
| author | Dave Airlie <airliedfreedesktop.org> | 2005-09-02 23:52:05 +0000 |
|---|---|---|
| committer | Dave Airlie <airliedfreedesktop.org> | 2005-09-02 23:52:05 +0000 |
| commit | 624ad14a581e9befdfda5335b775d8d1f55fbe56 (patch) | |
| tree | 56f6b15c54c77517498a878271ed5f1238aa6e7a /src/mesa/swrast/s_triangle.c | |
| parent | 712e5042de57bb49f5f5c804c56d5015b171a557 (diff) | |
Check for ATI_fragment_shader enabled
Diffstat (limited to 'src/mesa/swrast/s_triangle.c')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 29134d02e90..08796471c56 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1073,7 +1073,7 @@ _swrast_choose_triangle( GLcontext *ctx ) } } - if (ctx->Texture._EnabledCoordUnits || ctx->FragmentProgram._Active) { + if (ctx->Texture._EnabledCoordUnits || ctx->FragmentProgram._Active || ctx->ATIFragmentShader._Enabled) { /* Ugh, we do a _lot_ of tests to pick the best textured tri func */ const struct gl_texture_object *texObj2D; const struct gl_texture_image *texImg; @@ -1089,6 +1089,7 @@ _swrast_choose_triangle( GLcontext *ctx ) /* First see if we can use an optimized 2-D texture function */ if (ctx->Texture._EnabledCoordUnits == 0x1 && !ctx->FragmentProgram._Active + && !ctx->ATIFragmentShader._Enabled && ctx->Texture.Unit[0]._ReallyEnabled == TEXTURE_2D_BIT && texObj2D->WrapS == GL_REPEAT && texObj2D->WrapT == GL_REPEAT |