Module: wine Branch: master Commit: 71723ad086c6f49b6bc367e86d3dc2944f6f13a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71723ad086c6f49b6bc367e86d...
Author: Stefan Dösinger stefan@codeweavers.com Date: Tue May 14 17:38:20 2013 +0200
wined3d: Disable the fixed function vertex pipeline when ARB vertex programs are used.
---
dlls/wined3d/arb_program_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bfade73..ccd8ee3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4701,6 +4701,8 @@ static void shader_arb_select(void *shader_priv, const struct wined3d_context *c GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id)); checkGLcall("glBindProgramARB(GL_VERTEX_PROGRAM_ARB, priv->current_vprogram_id);");
+ priv->vertex_pipe->vp_enable(gl_info, FALSE); + /* Enable OpenGL vertex programs */ gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);");