Matteo Bruni : wined3d: Ensure GL_FRAGMENT_PROGRAM_ARB is enabled when using ARB shaders.
Alexandre Julliard
julliard at winehq.org
Fri Nov 9 11:03:23 CST 2012
Module: wine
Branch: master
Commit: b532284a9ec23cd3663761e3dd83d355754cc2cb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b532284a9ec23cd3663761e3dd83d355754cc2cb
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Fri Nov 9 15:20:34 2012 +0100
wined3d: Ensure GL_FRAGMENT_PROGRAM_ARB is enabled when using ARB shaders.
---
dlls/wined3d/arb_program_shader.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index aa89d59..6328fdf 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4676,13 +4676,12 @@ static void shader_arb_select(const struct wined3d_context *context, enum wined3
checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id);");
if (!priv->use_arbfp_fixed_func)
- {
priv->fragment_pipe->enable_extension(gl_info, FALSE);
- /* Enable OpenGL fragment programs. */
- gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB);
- checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);");
- }
+ /* Enable OpenGL fragment programs. */
+ gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB);
+ checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);");
+
TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n",
device, priv->current_fprogram_id);
More information about the wine-cvs
mailing list