From 8bede1622269fc5a0766173f6112f92998dd4d10 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 30 May 2016 18:24:40 +0200 Subject: [PATCH] Rebase against c89dc58deb9ba74d8dcd7faf7012203cff0724a0. --- patches/patchinstall.sh | 2 +- ...tiple-registry-notifications-for-the.patch | 22 +++--- ...ort-for-extra-large-and-jumbo-icon-l.patch | 6 +- ...ate_default_sampler-from-create_dumm.patch | 22 +++--- .../wined3d-CSMT_Main/9999-IfDefined.patch | 78 +++++++++---------- 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 62f3f34e..1515b2be 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "81c700e0f8f8670f9c3b05a4baab2b2cffaeff89" + echo "c89dc58deb9ba74d8dcd7faf7012203cff0724a0" } # Show version information diff --git a/patches/server-Registry_Notifications/0001-server-Allow-multiple-registry-notifications-for-the.patch b/patches/server-Registry_Notifications/0001-server-Allow-multiple-registry-notifications-for-the.patch index 46792919..31b21823 100644 --- a/patches/server-Registry_Notifications/0001-server-Allow-multiple-registry-notifications-for-the.patch +++ b/patches/server-Registry_Notifications/0001-server-Allow-multiple-registry-notifications-for-the.patch @@ -1,4 +1,4 @@ -From b556ce4de01cf5e98a486aa13c26d5d5f651d33d Mon Sep 17 00:00:00 2001 +From 7d0a3a7800a523d111df2d40da43ee7bb4ab362b Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 13 Nov 2015 22:39:00 +0100 Subject: server: Allow multiple registry notifications for the same key. @@ -9,11 +9,11 @@ Subject: server: Allow multiple registry notifications for the same key. 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c -index 96f190b..e0a58f2 100644 +index 0160869..e67b2b4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c -@@ -1611,7 +1611,7 @@ static void test_notify(void) - ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); +@@ -1785,7 +1785,7 @@ static void test_notify(void) + pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); @@ -21,7 +21,7 @@ index 96f190b..e0a58f2 100644 status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); -@@ -1624,7 +1624,7 @@ static void test_notify(void) +@@ -1798,7 +1798,7 @@ static void test_notify(void) ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); @@ -30,7 +30,7 @@ index 96f190b..e0a58f2 100644 status = pNtWaitForSingleObject(events[1], FALSE, &timeout); ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); -@@ -1638,7 +1638,7 @@ static void test_notify(void) +@@ -1812,7 +1812,7 @@ static void test_notify(void) pNtClose(key); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); @@ -40,7 +40,7 @@ index 96f190b..e0a58f2 100644 ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); diff --git a/server/registry.c b/server/registry.c -index c95e103..ead9749 100644 +index 97b16ed..53a8d43 100644 --- a/server/registry.c +++ b/server/registry.c @@ -50,10 +50,16 @@ @@ -61,7 +61,7 @@ index c95e103..ead9749 100644 int subtree; /* true if subtree notification */ unsigned int filter; /* which events to notify on */ obj_handle_t hkey; /* hkey associated with this notification */ -@@ -303,12 +309,17 @@ static void key_dump( struct object *obj, int verbose ) +@@ -313,12 +319,17 @@ static struct object_type *key_get_type( struct object *obj ) /* notify waiter and maybe delete the notification */ static void do_notification( struct key *key, struct notify *notify, int del ) { @@ -83,7 +83,7 @@ index c95e103..ead9749 100644 if (del) { list_remove( ¬ify->entry ); -@@ -2260,6 +2271,7 @@ DECL_HANDLER(set_registry_notification) +@@ -2263,6 +2274,7 @@ DECL_HANDLER(set_registry_notification) struct key *key; struct event *event; struct notify *notify; @@ -91,7 +91,7 @@ index c95e103..ead9749 100644 key = get_hkey_obj( req->hkey, KEY_NOTIFY ); if (key) -@@ -2268,29 +2280,20 @@ DECL_HANDLER(set_registry_notification) +@@ -2271,29 +2283,20 @@ DECL_HANDLER(set_registry_notification) if (event) { notify = find_notify( key, current->process, req->hkey ); @@ -133,5 +133,5 @@ index c95e103..ead9749 100644 set_error( STATUS_PENDING ); } -- -2.6.2 +2.8.0 diff --git a/patches/shell32-Icons/0001-shell32-Add-support-for-extra-large-and-jumbo-icon-l.patch b/patches/shell32-Icons/0001-shell32-Add-support-for-extra-large-and-jumbo-icon-l.patch index 13e58026..cd58c3e7 100644 --- a/patches/shell32-Icons/0001-shell32-Add-support-for-extra-large-and-jumbo-icon-l.patch +++ b/patches/shell32-Icons/0001-shell32-Add-support-for-extra-large-and-jumbo-icon-l.patch @@ -25,7 +25,7 @@ index 4549d5b..2aff054 100644 static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -109,7 +111,7 @@ static int SIC_LoadOverlayIcon(int icon_idx); - * Creates a new icon as a copy of the passed-in icon, overlayed with a + * Creates a new icon as a copy of the passed-in icon, overlaid with a * shortcut image. */ -static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) @@ -143,7 +143,7 @@ index 4549d5b..2aff054 100644 - } - else - { -- WARN("Failed to create shortcut overlayed icons\n"); +- WARN("Failed to create shortcut overlaid icons\n"); - if (NULL != hiconLargeShortcut) DestroyIcon(hiconLargeShortcut); - if (NULL != hiconSmallShortcut) DestroyIcon(hiconSmallShortcut); - dwFlags &= ~ GIL_FORSHORTCUT; @@ -163,7 +163,7 @@ index 4549d5b..2aff054 100644 + } + else + { -+ WARN("Failed to create shortcut overlayed icons\n"); ++ WARN("Failed to create shortcut overlaid icons\n"); + if (NULL != hiconSmallShortcut) DestroyIcon(hiconSmallShortcut); + if (NULL != hiconLargeShortcut) DestroyIcon(hiconLargeShortcut); + if (NULL != hiconExtraLargeShortcut) DestroyIcon(hiconExtraLargeShortcut); diff --git a/patches/wined3d-CSMT_Main/0124-wined3d-Call-create_default_sampler-from-create_dumm.patch b/patches/wined3d-CSMT_Main/0124-wined3d-Call-create_default_sampler-from-create_dumm.patch index e5455a1a..50a13690 100644 --- a/patches/wined3d-CSMT_Main/0124-wined3d-Call-create_default_sampler-from-create_dumm.patch +++ b/patches/wined3d-CSMT_Main/0124-wined3d-Call-create_default_sampler-from-create_dumm.patch @@ -1,4 +1,4 @@ -From 599f955bdd8f68dfd55f473491f9d22dcb4448c8 Mon Sep 17 00:00:00 2001 +From e88cf7ce51212f9001e4c4c92f0bf22b1e7e8015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Sat, 7 May 2016 21:16:47 +0100 Subject: wined3d: Call create_default_sampler from create_dummy_textures. @@ -9,7 +9,7 @@ I should really rename it, don't feel like it now. 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c -index 67a1c75..b8be31b 100644 +index c58668e..938c56f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -664,6 +664,32 @@ out: @@ -21,9 +21,9 @@ index 67a1c75..b8be31b 100644 + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + + /* -+ * In SM4+ shaders there is a separation between resources and samplers. Some of shader -+ * instructions allow to access resources without using samplers. -+ * In GLSL resources are always accessed through sampler or image variables. The default ++ * In SM4+ shaders there is a separation between resources and samplers. Some shader ++ * instructions allow access to resources without using samplers. ++ * In GLSL, resources are always accessed through sampler or image variables. The default + * sampler object is used to emulate the direct resource access when there is no sampler state + * to use. + */ @@ -63,9 +63,9 @@ index 67a1c75..b8be31b 100644 - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - - /* -- * In SM4+ shaders there is a separation between resources and samplers. Some of shader -- * instructions allow to access resources without using samplers. -- * In GLSL resources are always accessed through sampler or image variables. The default +- * In SM4+ shaders there is a separation between resources and samplers. Some shader +- * instructions allow access to resources without using samplers. +- * In GLSL, resources are always accessed through sampler or image variables. The default - * sampler object is used to emulate the direct resource access when there is no sampler state - * to use. - */ @@ -95,7 +95,7 @@ index 67a1c75..b8be31b 100644 DWORD clear_flags = 0; HRESULT hr; -@@ -1037,9 +1038,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, +@@ -1036,9 +1037,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device_init_swapchain_state(device, swapchain); wined3d_cs_emit_create_dummy_textures(device->cs); @@ -105,7 +105,7 @@ index 67a1c75..b8be31b 100644 device->contexts[0]->last_was_rhw = 0; -@@ -4560,7 +4558,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d +@@ -4546,7 +4544,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { @@ -113,7 +113,7 @@ index 67a1c75..b8be31b 100644 HRESULT hr; if (FAILED(hr = device->shader_backend->shader_alloc_private(device, -@@ -4587,9 +4584,6 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru +@@ -4573,9 +4570,6 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru } wined3d_cs_emit_create_dummy_textures(device->cs); diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 65c6de41..75342e99 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -2202,9 +2202,9 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + + /* -+ * In SM4+ shaders there is a separation between resources and samplers. Some of shader -+ * instructions allow to access resources without using samplers. -+ * In GLSL resources are always accessed through sampler or image variables. The default ++ * In SM4+ shaders there is a separation between resources and samplers. Some shader ++ * instructions allow access to resources without using samplers. ++ * In GLSL, resources are always accessed through sampler or image variables. The default + * sampler object is used to emulate the direct resource access when there is no sampler state + * to use. + */ @@ -7321,7 +7321,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN; -@@ -2248,7 +2275,11 @@ +@@ -2249,7 +2276,11 @@ struct wined3d_state { DWORD flags; @@ -7333,7 +7333,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; -@@ -2293,6 +2324,7 @@ +@@ -2294,6 +2325,7 @@ DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; }; @@ -7341,7 +7341,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_gl_bo { GLuint name; -@@ -2301,6 +2333,7 @@ +@@ -2302,6 +2334,7 @@ UINT size; }; @@ -7349,7 +7349,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 -@@ -2353,11 +2386,23 @@ +@@ -2354,11 +2387,23 @@ struct wined3d_rendertarget_view *back_buffer_view; struct wined3d_swapchain **swapchains; UINT swapchain_count; @@ -7373,7 +7373,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* For rendering to a texture using glCopyTexImage */ GLuint depth_blt_texture; -@@ -2404,6 +2449,7 @@ +@@ -2405,6 +2450,7 @@ UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; 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; @@ -7381,7 +7381,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) DECLSPEC_HIDDEN; void device_exec_update_texture(struct wined3d_context *context, struct wined3d_texture *src_texture, -@@ -2415,6 +2461,11 @@ +@@ -2416,6 +2462,11 @@ void device_create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_delete_opengl_contexts_cs(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -7393,7 +7393,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) { -@@ -2458,9 +2509,14 @@ +@@ -2459,9 +2510,14 @@ UINT depth; UINT size; DWORD priority; @@ -7408,7 +7408,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *parent; const struct wined3d_parent_ops *parent_ops; -@@ -2486,7 +2542,9 @@ +@@ -2487,7 +2543,9 @@ const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -7418,7 +7418,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; -@@ -2494,6 +2552,7 @@ +@@ -2495,6 +2553,7 @@ DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -7426,7 +7426,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h static inline void wined3d_resource_inc_fence(struct wined3d_resource *resource) { InterlockedIncrement(&resource->access_fence); -@@ -2509,6 +2568,7 @@ +@@ -2510,6 +2569,7 @@ while(InterlockedCompareExchange(&resource->access_fence, 0, 0)); } @@ -7434,7 +7434,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16 -@@ -2566,7 +2626,9 @@ +@@ -2567,7 +2627,9 @@ DWORD flags; GLenum target; DWORD update_map_binding; @@ -7444,7 +7444,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h GLuint rb_multisample; GLuint rb_resolved; -@@ -2604,8 +2666,12 @@ +@@ -2605,8 +2667,12 @@ unsigned int map_count; DWORD locations; @@ -7457,7 +7457,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h } sub_resources[1]; }; -@@ -2656,6 +2722,7 @@ +@@ -2657,6 +2723,7 @@ struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; @@ -7465,7 +7465,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_texture_changed(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_gl_bo *swap_buffer, void *swap_heap_memory) DECLSPEC_HIDDEN; -@@ -2666,6 +2733,13 @@ +@@ -2667,6 +2734,13 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations, BOOL map) DECLSPEC_HIDDEN; @@ -7479,7 +7479,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_invalidate_location(struct wined3d_texture *texture, -@@ -2676,6 +2750,7 @@ +@@ -2677,6 +2751,7 @@ const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; @@ -7487,7 +7487,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); void *wined3d_texture_map_internal(struct wined3d_texture *texture, unsigned int sub_resource_idx, -@@ -2691,6 +2766,15 @@ +@@ -2692,6 +2767,15 @@ const struct wined3d_gl_info *gl_info, GLenum binding) DECLSPEC_HIDDEN; void wined3d_texture_unmap_internal(struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; @@ -7503,7 +7503,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -@@ -2808,7 +2892,11 @@ +@@ -2809,7 +2893,11 @@ unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; @@ -7515,7 +7515,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, -@@ -2819,9 +2907,11 @@ +@@ -2820,9 +2908,11 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; @@ -7527,7 +7527,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -@@ -2836,12 +2926,14 @@ +@@ -2837,12 +2927,14 @@ GLuint name; }; @@ -7542,7 +7542,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_vertex_declaration_element { const struct wined3d_format *format; -@@ -2870,8 +2962,10 @@ +@@ -2871,8 +2963,10 @@ BOOL half_float_conv_needed; }; @@ -7553,7 +7553,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_saved_states { DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; -@@ -2939,6 +3033,7 @@ +@@ -2940,6 +3034,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -7561,7 +7561,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT state_init(struct wined3d_state *state, const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; -@@ -2989,6 +3084,44 @@ +@@ -2990,6 +3085,44 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_switch_onscreen_ds(struct wined3d_cs *cs, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; @@ -7606,7 +7606,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; -@@ -3037,6 +3170,7 @@ +@@ -3038,6 +3171,7 @@ 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; @@ -7614,7 +7614,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_cs_emit_set_consts_f(struct wined3d_cs *cs, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants, enum wined3d_shader_type type) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_consts_b(struct wined3d_cs *cs, unsigned int start_idx, -@@ -3104,6 +3238,14 @@ +@@ -3105,6 +3239,14 @@ void wined3d_cs_emit_delete_opengl_contexts(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_cs_emit_update_swap_interval(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -7629,7 +7629,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d -@@ -3118,8 +3260,12 @@ +@@ -3119,8 +3261,12 @@ struct wined3d_query_ops { HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags); @@ -7642,7 +7642,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h }; struct wined3d_query -@@ -3133,12 +3279,16 @@ +@@ -3134,12 +3280,16 @@ enum wined3d_query_type type; DWORD data_size; void *extendedData; @@ -7659,7 +7659,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other * fixed function semantics as D3DCOLOR or FLOAT16 */ -@@ -3165,7 +3315,9 @@ +@@ -3166,7 +3316,9 @@ GLenum buffer_object_usage; GLenum buffer_type_hint; DWORD flags; @@ -7669,7 +7669,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void *map_ptr; struct wined3d_map_range *maps; -@@ -3190,6 +3342,7 @@ +@@ -3191,6 +3343,7 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -7677,7 +7677,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, -@@ -3199,6 +3352,13 @@ +@@ -3200,6 +3353,13 @@ void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_buffer_cleanup_cs(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; @@ -7691,7 +7691,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_rendertarget_view { -@@ -3231,8 +3391,10 @@ +@@ -3232,8 +3392,10 @@ return texture->sub_resources[view->sub_resource_idx].u.surface; } @@ -7702,7 +7702,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h struct wined3d_shader_resource_view { LONG refcount; -@@ -3242,6 +3404,7 @@ +@@ -3243,6 +3405,7 @@ const struct wined3d_parent_ops *parent_ops; }; @@ -7710,7 +7710,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void wined3d_shader_resource_view_destroy_cs(struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops -@@ -3249,6 +3412,12 @@ +@@ -3250,6 +3413,12 @@ void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, DWORD flags, struct wined3d_rendertarget_view *depth_stencil); @@ -7723,7 +7723,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain); }; -@@ -3284,8 +3453,10 @@ +@@ -3285,8 +3454,10 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -7734,7 +7734,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -@@ -3497,7 +3668,9 @@ +@@ -3498,7 +3669,9 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; @@ -7747,7 +7747,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c -@@ -1998,7 +1998,9 @@ +@@ -2011,7 +2011,9 @@ escape.code = X11DRV_FLUSH_GL_DRAWABLE; escape.gl_drawable = 0; @@ -7757,7 +7757,7 @@ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) { switch (gl->type) -@@ -2024,7 +2026,9 @@ +@@ -2037,7 +2039,9 @@ escape.code = X11DRV_FLUSH_GL_DRAWABLE; escape.gl_drawable = 0;