Stefan Dösinger : wined3d: Use the ARB native constant limit in the GLSL-ARB constants quirk.

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Wed Oct  7 22:10:44 2009 +0200

wined3d: Use the ARB native constant limit in the GLSL-ARB constants quirk.

Geforce 8 and Geforce 9 cards support 256 env and 1024 native
constants. 1024 is the hardware limit we want to use if we overwrite
the GLSL reported value with the ARB value on Mac OS (because Mac OS
reports more constants than supported by HW on some cards).

---

 dlls/wined3d/directx.c    |   15 +++++++++++----
 dlls/wined3d/wined3d_gl.h |    5 ++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index c145bf9..b7c0f8a 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -688,10 +688,10 @@ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const ch
 
 static void quirk_arb_constants(struct wined3d_gl_info *gl_info)
 {
-    TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->max_vs_arb_constantsF);
-    gl_info->max_vs_glsl_constantsF = gl_info->max_vs_arb_constantsF;
-    TRACE_(d3d_caps)("Using ARB ps constant limit(=%u) for GLSL.\n", gl_info->max_ps_arb_constantsF);
-    gl_info->max_ps_glsl_constantsF = gl_info->max_ps_arb_constantsF;
+    TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->max_vs_arb_native_constants);
+    gl_info->max_vs_glsl_constantsF = gl_info->max_vs_arb_native_constants;
+    TRACE_(d3d_caps)("Using ARB ps constant limit(=%u) for GLSL.\n", gl_info->max_ps_arb_native_constants);
+    gl_info->max_ps_glsl_constantsF = gl_info->max_ps_arb_native_constants;
 }
 
 static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info)
@@ -1593,6 +1593,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str
     gl_info->max_ps_glsl_constantsF = 0;
     gl_info->max_vs_arb_constantsF = 0;
     gl_info->max_ps_arb_constantsF = 0;
+    gl_info->max_vs_arb_native_constants = 0;
     gl_info->max_ps_arb_local_constants = 0;
 
     /* Retrieve opengl defaults */
@@ -1836,6 +1837,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str
         GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max));
         gl_info->max_ps_arb_constantsF = gl_max;
         TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM float constants: %d.\n", gl_info->max_ps_arb_constantsF);
+        GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB, &gl_max));
+        gl_info->max_ps_arb_native_constants = gl_max;
+        TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native float constants: %d.\n", gl_info->max_ps_arb_native_constants);
         GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max));
         gl_info->max_ps_arb_temps = gl_max;
         TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native temporaries: %d.\n", gl_info->max_ps_arb_temps);
@@ -1851,6 +1855,9 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str
         GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max));
         gl_info->max_vs_arb_constantsF = gl_max;
         TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM float constants: %d.\n", gl_info->max_vs_arb_constantsF);
+        GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB, &gl_max));
+        gl_info->max_vs_arb_native_constants = gl_max;
+        TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native float constants: %d.\n", gl_info->max_vs_arb_native_constants);
         GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max));
         gl_info->max_vs_arb_temps = gl_max;
         TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native temporaries: %d.\n", gl_info->max_vs_arb_temps);
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index 446a7a0..7ad25d8 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -4160,14 +4160,13 @@ struct wined3d_gl_info
     UINT max_glsl_varyings;
     float max_shininess;
 
-    unsigned int max_vshader_constantsF;
-    unsigned int max_pshader_constantsF;
-
     unsigned int max_vs_arb_constantsF;
+    unsigned int max_vs_arb_native_constants;
     unsigned int max_vs_arb_instructions;
     unsigned int max_vs_arb_temps;
     unsigned int max_ps_arb_constantsF;
     unsigned int max_ps_arb_local_constants;
+    unsigned int max_ps_arb_native_constants;
     unsigned int max_ps_arb_instructions;
     unsigned int max_ps_arb_temps;
     unsigned int max_vs_glsl_constantsF;