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 66c7b37a9819195d40f5ab053268548c4370fb06.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-05-17 01:00:41 +02:00
parent ebabcd69b5
commit 142cc2eda5
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1321,7 +1321,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view);
return WINED3D_OK;
@@ -945,6 +952,10 @@ static void wined3d_unordered_access_view_cs_init(void *object)
@@ -946,6 +953,10 @@ static void wined3d_unordered_access_view_cs_init(void *object)
desc, texture, view->format);
}
}
@@ -1332,7 +1332,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
}
static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view,
@@ -964,6 +975,9 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
@@ -965,6 +976,9 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
wined3d_resource_incref(view->resource = resource);
@@ -1360,7 +1360,7 @@ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.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
@@ -2657,6 +2657,16 @@ struct wined3d_state
@@ -2666,6 +2666,16 @@ struct wined3d_state
struct wined3d_rasterizer_state *rasterizer_state;
};
@@ -1377,7 +1377,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
@@ -2768,6 +2778,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
@@ -2777,6 +2787,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;
@@ -1390,7 +1390,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)
{
@@ -2954,7 +2970,11 @@ struct wined3d_texture
@@ -2963,7 +2979,11 @@ struct wined3d_texture
unsigned int map_count;
DWORD locations;
@@ -1402,7 +1402,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
} sub_resources[1];
};
@@ -3262,7 +3282,12 @@ struct wined3d_cs_queue
@@ -3271,7 +3291,12 @@ struct wined3d_cs_queue
struct wined3d_cs_ops
{
@@ -1415,7 +1415,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void (*submit)(struct wined3d_cs *cs);
void (*finish)(struct wined3d_cs *cs);
void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p,
@@ -3279,7 +3304,13 @@ struct wined3d_cs
@@ -3288,7 +3313,13 @@ struct wined3d_cs
HANDLE thread;
DWORD thread_id;
@@ -1429,7 +1429,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
size_t data_size, start, end;
void *data;
struct list query_poll_list;
@@ -3362,6 +3393,9 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined
@@ -3371,6 +3402,9 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined
void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;