thanoulas

Quote

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 36aafee..d432d90 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -767,13 +767,35 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re
	 return gl_vendor == GL_VENDOR_FGLRX;
}

+static void quirk_arb_constants(struct wined3d_gl_info *gl_info)
+{
+	/* MacOS always reports 4096 MAX_VERTEX_UNIFORM_COMPONENTS, which means
+	 * 1024 VS_FLOAT_CONSTANTS. This is fine with nVidia, but the ATi drivers
+	 * in OS X use some vertex shaders for internal calculations.
+	 * This number is never subtracted from the available ones, and OS X always
+	 * advertises 1024, so when an application tries to access these constants
+	 * they have incorrect values. This hack lets the user report a fixed number
+	 */
+	if (wined3d_settings.override_vertex_constants) {
+		FIXME("Using Constants Override\n");
+		gl_info->limits.glsl_vs_float_constants = wined3d_settings.vertex_constants_number;
+		FIXME("Constants Number is now set at %i\n", wined3d_settings.vertex_constants_number);
+	}
+}
+
static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info)
{
+	quirk_arb_constants(gl_info);
	 /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms.
	  * Beyond that the general uniform isn't optimal, so reserve a number of uniforms. 12 vec4's should
	  * allow 48 different offsets or other helper immediate values. */
-	TRACE("Reserving 12 GLSL constants for compiler private use.\n");
-	gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12);
+	
+	// Dont reserve anything if we're using the shader hack and the available shaders are less than 270
+	if (!wined3d_settings.override_vertex_constants &&
+		wined3d_settings.vertex_constants_number > 269) {
+		TRACE("Reserving 12 GLSL constants for compiler private use.\n");
+		gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12);
+	}
}

static void quirk_amd_dx9(struct wined3d_gl_info *gl_info)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 2247e9c..9435ee4 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -84,6 +84,8 @@ struct wined3d_settings wined3d_settings =
	 TRUE,		   /* Multisampling enabled by default. */
	 FALSE,		  /* No strict draw ordering. */
	 TRUE,		   /* Don't try to render onscreen by default. */
+	FALSE,		  /* Override vertex constants? */
+	1024,		   /* Number of vertex shaders to use */
};

/* Do not call while under the GL lock. */
@@ -323,6 +325,21 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
			 TRACE("Not always rendering backbuffers offscreen.\n");
			 wined3d_settings.always_offscreen = FALSE;
		 }
+		if (!get_config_key(hkey, appkey, "OverrideVertexShaders", buffer, size)
+				&& !strcmp(buffer,"enabled"))
+		{
+			TRACE("Override Vertex Shader Constants\n");
+			wined3d_settings.override_vertex_constants = TRUE;
+		}
+		if (!get_config_key(hkey, appkey, "VertexShaderConstants", buffer, size))
+		{
+			int TmpVertexShaderConstants = atoi(buffer);
+			if (TmpVertexShaderConstants > 0)
+			{
+				wined3d_settings.vertex_constants_number = TmpVertexShaderConstants;
+				TRACE("Use %i Vertex Shader Constants\n", TmpVertexShaderConstants);
+			}
+		}
	 }
	 if (wined3d_settings.vs_mode == VS_HW)
		 TRACE("Allow HW vertex shaders\n");
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 5ea23b4..0e79f5d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -281,6 +281,8 @@ struct wined3d_settings
	 int allow_multisampling;
	 BOOL strict_draw_ordering;
	 BOOL always_offscreen;
+	BOOL override_vertex_constants;
+	int vertex_constants_number;
};

extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 48a6ef4..1b0f961 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -768,8 +768,25 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re
	 return gl_vendor == GL_VENDOR_FGLRX;
}

+static void quirk_arb_constants(struct wined3d_gl_info *gl_info)
+{
+	/* MacOS always reports 4096 MAX_VERTEX_UNIFORM_COMPONENTS, which means
+	 * 1024 VS_FLOAT_CONSTANTS. This is fine with nVidia, but the ATi drivers
+	 * in OS X use some vertex shaders for internal calculations.
+	 * This number is never subtracted from the available ones, and OS X always
+	 * advertises 1024, so when an application tries to access these constants
+	 * they have incorrect values. This hack lets the user report a fixed number
+	 */
+	if (wined3d_settings.override_vertex_constants) {
+		FIXME("Using Constants Override\n");
+		gl_info->limits.glsl_vs_float_constants = wined3d_settings.vertex_constants_number;
+		FIXME("Constants Number is now set at %i\n", wined3d_settings.vertex_constants_number);
+	}
+}
+
static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info)
{
+	quirk_arb_constants(gl_info);
	 /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms.
	  * Beyond that the general uniform isn't optimal, so reserve a number of uniforms. 12 vec4's should
	  * allow 48 different offsets or other helper immediate values. */
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 2247e9c..9435ee4 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -84,6 +84,8 @@ struct wined3d_settings wined3d_settings =
	 TRUE,		   /* Multisampling enabled by default. */
	 FALSE,		  /* No strict draw ordering. */
	 TRUE,		   /* Don't try to render onscreen by default. */
+	FALSE,		  /* Override vertex constants? */
+	1024,		   /* Number of vertex shaders to use */
};

/* Do not call while under the GL lock. */
@@ -323,6 +325,21 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
			 TRACE("Not always rendering backbuffers offscreen.\n");
			 wined3d_settings.always_offscreen = FALSE;
		 }
+		if (!get_config_key(hkey, appkey, "OverrideVertexShaders", buffer, size)
+				&& !strcmp(buffer,"enabled"))
+		{
+			TRACE("Override Vertex Shader Constants\n");
+			wined3d_settings.override_vertex_constants = TRUE;
+		}
+		if (!get_config_key(hkey, appkey, "VertexShaderConstants", buffer, size))
+		{
+			int TmpVertexShaderConstants = atoi(buffer);
+			if (TmpVertexShaderConstants > 0)
+			{
+				wined3d_settings.vertex_constants_number = TmpVertexShaderConstants;
+				TRACE("Use %i Vertex Shader Constants\n", TmpVertexShaderConstants);
+			}
+		}
	 }
	 if (wined3d_settings.vs_mode == VS_HW)
		 TRACE("Allow HW vertex shaders\n");
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b5fd4f0..72a549c 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -281,6 +281,8 @@ struct wined3d_settings
	 int allow_multisampling;
	 BOOL strict_draw_ordering;
	 BOOL always_offscreen;
+	BOOL override_vertex_constants;
+	int vertex_constants_number;
};

extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;