Module: wine Branch: master Commit: 404aecb8daa1306479559b0cf2882de2268ddc44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404aecb8daa1306479559b0cf2...
Author: Stefan Dösinger stefan@codeweavers.com Date: Mon Sep 28 12:30:48 2009 +0200
wined3d: Test if result.clip[] works correctly.
The Mac Nvidia driver doesn't implement the result.clip part of GL_NV_vertex_program2_option correctly. It complains about a syntax error if "result.clip[0]" is used. "result.clip" compiles correctly, but supports only one clipplane, and running the shader results in severe rendering bugs.
---
dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/directx.c | 56 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b541a6a..3fefec9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -52,7 +52,8 @@ static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_ /* Returns TRUE if result.clip from GL_NV_vertex_program2 should be used and FALSE otherwise */ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) { - return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); + return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION) && + !(GLINFO_LOCATION.quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); }
static BOOL need_helper_const(const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eeb28e6..8eac47c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -672,6 +672,52 @@ static BOOL match_apple_nvts(const struct wined3d_gl_info *gl_info, const char * return GL_SUPPORT(NV_TEXTURE_SHADER); }
+/* A GL context is provided by the caller */ +static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const char *gl_renderer) +{ + GLuint prog; + BOOL ret = FALSE; + GLint pos; + const char *testcode = + "!!ARBvp1.0\n" + "OPTION NV_vertex_program2;\n" + "MOV result.clip[0], 0.0;\n" + "MOV result.position, 0.0;\n" + "END\n"; + + if(!GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) return FALSE; + + ENTER_GL(); + while(glGetError()); + + GL_EXTCALL(glGenProgramsARB(1, &prog)); + if(!prog) + { + ERR("Failed to create an ARB offset limit test program\n"); + LEAVE_GL(); + return FALSE; + } + GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prog)); + GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(testcode), testcode)); + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if(pos != -1) + { + WARN("GL_NV_vertex_program2_option result.clip[] test failed\n"); + TRACE("error: %s\n", debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + ret = TRUE; + while(glGetError()); + } + else TRACE("GL_NV_vertex_program2_option result.clip[] test passed\n"); + + GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, 0)); + GL_EXTCALL(glDeleteProgramsARB(1, &prog)); + checkGLcall("GL_NV_vertex_program2_option result.clip[] test cleanup"); + + LEAVE_GL(); + return ret; +} + 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->vs_arb_constantsF); @@ -796,6 +842,11 @@ static void quirk_apple_nvts(struct wined3d_gl_info *gl_info) gl_info->supported[NV_TEXTURE_SHADER3] = FALSE; }
+static void quirk_disable_nvvp_clip(struct wined3d_gl_info *gl_info) +{ + gl_info->quirks |= WINED3D_QUIRK_NV_CLIP_BROKEN; +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer); @@ -869,6 +920,11 @@ static const struct driver_quirk quirk_table[] = quirk_apple_nvts, "Apple NV_texture_shader disable" }, + { + match_broken_nv_clip, + quirk_disable_nvvp_clip, + "Apple NV_vertex_program clip bug quirk" + }, };
/* Certain applications (Steam) complain if we report an outdated driver version. In general, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24066c9..b431a1b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -48,6 +48,7 @@ #define WINED3D_QUIRK_SET_TEXCOORD_W 0x00000002 #define WINED3D_QUIRK_GLSL_CLIP_VARYING 0x00000004 #define WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA 0x00000008 +#define WINED3D_QUIRK_NV_CLIP_BROKEN 0x00000010
/* Texture format fixups */