Rebase against b75cd7e2f0f6f40655f690695ab0843fce472e88.

This commit is contained in:
Sebastian Lackner
2015-06-02 15:34:19 +02:00
parent ad87c93337
commit b9ec1ed8f5
6 changed files with 67 additions and 108 deletions

View File

@@ -9072,7 +9072,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1872,7 +1872,11 @@
@@ -1869,7 +1869,11 @@
}
}
@@ -9084,7 +9084,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
{
HeapFree(GetProcessHeap(), 0, shader->output_signature.elements);
HeapFree(GetProcessHeap(), 0, shader->input_signature.elements);
@@ -2129,10 +2133,16 @@
@@ -2126,10 +2130,16 @@
if (!refcount)
{
@@ -9101,7 +9101,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
}
return refcount;
@@ -2407,7 +2417,11 @@
@@ -2404,7 +2414,11 @@
memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */
if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE])
{