wined3d: Fix GLSL backend with non-GLSL vertex and pixel pipeline combination.

That can only happen by manually modifying select_vertex_implementation() and select_fragment_implementation(), which may be useful for testing non-default vertex / fragment pipeline implementations.

wined3d: Fix GLSL backend with non-GLSL vertex and pixel pipeline combination.
93c88d34 · Matteo Bruni · Alexandre Julliard · d2a3c9c2 · 93c88d34
Commit 93c88d34 authored Jul 02, 2015 by Matteo Bruni Committed by Alexandre Julliard Jul 03, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

glsl_shader.c dlls/wined3d/glsl_shader.c +2 -2

No files found.
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -6584,7 +6584,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
    WORD attribs_map;
    struct wined3d_string_buffer *tmp_name;

-    if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX)))
+    if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program)
    {
        vs_id = ctx_data->glsl_program->vs.id;
        vs_list = &ctx_data->glsl_program->vs.shader_entry;
@@ -6624,7 +6624,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
        vs_list = &ffp_shader->linked_programs;
    }

-    if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_PIXEL)))
+    if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program)
    {
        ps_id = ctx_data->glsl_program->ps.id;
        ps_list = &ctx_data->glsl_program->ps.shader_entry;