diff options
author | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-28 15:21:45 +0100 |
commit | 59bda88ffb9deb72a727e7d6b4c141fd7d4678f4 (patch) | |
tree | a797879cc0fe54172dba50354b635b1f595081db /mesalib/src/mesa/swrast/s_triangle.c | |
parent | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (diff) | |
parent | 1aee8dafb5391e093f3a111f906ab0d8b6775510 (diff) | |
download | vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.gz vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.bz2 vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winkeybd.h
xorg-server/hw/xwin/winkeynames.h
xorg-server/hw/xwin/winmouse.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
xorg-server/hw/xwin/winprefs.c
xorg-server/hw/xwin/winwindow.h
xorg-server/hw/xwin/winwndproc.c
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 |