[PATCH 5/5] wined3d: Disable the fixed function vertex pipeline when ARB vertex programs are used
Stefan Dösinger
stefan at codeweavers.com
Tue May 14 10:38:20 CDT 2013
Analogous to the fragment case, except that we don't have a ARBvp vertex pipeline
replacement we have to watch out for. Makes sure a GLSL vertex pipeline replacement
doesn't override the ARB program when the d3d app uses a vertex shader.
---
dlls/wined3d/arb_program_shader.c | 2 ++
1 file changed, 2 insertions(+)
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);");
--
1.8.1.5
More information about the wine-patches
mailing list