wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from omega13a/patch-24

Browse Source 
Update 0003-wined3d-Implement-dual-source-blending.patch
This commit is contained in:
Alistair Leslie-Hughes 2018-02-19 15:34:57 +11:00 committed by GitHub
commit 91fa94203c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
patches/wined3d-Dual_Source_Blending/0003-wined3d-Implement-dual-source-blending.patch
View File

@ -208,7 +208,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index fad3fadeeaa..aca97788f0e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -193,6 +193,7 @@ struct wined3d_d3d_info
@@ -194,6 +194,7 @@ struct wined3d_d3d_info
BOOL vs_clipping;
BOOL shader_color_key;
DWORD valid_rt_mask;
@ -216,7 +216,7 @@ index fad3fadeeaa..aca97788f0e 100644
DWORD wined3d_creation_flags;
BOOL shader_double_precision;
};
@@ -1346,7 +1347,8 @@ struct ps_compile_args
@@ -1353,7 +1354,8 @@ struct ps_compile_args
DWORD flatshading : 1;
DWORD alpha_test_func : 3;
DWORD render_offscreen : 1;
@ -226,17 +226,17 @@ index fad3fadeeaa..aca97788f0e 100644
};
enum fog_src_type
@@ -1872,7 +1874,8 @@ struct wined3d_context
DWORD destroy_delayed : 1;
DWORD transform_feedback_active : 1;
@@ -1910,7 +1912,8 @@ struct wined3d_context
DWORD transform_feedback_paused : 1;
- DWORD padding : 7;
DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */
DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */
- DWORD padding : 9;
+ DWORD last_was_dual_blend : 1;
+ DWORD padding : 6;
DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */
DWORD shader_update_mask;
+ DWORD padding : 8;
DWORD constant_update_mask;
@@ -2476,6 +2479,7 @@ struct wined3d_fbo_ops
DWORD numbered_array_mask;
GLenum tracking_parm; /* Which source is tracking current colour */
@@ -2517,6 +2520,7 @@ struct wined3d_fbo_ops
struct wined3d_gl_limits
{
UINT buffers;
@ -244,7 +244,7 @@ index fad3fadeeaa..aca97788f0e 100644
UINT lights;
UINT textures;
UINT texture_coords;
@@ -2810,6 +2814,22 @@ struct wined3d_state
@@ -2860,6 +2864,22 @@ struct wined3d_state
struct wined3d_rasterizer_state *rasterizer_state;
};
@ -264,9 +264,8 @@ index fad3fadeeaa..aca97788f0e 100644
+ return FALSE;
+}
+
#define WINED3D_UNMAPPED_STAGE ~0u
/* Multithreaded flag. Removed from the public header to signal that
struct wined3d_dummy_textures
{
GLuint tex_2d;
--
2.14.2