wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 21763489982177f4db9e5f8cc8ccb751441f5a2e.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-07-25 17:24:47 +02:00
parent d943e0bd51
commit 2c12e538dd
10 changed files with 94 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/wined3d-conservative_depth/0002-wined3d-Add-conservative-depth-access-information-to.patch
View File

@@ -1,4 +1,4 @@
From 233f63ce576d8d2f321fb41c281a9ff1f62ae491 Mon Sep 17 00:00:00 2001
From 8e70f4d3c05ec6f4b31ab4e0785ea1bd9d071cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 22 Jul 2017 19:39:40 +0200
Subject: wined3d: Add conservative depth access information to glsl pixel
@@ -13,7 +13,7 @@ Subject: wined3d: Add conservative depth access information to glsl pixel
5 files changed, 24 insertions(+)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index d2815b8b3ac..82f6300d0f5 100644
index 86b7c6289bf..d508a965642 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -116,6 +116,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@@ -25,10 +25,10 @@ index d2815b8b3ac..82f6300d0f5 100644
{"GL_ARB_copy_image", ARB_COPY_IMAGE },
{"GL_ARB_debug_output", ARB_DEBUG_OUTPUT },
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index df27c3286e7..c6c3011b9bb 100644
index 1fe6f86bd35..5b0cc5964fd 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7312,10 +7312,20 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
@@ -7265,10 +7265,20 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context
* nvidia drivers write a warning if we don't do so. */
if (gl_info->supported[ARB_TEXTURE_RECTANGLE])
shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n");
@@ -50,10 +50,10 @@ index df27c3286e7..c6c3011b9bb 100644
* This is NOT done inside the loop that declares the texture samplers
* since the NP2 fixup code is currently only used for the GeforceFX
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 8485a0e784a..e48709fb597 100644
index 014b0a69244..a27b1566193 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1133,6 +1133,17 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
@@ -1148,6 +1148,17 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
FIXME("Invalid instruction %#x for shader type %#x.\n",
ins.handler_idx, shader_version.type);
}
@@ -72,7 +72,7 @@ index 8485a0e784a..e48709fb597 100644
{
if (shader_version.type == WINED3D_SHADER_TYPE_HULL)
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index a048dc1d74e..4fe1971b5e6 100644
index cf0947b9c33..4f73478a3b4 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -50,6 +50,7 @@ enum wined3d_gl_extension
@@ -84,13 +84,13 @@ index a048dc1d74e..4fe1971b5e6 100644
ARB_COPY_IMAGE,
ARB_DEBUG_OUTPUT,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 040b068ad0e..b62aeb26bbd 100644
index 3377d401985..01bce7fcba3 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3899,6 +3899,7 @@ struct wined3d_pixel_shader
/* Some information about the shader behavior */
BOOL color0_mov;
@@ -3938,6 +3938,7 @@ struct wined3d_pixel_shader
DWORD color0_reg;
BOOL force_early_depth_stencil;
+ DWORD depth_compare;
};