Henri Verbeet : wined3d: Properly check for the required extensions before selecting the GLSL FFP implementations.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: c78724e6d4ae1442fc1917ccd4353c9d9a3dfe12
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c78724e6d4ae1442fc1917ccd4...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Nov 23 14:30:29 2016 +0100

wined3d: Properly check for the required extensions before selecting the GLSL FFP implementations.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 6690c7090c35aff776418ef2441e1b065c81f5b3)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/wined3d/directx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 63d54fa..dd2164d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2465,7 +2465,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct shader_caps *shad
 static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const struct wined3d_gl_info *gl_info,
         const struct wined3d_shader_backend_ops *shader_backend_ops)
 {
-    if (shader_backend_ops == &glsl_shader_backend)
+    if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_VERTEX_SHADER])
         return &glsl_vertex_pipe;
     return &ffp_vertex_pipe;
 }
@@ -2473,7 +2473,7 @@ static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const
 static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info,
         const struct wined3d_shader_backend_ops *shader_backend_ops)
 {
-    if (shader_backend_ops == &glsl_shader_backend)
+    if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_FRAGMENT_SHADER])
         return &glsl_fragment_pipe;
     if (shader_backend_ops == &arb_program_shader_backend && gl_info->supported[ARB_FRAGMENT_PROGRAM])
         return &arbfp_fragment_pipeline;