Henri Verbeet : wined3d: Don' t require the ARB program shader backend for the ARB fragment program FFP implementation.

Alexandre Julliard julliard at winehq.org
Wed Nov 23 16:08:39 CST 2016


Module: wine
Branch: master
Commit: 3de3e64e8b391ab4f8e1d3f5a797e2dd4e028930
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3de3e64e8b391ab4f8e1d3f5a797e2dd4e028930

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Nov 23 14:30:30 2016 +0100

wined3d: Don't require the ARB program shader backend for the ARB fragment program FFP implementation.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/directx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 2a6e4b6..c9b9146 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2489,7 +2489,7 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru
 {
     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])
+    if (gl_info->supported[ARB_FRAGMENT_PROGRAM])
         return &arbfp_fragment_pipeline;
     if (gl_info->supported[ATI_FRAGMENT_SHADER])
         return &atifs_fragment_pipeline;




More information about the wine-cvs mailing list