Stefan Dösinger : wined3d: Do not report pixel shaders if not supported.

Alexandre Julliard julliard at winehq.org
Wed Apr 2 16:36:22 CDT 2008


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Apr  1 16:02:10 2008 +0200

wined3d: Do not report pixel shaders if not supported.

---

 dlls/wined3d/arb_program_shader.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 8868dac..e372cdc 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -2049,13 +2049,17 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info
      */
     none_shader_backend.shader_get_caps(devtype, gl_info, pCaps);
 
-    pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1);
-    TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n");
-    pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF);
+    if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) {
+        pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1);
+        TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n");
+        pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF);
+    }
 
-    pCaps->PixelShaderVersion    = WINED3DPS_VERSION(1,4);
-    pCaps->PixelShader1xMaxValue = 8.0;
-    TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n");
+    if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {
+        pCaps->PixelShaderVersion    = WINED3DPS_VERSION(1,4);
+        pCaps->PixelShader1xMaxValue = 8.0;
+        TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n");
+    }
 }
 
 static void shader_arb_load_init(void) {




More information about the wine-cvs mailing list