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 7b62a970e9ad3b4179394cf54f0232475fe2388a

Browse Source
This commit is contained in:
Zebediah Figura
2018-02-27 19:59:50 -06:00
parent 7ae8e84d71
commit 7d1d3410c8
17 changed files with 119 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@@ -271,7 +271,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2499,7 +2499,11 @@ static BOOL surface_load_texture(struct wined3d_surface *surface,
@@ -2505,7 +2505,11 @@ static BOOL surface_load_texture(struct wined3d_surface *surface,
/* Don't use PBOs for converted surfaces. During PBO conversion we look at
* WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is
* getting called. */
@@ -576,7 +576,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2897,6 +2897,16 @@ struct wined3d_dummy_textures
@@ -2895,6 +2895,16 @@ struct wined3d_dummy_textures
GLuint tex_2d_ms_array;
};
@@ -593,7 +593,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
#define WINED3D_UNMAPPED_STAGE ~0u
/* Multithreaded flag. Removed from the public header to signal that
@@ -2997,6 +3007,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
@@ -2995,6 +3005,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN;
@@ -606,7 +606,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
{
@@ -3196,7 +3212,11 @@ struct wined3d_texture
@@ -3194,7 +3210,11 @@ struct wined3d_texture
unsigned int map_count;
DWORD locations;
@@ -618,7 +618,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
} sub_resources[1];
};
@@ -3521,6 +3541,9 @@ struct wined3d_cs_queue
@@ -3519,6 +3539,9 @@ struct wined3d_cs_queue
struct wined3d_cs_ops
{