Module: wine Branch: master Commit: 035729ab9782a2a31e4cd3650cae1ea80dbdfa01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035729ab9782a2a31e4cd3650c...
Author: Stefan Dösinger stefan@codeweavers.com Date: Fri Sep 5 12:58:58 2008 -0500
wined3d: Don't disable arbfp if the pipeline replacement is in.
---
dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a8d5633..d22ec7c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1908,7 +1908,7 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);");
TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + } else if(!priv->use_arbfp_fixed_func) { glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); }