From c23d8e27387589a36f46017a9e0c19b641efefb8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 29 Jul 2015 06:54:21 +0200
Subject: [PATCH] Updated CSMT patchset to fix crash in Path of Exile after
 character selection (fixes Wine Staging Bug #451).

---
 debian/changelog                              |   2 +
 patches/patchinstall.sh                       | 352 +++++++++---------
 ...-initialize-format_flags-for-surface.patch |  38 ++
 ...2-wined3d-Merge-get_pitch-functions.patch} |   2 +-
 ...ss-a-context-to-surface_load_sysmem.patch} |   0
 ...-a-context-to-read_from_framebuffer.patch} |   0
 ...ntext-to-surface_load_drawable-and-.patch} |   0
 ...d-Pass-a-context-to-surface_blt_fbo.patch} |   0
 ...ntext-to-surface_multisample_resolv.patch} |   0
 ...s-a-context-to-surface_load_texture.patch} |   0
 ...-a-context-to-surface_load_location.patch} |   0
 ...urface_load_location-return-nothing.patch} |   0
 ...re-volume-locations-in-the-resource.patch} |   0
 ...ove-validate_location-to-resource.c.patch} |   0
 ...surface-locations-into-the-resource.patch} |   0
 ...3d-Remove-surface_validate_location.patch} |  50 +--
 ...e-invalidate_location-to-resource.c.patch} |   0
 ...-Invalidate-containers-via-callback.patch} |   0
 ...-Remove-surface_invalidate_location.patch} |   0
 ...ap_data-and-user_memory-into-the-re.patch} |   0
 ...ove-load_location-into-the-resource.patch} |   0
 ...urface_load_location-with-resource_.patch} |   0
 ...-helper-functions-for-mapping-volum.patch} |   0
 ...me-PBO-infrastructure-into-the-reso.patch} |   0
 ... => 0023-wined3d-Remove-surface-pbo.patch} |   0
 ...rce-buffer-mapping-facilities-in-su.patch} |   0
 ...e-buffer-creation-into-the-resource.patch} |   0
 ...NED3D_LOCATION_DISCARDED-in-surface.patch} |   0
 ...CATION_DISCARDED-in-surface_load_dr.patch} |   0
 ...NED3D_LOCATION_DISCARDED-for-sysmem.patch} |   0
 ...Discard-implicit-surfaces-on-unload.patch} |   0
 ...-to-flip-sysmem-copies-in-swapchain.patch} |   0
 ...-the-backbuffer-in-discard-presents.patch} |   0
 ...sysmem-for-client-storage-if-it-doe.patch} |   0
 ...-a-function-to-retrieve-resource-me.patch} |   0
 ...ace_ops-unmap-specific-for-front-bu.patch} |   0
 ...ove-check_block_align-to-resource.c.patch} |   0
 ...urface-alloc-functions-with-resourc.patch} |   0
 ...elete-the-buffer-in-surface_cleanup.patch} |   0
 ...resource-facilities-to-destroy-PBOs.patch} |   0
 ...le-location-copying-to-the-resource.patch} |   0
 ...ve-most-of-volume_map-to-resource.c.patch} |   0
 ...3d-Use-resource_map-for-surface_map.patch} |   0
 ...ll-the-public-map-function-in-surfac.patch | 101 -----
 ...se-client-storage-with-DIB-sections.patch} |   0
 ...ll-the-public-map-function-in-surfac.patch | 332 ++++-------------
 ...ll-the-public-map-function-in-surfac.patch | 277 ++++++++++++++
 ...-the-framebuffer-into-wined3d_state.patch} |   0
 ...f-state-access-in-shader_generate_g.patch} |   0
 ...d-buffers-if-streamsrc-is-not-dirty.patch} |   0
 ...ntroduce-a-multithreaded-command-st.patch} |   0
 ...resource-updates-to-finish-when-usi.patch} |   0
 ...re-pointers-in-struct-wined3d_cs_pr.patch} |   0
 ...-rectangle-pointers-into-wined3d_cs.patch} |   0
 ...-color-in-clear-ops-instead-of-a-po.patch} |   0
 ...3d-Pass-the-state-to-draw_primitive.patch} |   0
 ...or-the-cs-before-destroying-objects.patch} |   0
 ...5-wined3d-Give-the-cs-its-own-state.patch} |   0
 ...t-constant-updates-through-the-comm.patch} |   0
 ...-glFinish-before-modifying-resource.patch} |   0
 ...e-cs-before-changing-the-texture-lo.patch} |   0
 ...3d-Don-t-call-glFinish-after-clears.patch} |   0
 ...d3d-Don-t-call-glFinish-after-draws.patch} |   0
 ...vice-offscreenBuffer-in-the-context.patch} |   0
 ...ess-the-stateblock-in-find_draw_buf.patch} |   0
 ...-depth-stencil-to-swapchain-present.patch} |   0
 ...re-viewport-pointers-in-the-command.patch} |   0
 ...k-of-the-onscreen-depth-stencil-in-.patch} |   0
 ...-vertex-index-updates-through-the-c.patch} |   0
 ...itive-type-updates-through-the-comm.patch} |   0
 ...-constant-updates-through-the-comma.patch} |   0
 ...constant-updates-through-the-comman.patch} |   0
 ...t-updates-through-the-command-strea.patch} |   0
 ...he-command-stream-from-running-ahea.patch} |   0
 ...the-cs-to-finish-before-destroying-.patch} |   0
 ...3-wined3d-Run-the-cs-asynchronously.patch} |   0
 ...nd-blits-through-the-command-stream.patch} |   0
 ...update_surface-checks-back-in-place.patch} |   0
 ...d3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch} |   0
 ...7-wined3d-Add-cs-waiting-debug-code.patch} |   0
 ...ce-strict-draw-ordering-for-multith.patch} |   0
 ...er-target-view-clears-through-the-c.patch} |   0
 ...80-wined3d-Wait-for-the-CS-in-GetDC.patch} |   0
 ...urce-maps-through-the-command-strea.patch} |   0
 ...d-of-the-end_scene-flush-and-finish.patch} |   0
 ...-the-linked-lists-with-a-ringbuffer.patch} |   0
 ...ed3d-Don-t-preload-buffers-on-unmap.patch} |   0
 ...Don-t-call-glFinish-before-swapping.patch} |   0
 ...d-wined3d_-_query_issue-never-fails.patch} |   0
 ...query-support-to-the-command-stream.patch} |   0
 ...-CS-state-to-find-out-if-a-query-is.patch} |   0
 ...oll-queries-automatically-in-the-CS.patch} |   0
 ...-a-separate-queue-for-priority-comm.patch} |   0
 ...ed3d-Destroy-queries-through-the-CS.patch} |   0
 ...-main-and-worker-thread-query-state.patch} |   0
 ...t-poll-queries-that-failed-to-start.patch} |   0
 ...restated-queries-from-the-poll-list.patch} |   0
 ...et-the-query-state-if-it-doesn-t-ha.patch} |   0
 ...-Put-this-into-the-query-poll-patch.patch} |   0
 ...ate_surface-commands-through-the-CS.patch} |   0
 ...end-texture-preloads-through-the-CS.patch} |   0
 ...end-surface-preloads-through-the-CS.patch} |   0
 ...update_texture-calls-through-the-CS.patch} |   0
 ...of-the-surface_upload_data-glFinish.patch} |   0
 ...k-the-src-volume-in-device_update_v.patch} |   0
 ...it_managed_resources-through-the-CS.patch} |   0
 ...nd-flips-through-the-command-stream.patch} |   0
 ...-wined3d-Introduce-resource-fencing.patch} |   0
 ...ate_texture-and-update_surface-call.patch} |   0
 ...-wined3d-Dirtify-resources-on-unmap.patch} |   0
 ...ined3d-Fence-texture-reads-in-draws.patch} |   0
 ...e-render-targets-and-depth-stencils.patch} |   0
 ... 0110-wined3d-Fence-blit-operations.patch} |   0
 ...wined3d-Fence-color_fill-operations.patch} |   0
 ...h => 0112-wined3d-Fence-clear-calls.patch} |   0
 ...=> 0113-wined3d-Fence-present-calls.patch} |   0
 ...urce-maps-and-unmaps-a-priority-com.patch} |   0
 ...hanged-textures-through-the-command.patch} |   0
 ...-wined3d-Wrap-GL-BOs-in-a-structure.patch} |   0
 ...arate-resource-map-and-draw-buffers.patch} |   0
 ...-DISCARD-resource-maps-with-buffers.patch} |   0
 ...-DISCARD-resource-maps-with-heap-me.patch} |   0
 ...-some-objects-in-state_init_default.patch} |   0
 ...uest-the-frontbuffer-to-create-dumm.patch} |   0
 ...e-buffered-buffers-for-multithreade.patch} |   0
 ...synchronize-NOOVERWRITE-buffer-maps.patch} |   0
 ...buffer-map-write-and-draw-read-memo.patch} |   0
 ...ed3d-Accelerate-DISCARD-buffer-maps.patch} |   0
 ...d3d-Accelerate-READONLY-buffer-maps.patch} |   0
 ...e-buffer-dirty-areas-through-the-CS.patch} |   0
 ...buffer-resource.map_count-in-the-CS.patch} |   0
 ...Send-buffer-preloads-through-the-CS.patch} |   0
 ...ferSubData-instead-of-glMapBufferRa.patch} |   0
 ...GL-buffer-discard-control-from-igno.patch} |   0
 ...-Create-buffers-before-mapping-them.patch} |   0
 ...ined3d-Destroy-views-through-the-CS.patch} |   0
 ...134-wined3d-Remove-another-glFinish.patch} |   0
 ...-vertex-declarations-through-the-CS.patch} |   0
 ...ed3d-Destroy-shaders-through-the-CS.patch} |   0
 ...ate-VBOs-through-the-command-stream.patch} |   0
 ...ean-up-resource-data-through-the-CS.patch} |   0
 ...buffer-resource-data-through-the-CS.patch} |   0
 ...volume-resource-data-through-the-CS.patch} |   0
 ...3d-Clean-up-surfaces-through-the-cs.patch} |   0
 ...up-texture-resources-through-the-cs.patch} |   0
 ...sources-through-the-CS-in-uninit_3d.patch} |   0
 ...sources-through-the-CS-in-device_re.patch} |   0
 ...-glFinish-after-a-depth-buffer-blit.patch} |   0
 ...ed3d-Remove-software-cursor-support.patch} |   0
 ...reate-dummy-textures-through-the-CS.patch} |   0
 ...-the-initial-context-through-the-CS.patch} |   0
 ...ctx-and-dummy-textures-through-the-.patch} |   0
 ...NED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch} |   0
 ...GL-contexts-through-the-CS-in-reset.patch} |   0
 ...-contexts-through-the-CS-in-uninit_.patch} |   0
 ...rface_unload-through-the-CS-in-wine.patch} |   0
 ...ent-to-block-the-worker-thread-when.patch} |   0
 ...55-wined3d-Fence-preload-operations.patch} |   0
 ...K_NO_DIRTY_UPDATE-on-managed-textur.patch} |   0
 ...K_NO_DIRTY_UPDATE-on-managed-textur.patch} |   0
 ...Completely-reset-the-state-on-reset.patch} |   0
 ...c-and-releasedc-through-the-command.patch} |   0
 ...eap_memory-NULL-when-allocating-a-P.patch} |   0
 ...Wait-only-for-the-buffer-to-be-idle.patch} |   0
 ...d-a-comment-about-worker-thread-lag.patch} |   0
 ...Remove-the-texture-destroy-glFinish.patch} |   0
 ...-destruction-into-the-worker-thread.patch} |   0
 ...ref-decref-textures-in-color-depth-.patch} |   0
 ...166-Winex11-complain-about-glfinish.patch} |   0
 ...-the-new-window-is-set-up-before-se.patch} |   0
 ...move-the-device_reset-CS-sync-fixme.patch} |   0
 ...PLE_flush_buffer_range-syncing-back.patch} |   0
 ...the-resource-to-be-idle-when-destro.patch} |   0
 ...n-t-sync-on-redundant-discard-calls.patch} |   0
 ...2-wined3d-Don-t-discard-new-buffers.patch} |   0
 ...-to-sync-VBOs-manually-on-OSX-with-.patch} |   0
 ...174-wined3d-Render-target-lock-hack.patch} |   0
 ...ling-wined3d_surface_blt-from-surfa.patch} |   0
 ...MT-by-default-print-a-winediag-mess.patch} |   0
 .../wined3d-CSMT_Main/9999-IfDefined.patch    |  20 +-
 180 files changed, 613 insertions(+), 561 deletions(-)
 create mode 100644 patches/wined3d-CSMT_Main/0001-wined3d-Properly-initialize-format_flags-for-surface.patch
 rename patches/wined3d-CSMT_Main/{0001-wined3d-Merge-get_pitch-functions.patch => 0002-wined3d-Merge-get_pitch-functions.patch} (99%)
 rename patches/wined3d-CSMT_Main/{0002-wined3d-Pass-a-context-to-surface_load_sysmem.patch => 0003-wined3d-Pass-a-context-to-surface_load_sysmem.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0003-wined3d-Pass-a-context-to-read_from_framebuffer.patch => 0004-wined3d-Pass-a-context-to-read_from_framebuffer.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0004-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch => 0005-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0005-wined3d-Pass-a-context-to-surface_blt_fbo.patch => 0006-wined3d-Pass-a-context-to-surface_blt_fbo.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0006-wined3d-Pass-a-context-to-surface_multisample_resolv.patch => 0007-wined3d-Pass-a-context-to-surface_multisample_resolv.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0007-wined3d-Pass-a-context-to-surface_load_texture.patch => 0008-wined3d-Pass-a-context-to-surface_load_texture.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0008-wined3d-Pass-a-context-to-surface_load_location.patch => 0009-wined3d-Pass-a-context-to-surface_load_location.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0009-wined3d-Make-surface_load_location-return-nothing.patch => 0010-wined3d-Make-surface_load_location-return-nothing.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0010-wined3d-Store-volume-locations-in-the-resource.patch => 0011-wined3d-Store-volume-locations-in-the-resource.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0011-wined3d-Move-validate_location-to-resource.c.patch => 0012-wined3d-Move-validate_location-to-resource.c.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0012-wined3d-Move-surface-locations-into-the-resource.patch => 0013-wined3d-Move-surface-locations-into-the-resource.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0013-wined3d-Remove-surface_validate_location.patch => 0014-wined3d-Remove-surface_validate_location.patch} (89%)
 rename patches/wined3d-CSMT_Main/{0014-wined3d-Move-invalidate_location-to-resource.c.patch => 0015-wined3d-Move-invalidate_location-to-resource.c.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0015-wined3d-Invalidate-containers-via-callback.patch => 0016-wined3d-Invalidate-containers-via-callback.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0016-wined3d-Remove-surface_invalidate_location.patch => 0017-wined3d-Remove-surface_invalidate_location.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0017-wined3d-Move-bitmap_data-and-user_memory-into-the-re.patch => 0018-wined3d-Move-bitmap_data-and-user_memory-into-the-re.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0018-wined3d-Move-load_location-into-the-resource.patch => 0019-wined3d-Move-load_location-into-the-resource.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0019-wined3d-Replace-surface_load_location-with-resource_.patch => 0020-wined3d-Replace-surface_load_location-with-resource_.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0020-wined3d-Introduce-helper-functions-for-mapping-volum.patch => 0021-wined3d-Introduce-helper-functions-for-mapping-volum.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0021-wined3d-Move-volume-PBO-infrastructure-into-the-reso.patch => 0022-wined3d-Move-volume-PBO-infrastructure-into-the-reso.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0022-wined3d-Remove-surface-pbo.patch => 0023-wined3d-Remove-surface-pbo.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0023-wined3d-Use-resource-buffer-mapping-facilities-in-su.patch => 0024-wined3d-Use-resource-buffer-mapping-facilities-in-su.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0024-wined3d-Move-buffer-creation-into-the-resource.patch => 0025-wined3d-Move-buffer-creation-into-the-resource.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0025-wined3d-Handle-WINED3D_LOCATION_DISCARDED-in-surface.patch => 0026-wined3d-Handle-WINED3D_LOCATION_DISCARDED-in-surface.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0026-wined3d-Handle-LOCATION_DISCARDED-in-surface_load_dr.patch => 0027-wined3d-Handle-LOCATION_DISCARDED-in-surface_load_dr.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0027-wined3d-Handle-WINED3D_LOCATION_DISCARDED-for-sysmem.patch => 0028-wined3d-Handle-WINED3D_LOCATION_DISCARDED-for-sysmem.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0028-wined3d-Discard-implicit-surfaces-on-unload.patch => 0029-wined3d-Discard-implicit-surfaces-on-unload.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0029-wined3d-Don-t-try-to-flip-sysmem-copies-in-swapchain.patch => 0030-wined3d-Don-t-try-to-flip-sysmem-copies-in-swapchain.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0030-wined3d-Discard-the-backbuffer-in-discard-presents.patch => 0031-wined3d-Discard-the-backbuffer-in-discard-presents.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0031-wined3d-Allocate-sysmem-for-client-storage-if-it-doe.patch => 0032-wined3d-Allocate-sysmem-for-client-storage-if-it-doe.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0032-wined3d-Introduce-a-function-to-retrieve-resource-me.patch => 0033-wined3d-Introduce-a-function-to-retrieve-resource-me.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0033-wined3d-Make-surface_ops-unmap-specific-for-front-bu.patch => 0034-wined3d-Make-surface_ops-unmap-specific-for-front-bu.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0034-wined3d-Move-check_block_align-to-resource.c.patch => 0035-wined3d-Move-check_block_align-to-resource.c.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0035-wined3d-Replace-surface-alloc-functions-with-resourc.patch => 0036-wined3d-Replace-surface-alloc-functions-with-resourc.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0036-wined3d-Don-t-delete-the-buffer-in-surface_cleanup.patch => 0037-wined3d-Don-t-delete-the-buffer-in-surface_cleanup.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0037-wined3d-Use-resource-facilities-to-destroy-PBOs.patch => 0038-wined3d-Use-resource-facilities-to-destroy-PBOs.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0038-wined3d-Move-simple-location-copying-to-the-resource.patch => 0039-wined3d-Move-simple-location-copying-to-the-resource.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0039-wined3d-Move-most-of-volume_map-to-resource.c.patch => 0040-wined3d-Move-most-of-volume_map-to-resource.c.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0040-wined3d-Use-resource_map-for-surface_map.patch => 0041-wined3d-Use-resource_map-for-surface_map.patch} (100%)
 delete mode 100644 patches/wined3d-CSMT_Main/0042-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
 rename patches/wined3d-CSMT_Main/{0041-wined3d-Use-client-storage-with-DIB-sections.patch => 0042-wined3d-Use-client-storage-with-DIB-sections.patch} (100%)
 create mode 100644 patches/wined3d-CSMT_Main/0044-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
 rename patches/wined3d-CSMT_Main/{0044-wined3d-Move-the-framebuffer-into-wined3d_state.patch => 0045-wined3d-Move-the-framebuffer-into-wined3d_state.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0045-wined3d-Get-rid-of-state-access-in-shader_generate_g.patch => 0046-wined3d-Get-rid-of-state-access-in-shader_generate_g.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0046-wined3d-Preload-buffers-if-streamsrc-is-not-dirty.patch => 0047-wined3d-Preload-buffers-if-streamsrc-is-not-dirty.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0047-wined3d-Hackily-introduce-a-multithreaded-command-st.patch => 0048-wined3d-Hackily-introduce-a-multithreaded-command-st.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0048-wined3d-Wait-for-resource-updates-to-finish-when-usi.patch => 0049-wined3d-Wait-for-resource-updates-to-finish-when-usi.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0049-wined3d-Don-t-store-pointers-in-struct-wined3d_cs_pr.patch => 0050-wined3d-Don-t-store-pointers-in-struct-wined3d_cs_pr.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0050-wined3d-Don-t-put-rectangle-pointers-into-wined3d_cs.patch => 0051-wined3d-Don-t-put-rectangle-pointers-into-wined3d_cs.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0051-wined3d-Store-the-color-in-clear-ops-instead-of-a-po.patch => 0052-wined3d-Store-the-color-in-clear-ops-instead-of-a-po.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0052-wined3d-Pass-the-state-to-draw_primitive.patch => 0053-wined3d-Pass-the-state-to-draw_primitive.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0053-wined3d-Wait-for-the-cs-before-destroying-objects.patch => 0054-wined3d-Wait-for-the-cs-before-destroying-objects.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0054-wined3d-Give-the-cs-its-own-state.patch => 0055-wined3d-Give-the-cs-its-own-state.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0055-wined3d-Send-float-constant-updates-through-the-comm.patch => 0056-wined3d-Send-float-constant-updates-through-the-comm.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0056-wined3d-Request-a-glFinish-before-modifying-resource.patch => 0057-wined3d-Request-a-glFinish-before-modifying-resource.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0057-wined3d-Finish-the-cs-before-changing-the-texture-lo.patch => 0058-wined3d-Finish-the-cs-before-changing-the-texture-lo.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0058-wined3d-Don-t-call-glFinish-after-clears.patch => 0059-wined3d-Don-t-call-glFinish-after-clears.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0059-wined3d-Don-t-call-glFinish-after-draws.patch => 0060-wined3d-Don-t-call-glFinish-after-draws.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0060-wined3d-Shadow-device-offscreenBuffer-in-the-context.patch => 0061-wined3d-Shadow-device-offscreenBuffer-in-the-context.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0061-wined3d-Don-t-access-the-stateblock-in-find_draw_buf.patch => 0062-wined3d-Don-t-access-the-stateblock-in-find_draw_buf.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0062-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch => 0063-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0063-wined3d-Don-t-store-viewport-pointers-in-the-command.patch => 0064-wined3d-Don-t-store-viewport-pointers-in-the-command.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0064-wined3d-Keep-track-of-the-onscreen-depth-stencil-in-.patch => 0065-wined3d-Keep-track-of-the-onscreen-depth-stencil-in-.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0065-wined3d-Send-base-vertex-index-updates-through-the-c.patch => 0066-wined3d-Send-base-vertex-index-updates-through-the-c.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0066-wined3d-Send-primitive-type-updates-through-the-comm.patch => 0067-wined3d-Send-primitive-type-updates-through-the-comm.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0067-wined3d-Send-bool-constant-updates-through-the-comma.patch => 0068-wined3d-Send-bool-constant-updates-through-the-comma.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0068-wined3d-Send-int-constant-updates-through-the-comman.patch => 0069-wined3d-Send-int-constant-updates-through-the-comman.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0069-wined3d-Send-light-updates-through-the-command-strea.patch => 0070-wined3d-Send-light-updates-through-the-command-strea.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0070-wined3d-Prevent-the-command-stream-from-running-ahea.patch => 0071-wined3d-Prevent-the-command-stream-from-running-ahea.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0071-wined3d-Wait-for-the-cs-to-finish-before-destroying-.patch => 0072-wined3d-Wait-for-the-cs-to-finish-before-destroying-.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0072-wined3d-Run-the-cs-asynchronously.patch => 0073-wined3d-Run-the-cs-asynchronously.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0073-wined3d-Send-blits-through-the-command-stream.patch => 0074-wined3d-Send-blits-through-the-command-stream.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0074-wined3d-Put-update_surface-checks-back-in-place.patch => 0075-wined3d-Put-update_surface-checks-back-in-place.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0075-wined3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch => 0076-wined3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0076-wined3d-Add-cs-waiting-debug-code.patch => 0077-wined3d-Add-cs-waiting-debug-code.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0077-wined3d-Don-t-force-strict-draw-ordering-for-multith.patch => 0078-wined3d-Don-t-force-strict-draw-ordering-for-multith.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0078-wined3d-Send-render-target-view-clears-through-the-c.patch => 0079-wined3d-Send-render-target-view-clears-through-the-c.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0079-wined3d-Wait-for-the-CS-in-GetDC.patch => 0080-wined3d-Wait-for-the-CS-in-GetDC.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0080-wined3d-send-resource-maps-through-the-command-strea.patch => 0081-wined3d-send-resource-maps-through-the-command-strea.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0081-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch => 0082-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0082-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch => 0083-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0083-wined3d-Don-t-preload-buffers-on-unmap.patch => 0084-wined3d-Don-t-preload-buffers-on-unmap.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0084-wined3d-Don-t-call-glFinish-before-swapping.patch => 0085-wined3d-Don-t-call-glFinish-before-swapping.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0085-wined3d-wined3d_-_query_issue-never-fails.patch => 0086-wined3d-wined3d_-_query_issue-never-fails.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0086-wined3d-Add-query-support-to-the-command-stream.patch => 0087-wined3d-Add-query-support-to-the-command-stream.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0087-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch => 0088-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0088-wined3d-Poll-queries-automatically-in-the-CS.patch => 0089-wined3d-Poll-queries-automatically-in-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0089-wined3d-Introduce-a-separate-queue-for-priority-comm.patch => 0090-wined3d-Introduce-a-separate-queue-for-priority-comm.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0090-wined3d-Destroy-queries-through-the-CS.patch => 0091-wined3d-Destroy-queries-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0091-wined3d-Separate-main-and-worker-thread-query-state.patch => 0092-wined3d-Separate-main-and-worker-thread-query-state.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0092-wined3d-Don-t-poll-queries-that-failed-to-start.patch => 0093-wined3d-Don-t-poll-queries-that-failed-to-start.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0093-wined3d-Remove-restated-queries-from-the-poll-list.patch => 0094-wined3d-Remove-restated-queries-from-the-poll-list.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0094-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch => 0095-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0095-wined3d-Put-this-into-the-query-poll-patch.patch => 0096-wined3d-Put-this-into-the-query-poll-patch.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0096-wined3d-Send-update_surface-commands-through-the-CS.patch => 0097-wined3d-Send-update_surface-commands-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0097-wined3d-Send-texture-preloads-through-the-CS.patch => 0098-wined3d-Send-texture-preloads-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0098-wined3d-Send-surface-preloads-through-the-CS.patch => 0099-wined3d-Send-surface-preloads-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0099-wined3d-Send-update_texture-calls-through-the-CS.patch => 0100-wined3d-Send-update_texture-calls-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0100-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch => 0101-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0101-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch => 0102-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0102-wined3d-Handle-evit_managed_resources-through-the-CS.patch => 0103-wined3d-Handle-evit_managed_resources-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0103-wined3d-Send-flips-through-the-command-stream.patch => 0104-wined3d-Send-flips-through-the-command-stream.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0104-wined3d-Introduce-resource-fencing.patch => 0105-wined3d-Introduce-resource-fencing.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0105-wined3d-Fence-update_texture-and-update_surface-call.patch => 0106-wined3d-Fence-update_texture-and-update_surface-call.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0106-wined3d-Dirtify-resources-on-unmap.patch => 0107-wined3d-Dirtify-resources-on-unmap.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0107-wined3d-Fence-texture-reads-in-draws.patch => 0108-wined3d-Fence-texture-reads-in-draws.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0108-wined3d-Fence-render-targets-and-depth-stencils.patch => 0109-wined3d-Fence-render-targets-and-depth-stencils.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0109-wined3d-Fence-blit-operations.patch => 0110-wined3d-Fence-blit-operations.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0110-wined3d-Fence-color_fill-operations.patch => 0111-wined3d-Fence-color_fill-operations.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0111-wined3d-Fence-clear-calls.patch => 0112-wined3d-Fence-clear-calls.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0112-wined3d-Fence-present-calls.patch => 0113-wined3d-Fence-present-calls.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0113-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch => 0114-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0114-wined3d-Dirtify-changed-textures-through-the-command.patch => 0115-wined3d-Dirtify-changed-textures-through-the-command.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0115-wined3d-Wrap-GL-BOs-in-a-structure.patch => 0116-wined3d-Wrap-GL-BOs-in-a-structure.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0116-wined3d-Separate-resource-map-and-draw-buffers.patch => 0117-wined3d-Separate-resource-map-and-draw-buffers.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0117-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch => 0118-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0118-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch => 0119-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0119-wined3d-Unset-some-objects-in-state_init_default.patch => 0120-wined3d-Unset-some-objects-in-state_init_default.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0120-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch => 0121-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0121-wined3d-Use-double-buffered-buffers-for-multithreade.patch => 0122-wined3d-Use-double-buffered-buffers-for-multithreade.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0122-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch => 0123-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0123-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch => 0124-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0124-wined3d-Accelerate-DISCARD-buffer-maps.patch => 0125-wined3d-Accelerate-DISCARD-buffer-maps.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0125-wined3d-Accelerate-READONLY-buffer-maps.patch => 0126-wined3d-Accelerate-READONLY-buffer-maps.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0126-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch => 0127-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0127-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch => 0128-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0128-wined3d-Send-buffer-preloads-through-the-CS.patch => 0129-wined3d-Send-buffer-preloads-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0129-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch => 0130-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0130-wined3d-Separate-GL-buffer-discard-control-from-igno.patch => 0131-wined3d-Separate-GL-buffer-discard-control-from-igno.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0131-wined3d-Create-buffers-before-mapping-them.patch => 0132-wined3d-Create-buffers-before-mapping-them.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0132-wined3d-Destroy-views-through-the-CS.patch => 0133-wined3d-Destroy-views-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0133-wined3d-Remove-another-glFinish.patch => 0134-wined3d-Remove-another-glFinish.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0134-wined3d-Destroy-vertex-declarations-through-the-CS.patch => 0135-wined3d-Destroy-vertex-declarations-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0135-wined3d-Destroy-shaders-through-the-CS.patch => 0136-wined3d-Destroy-shaders-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0136-wined3d-Create-VBOs-through-the-command-stream.patch => 0137-wined3d-Create-VBOs-through-the-command-stream.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0137-wined3d-Clean-up-resource-data-through-the-CS.patch => 0138-wined3d-Clean-up-resource-data-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0138-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch => 0139-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0139-wined3d-Clean-up-volume-resource-data-through-the-CS.patch => 0140-wined3d-Clean-up-volume-resource-data-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0140-wined3d-Clean-up-surfaces-through-the-cs.patch => 0141-wined3d-Clean-up-surfaces-through-the-cs.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0141-wined3d-Clean-up-texture-resources-through-the-cs.patch => 0142-wined3d-Clean-up-texture-resources-through-the-cs.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0142-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch => 0143-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0143-wined3d-Unload-resources-through-the-CS-in-device_re.patch => 0144-wined3d-Unload-resources-through-the-CS-in-device_re.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0144-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch => 0145-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0145-wined3d-Remove-software-cursor-support.patch => 0146-wined3d-Remove-software-cursor-support.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0146-wined3d-Create-dummy-textures-through-the-CS.patch => 0147-wined3d-Create-dummy-textures-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0147-wined3d-Create-the-initial-context-through-the-CS.patch => 0148-wined3d-Create-the-initial-context-through-the-CS.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0148-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch => 0149-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0149-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch => 0150-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0150-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch => 0151-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0151-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch => 0152-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0152-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch => 0153-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0153-wined3d-Use-an-event-to-block-the-worker-thread-when.patch => 0154-wined3d-Use-an-event-to-block-the-worker-thread-when.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0154-wined3d-Fence-preload-operations.patch => 0155-wined3d-Fence-preload-operations.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0155-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch => 0156-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0156-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch => 0157-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0157-wined3d-Completely-reset-the-state-on-reset.patch => 0158-wined3d-Completely-reset-the-state-on-reset.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0158-wined3d-Send-getdc-and-releasedc-through-the-command.patch => 0159-wined3d-Send-getdc-and-releasedc-through-the-command.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0159-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch => 0160-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0160-wined3d-Wait-only-for-the-buffer-to-be-idle.patch => 0161-wined3d-Wait-only-for-the-buffer-to-be-idle.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0161-wined3d-Add-a-comment-about-worker-thread-lag.patch => 0162-wined3d-Add-a-comment-about-worker-thread-lag.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0162-wined3d-Remove-the-texture-destroy-glFinish.patch => 0163-wined3d-Remove-the-texture-destroy-glFinish.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0163-wined3d-Move-FBO-destruction-into-the-worker-thread.patch => 0164-wined3d-Move-FBO-destruction-into-the-worker-thread.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0164-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch => 0165-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0165-Winex11-complain-about-glfinish.patch => 0166-Winex11-complain-about-glfinish.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0166-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch => 0167-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0167-wined3d-Remove-the-device_reset-CS-sync-fixme.patch => 0168-wined3d-Remove-the-device_reset-CS-sync-fixme.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0168-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch => 0169-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0169-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch => 0170-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0170-wined3d-Don-t-sync-on-redundant-discard-calls.patch => 0171-wined3d-Don-t-sync-on-redundant-discard-calls.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0171-wined3d-Don-t-discard-new-buffers.patch => 0172-wined3d-Don-t-discard-new-buffers.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0172-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch => 0173-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0173-wined3d-Render-target-lock-hack.patch => 0174-wined3d-Render-target-lock-hack.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0174-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch => 0175-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch} (100%)
 rename patches/wined3d-CSMT_Main/{0175-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch => 0176-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch} (100%)

diff --git a/debian/changelog b/debian/changelog
index 1a059647..710f65eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ wine-staging (1.7.48) UNRELEASED; urgency=low
   * Update patchset to query GPU infos with GLX_MESA_query_renderer extension
     (fixes a regression with broken MESA versions).
   * Update vcomp patchset and add implementation for various atomic functions.
+  * Updated CSMT patchset to fix crash in Path of Exile after character
+    selection (fixes Wine Staging Bug #451).
   * Added patch to forward exitcode from child process when in wineconsole.
   * Added patch to check architecture before trying to load libraries.
   * Added patch to share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 3907de5c..cbd36a34 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -5040,184 +5040,186 @@ fi
 # | 	dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h, dlls/winex11.drv/opengl.c
 # |
 if test "$enable_wined3d_CSMT_Main" -eq 1; then
-	patch_apply wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch
-	patch_apply wined3d-CSMT_Main/0002-wined3d-Pass-a-context-to-surface_load_sysmem.patch
-	patch_apply wined3d-CSMT_Main/0003-wined3d-Pass-a-context-to-read_from_framebuffer.patch
-	patch_apply wined3d-CSMT_Main/0004-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch
-	patch_apply wined3d-CSMT_Main/0005-wined3d-Pass-a-context-to-surface_blt_fbo.patch
-	patch_apply wined3d-CSMT_Main/0006-wined3d-Pass-a-context-to-surface_multisample_resolv.patch
-	patch_apply wined3d-CSMT_Main/0007-wined3d-Pass-a-context-to-surface_load_texture.patch
-	patch_apply wined3d-CSMT_Main/0008-wined3d-Pass-a-context-to-surface_load_location.patch
-	patch_apply wined3d-CSMT_Main/0009-wined3d-Make-surface_load_location-return-nothing.patch
-	patch_apply wined3d-CSMT_Main/0010-wined3d-Store-volume-locations-in-the-resource.patch
-	patch_apply wined3d-CSMT_Main/0011-wined3d-Move-validate_location-to-resource.c.patch
-	patch_apply wined3d-CSMT_Main/0012-wined3d-Move-surface-locations-into-the-resource.patch
-	patch_apply wined3d-CSMT_Main/0013-wined3d-Remove-surface_validate_location.patch
-	patch_apply wined3d-CSMT_Main/0014-wined3d-Move-invalidate_location-to-resource.c.patch
-	patch_apply wined3d-CSMT_Main/0015-wined3d-Invalidate-containers-via-callback.patch
-	patch_apply wined3d-CSMT_Main/0016-wined3d-Remove-surface_invalidate_location.patch
-	patch_apply wined3d-CSMT_Main/0017-wined3d-Move-bitmap_data-and-user_memory-into-the-re.patch
-	patch_apply wined3d-CSMT_Main/0018-wined3d-Move-load_location-into-the-resource.patch
-	patch_apply wined3d-CSMT_Main/0019-wined3d-Replace-surface_load_location-with-resource_.patch
-	patch_apply wined3d-CSMT_Main/0020-wined3d-Introduce-helper-functions-for-mapping-volum.patch
-	patch_apply wined3d-CSMT_Main/0021-wined3d-Move-volume-PBO-infrastructure-into-the-reso.patch
-	patch_apply wined3d-CSMT_Main/0022-wined3d-Remove-surface-pbo.patch
-	patch_apply wined3d-CSMT_Main/0023-wined3d-Use-resource-buffer-mapping-facilities-in-su.patch
-	patch_apply wined3d-CSMT_Main/0024-wined3d-Move-buffer-creation-into-the-resource.patch
-	patch_apply wined3d-CSMT_Main/0025-wined3d-Handle-WINED3D_LOCATION_DISCARDED-in-surface.patch
-	patch_apply wined3d-CSMT_Main/0026-wined3d-Handle-LOCATION_DISCARDED-in-surface_load_dr.patch
-	patch_apply wined3d-CSMT_Main/0027-wined3d-Handle-WINED3D_LOCATION_DISCARDED-for-sysmem.patch
-	patch_apply wined3d-CSMT_Main/0028-wined3d-Discard-implicit-surfaces-on-unload.patch
-	patch_apply wined3d-CSMT_Main/0029-wined3d-Don-t-try-to-flip-sysmem-copies-in-swapchain.patch
-	patch_apply wined3d-CSMT_Main/0030-wined3d-Discard-the-backbuffer-in-discard-presents.patch
-	patch_apply wined3d-CSMT_Main/0031-wined3d-Allocate-sysmem-for-client-storage-if-it-doe.patch
-	patch_apply wined3d-CSMT_Main/0032-wined3d-Introduce-a-function-to-retrieve-resource-me.patch
-	patch_apply wined3d-CSMT_Main/0033-wined3d-Make-surface_ops-unmap-specific-for-front-bu.patch
-	patch_apply wined3d-CSMT_Main/0034-wined3d-Move-check_block_align-to-resource.c.patch
-	patch_apply wined3d-CSMT_Main/0035-wined3d-Replace-surface-alloc-functions-with-resourc.patch
-	patch_apply wined3d-CSMT_Main/0036-wined3d-Don-t-delete-the-buffer-in-surface_cleanup.patch
-	patch_apply wined3d-CSMT_Main/0037-wined3d-Use-resource-facilities-to-destroy-PBOs.patch
-	patch_apply wined3d-CSMT_Main/0038-wined3d-Move-simple-location-copying-to-the-resource.patch
-	patch_apply wined3d-CSMT_Main/0039-wined3d-Move-most-of-volume_map-to-resource.c.patch
-	patch_apply wined3d-CSMT_Main/0040-wined3d-Use-resource_map-for-surface_map.patch
-	patch_apply wined3d-CSMT_Main/0041-wined3d-Use-client-storage-with-DIB-sections.patch
-	patch_apply wined3d-CSMT_Main/0042-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
+	patch_apply wined3d-CSMT_Main/0001-wined3d-Properly-initialize-format_flags-for-surface.patch
+	patch_apply wined3d-CSMT_Main/0002-wined3d-Merge-get_pitch-functions.patch
+	patch_apply wined3d-CSMT_Main/0003-wined3d-Pass-a-context-to-surface_load_sysmem.patch
+	patch_apply wined3d-CSMT_Main/0004-wined3d-Pass-a-context-to-read_from_framebuffer.patch
+	patch_apply wined3d-CSMT_Main/0005-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch
+	patch_apply wined3d-CSMT_Main/0006-wined3d-Pass-a-context-to-surface_blt_fbo.patch
+	patch_apply wined3d-CSMT_Main/0007-wined3d-Pass-a-context-to-surface_multisample_resolv.patch
+	patch_apply wined3d-CSMT_Main/0008-wined3d-Pass-a-context-to-surface_load_texture.patch
+	patch_apply wined3d-CSMT_Main/0009-wined3d-Pass-a-context-to-surface_load_location.patch
+	patch_apply wined3d-CSMT_Main/0010-wined3d-Make-surface_load_location-return-nothing.patch
+	patch_apply wined3d-CSMT_Main/0011-wined3d-Store-volume-locations-in-the-resource.patch
+	patch_apply wined3d-CSMT_Main/0012-wined3d-Move-validate_location-to-resource.c.patch
+	patch_apply wined3d-CSMT_Main/0013-wined3d-Move-surface-locations-into-the-resource.patch
+	patch_apply wined3d-CSMT_Main/0014-wined3d-Remove-surface_validate_location.patch
+	patch_apply wined3d-CSMT_Main/0015-wined3d-Move-invalidate_location-to-resource.c.patch
+	patch_apply wined3d-CSMT_Main/0016-wined3d-Invalidate-containers-via-callback.patch
+	patch_apply wined3d-CSMT_Main/0017-wined3d-Remove-surface_invalidate_location.patch
+	patch_apply wined3d-CSMT_Main/0018-wined3d-Move-bitmap_data-and-user_memory-into-the-re.patch
+	patch_apply wined3d-CSMT_Main/0019-wined3d-Move-load_location-into-the-resource.patch
+	patch_apply wined3d-CSMT_Main/0020-wined3d-Replace-surface_load_location-with-resource_.patch
+	patch_apply wined3d-CSMT_Main/0021-wined3d-Introduce-helper-functions-for-mapping-volum.patch
+	patch_apply wined3d-CSMT_Main/0022-wined3d-Move-volume-PBO-infrastructure-into-the-reso.patch
+	patch_apply wined3d-CSMT_Main/0023-wined3d-Remove-surface-pbo.patch
+	patch_apply wined3d-CSMT_Main/0024-wined3d-Use-resource-buffer-mapping-facilities-in-su.patch
+	patch_apply wined3d-CSMT_Main/0025-wined3d-Move-buffer-creation-into-the-resource.patch
+	patch_apply wined3d-CSMT_Main/0026-wined3d-Handle-WINED3D_LOCATION_DISCARDED-in-surface.patch
+	patch_apply wined3d-CSMT_Main/0027-wined3d-Handle-LOCATION_DISCARDED-in-surface_load_dr.patch
+	patch_apply wined3d-CSMT_Main/0028-wined3d-Handle-WINED3D_LOCATION_DISCARDED-for-sysmem.patch
+	patch_apply wined3d-CSMT_Main/0029-wined3d-Discard-implicit-surfaces-on-unload.patch
+	patch_apply wined3d-CSMT_Main/0030-wined3d-Don-t-try-to-flip-sysmem-copies-in-swapchain.patch
+	patch_apply wined3d-CSMT_Main/0031-wined3d-Discard-the-backbuffer-in-discard-presents.patch
+	patch_apply wined3d-CSMT_Main/0032-wined3d-Allocate-sysmem-for-client-storage-if-it-doe.patch
+	patch_apply wined3d-CSMT_Main/0033-wined3d-Introduce-a-function-to-retrieve-resource-me.patch
+	patch_apply wined3d-CSMT_Main/0034-wined3d-Make-surface_ops-unmap-specific-for-front-bu.patch
+	patch_apply wined3d-CSMT_Main/0035-wined3d-Move-check_block_align-to-resource.c.patch
+	patch_apply wined3d-CSMT_Main/0036-wined3d-Replace-surface-alloc-functions-with-resourc.patch
+	patch_apply wined3d-CSMT_Main/0037-wined3d-Don-t-delete-the-buffer-in-surface_cleanup.patch
+	patch_apply wined3d-CSMT_Main/0038-wined3d-Use-resource-facilities-to-destroy-PBOs.patch
+	patch_apply wined3d-CSMT_Main/0039-wined3d-Move-simple-location-copying-to-the-resource.patch
+	patch_apply wined3d-CSMT_Main/0040-wined3d-Move-most-of-volume_map-to-resource.c.patch
+	patch_apply wined3d-CSMT_Main/0041-wined3d-Use-resource_map-for-surface_map.patch
+	patch_apply wined3d-CSMT_Main/0042-wined3d-Use-client-storage-with-DIB-sections.patch
 	patch_apply wined3d-CSMT_Main/0043-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
-	patch_apply wined3d-CSMT_Main/0044-wined3d-Move-the-framebuffer-into-wined3d_state.patch
-	patch_apply wined3d-CSMT_Main/0045-wined3d-Get-rid-of-state-access-in-shader_generate_g.patch
-	patch_apply wined3d-CSMT_Main/0046-wined3d-Preload-buffers-if-streamsrc-is-not-dirty.patch
-	patch_apply wined3d-CSMT_Main/0047-wined3d-Hackily-introduce-a-multithreaded-command-st.patch
-	patch_apply wined3d-CSMT_Main/0048-wined3d-Wait-for-resource-updates-to-finish-when-usi.patch
-	patch_apply wined3d-CSMT_Main/0049-wined3d-Don-t-store-pointers-in-struct-wined3d_cs_pr.patch
-	patch_apply wined3d-CSMT_Main/0050-wined3d-Don-t-put-rectangle-pointers-into-wined3d_cs.patch
-	patch_apply wined3d-CSMT_Main/0051-wined3d-Store-the-color-in-clear-ops-instead-of-a-po.patch
-	patch_apply wined3d-CSMT_Main/0052-wined3d-Pass-the-state-to-draw_primitive.patch
-	patch_apply wined3d-CSMT_Main/0053-wined3d-Wait-for-the-cs-before-destroying-objects.patch
-	patch_apply wined3d-CSMT_Main/0054-wined3d-Give-the-cs-its-own-state.patch
-	patch_apply wined3d-CSMT_Main/0055-wined3d-Send-float-constant-updates-through-the-comm.patch
-	patch_apply wined3d-CSMT_Main/0056-wined3d-Request-a-glFinish-before-modifying-resource.patch
-	patch_apply wined3d-CSMT_Main/0057-wined3d-Finish-the-cs-before-changing-the-texture-lo.patch
-	patch_apply wined3d-CSMT_Main/0058-wined3d-Don-t-call-glFinish-after-clears.patch
-	patch_apply wined3d-CSMT_Main/0059-wined3d-Don-t-call-glFinish-after-draws.patch
-	patch_apply wined3d-CSMT_Main/0060-wined3d-Shadow-device-offscreenBuffer-in-the-context.patch
-	patch_apply wined3d-CSMT_Main/0061-wined3d-Don-t-access-the-stateblock-in-find_draw_buf.patch
-	patch_apply wined3d-CSMT_Main/0062-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch
-	patch_apply wined3d-CSMT_Main/0063-wined3d-Don-t-store-viewport-pointers-in-the-command.patch
-	patch_apply wined3d-CSMT_Main/0064-wined3d-Keep-track-of-the-onscreen-depth-stencil-in-.patch
-	patch_apply wined3d-CSMT_Main/0065-wined3d-Send-base-vertex-index-updates-through-the-c.patch
-	patch_apply wined3d-CSMT_Main/0066-wined3d-Send-primitive-type-updates-through-the-comm.patch
-	patch_apply wined3d-CSMT_Main/0067-wined3d-Send-bool-constant-updates-through-the-comma.patch
-	patch_apply wined3d-CSMT_Main/0068-wined3d-Send-int-constant-updates-through-the-comman.patch
-	patch_apply wined3d-CSMT_Main/0069-wined3d-Send-light-updates-through-the-command-strea.patch
-	patch_apply wined3d-CSMT_Main/0070-wined3d-Prevent-the-command-stream-from-running-ahea.patch
-	patch_apply wined3d-CSMT_Main/0071-wined3d-Wait-for-the-cs-to-finish-before-destroying-.patch
-	patch_apply wined3d-CSMT_Main/0072-wined3d-Run-the-cs-asynchronously.patch
-	patch_apply wined3d-CSMT_Main/0073-wined3d-Send-blits-through-the-command-stream.patch
-	patch_apply wined3d-CSMT_Main/0074-wined3d-Put-update_surface-checks-back-in-place.patch
-	patch_apply wined3d-CSMT_Main/0075-wined3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch
-	patch_apply wined3d-CSMT_Main/0076-wined3d-Add-cs-waiting-debug-code.patch
-	patch_apply wined3d-CSMT_Main/0077-wined3d-Don-t-force-strict-draw-ordering-for-multith.patch
-	patch_apply wined3d-CSMT_Main/0078-wined3d-Send-render-target-view-clears-through-the-c.patch
-	patch_apply wined3d-CSMT_Main/0079-wined3d-Wait-for-the-CS-in-GetDC.patch
-	patch_apply wined3d-CSMT_Main/0080-wined3d-send-resource-maps-through-the-command-strea.patch
-	patch_apply wined3d-CSMT_Main/0081-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch
-	patch_apply wined3d-CSMT_Main/0082-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch
-	patch_apply wined3d-CSMT_Main/0083-wined3d-Don-t-preload-buffers-on-unmap.patch
-	patch_apply wined3d-CSMT_Main/0084-wined3d-Don-t-call-glFinish-before-swapping.patch
-	patch_apply wined3d-CSMT_Main/0085-wined3d-wined3d_-_query_issue-never-fails.patch
-	patch_apply wined3d-CSMT_Main/0086-wined3d-Add-query-support-to-the-command-stream.patch
-	patch_apply wined3d-CSMT_Main/0087-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch
-	patch_apply wined3d-CSMT_Main/0088-wined3d-Poll-queries-automatically-in-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0089-wined3d-Introduce-a-separate-queue-for-priority-comm.patch
-	patch_apply wined3d-CSMT_Main/0090-wined3d-Destroy-queries-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0091-wined3d-Separate-main-and-worker-thread-query-state.patch
-	patch_apply wined3d-CSMT_Main/0092-wined3d-Don-t-poll-queries-that-failed-to-start.patch
-	patch_apply wined3d-CSMT_Main/0093-wined3d-Remove-restated-queries-from-the-poll-list.patch
-	patch_apply wined3d-CSMT_Main/0094-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch
-	patch_apply wined3d-CSMT_Main/0095-wined3d-Put-this-into-the-query-poll-patch.patch
-	patch_apply wined3d-CSMT_Main/0096-wined3d-Send-update_surface-commands-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0097-wined3d-Send-texture-preloads-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0098-wined3d-Send-surface-preloads-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0099-wined3d-Send-update_texture-calls-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0100-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch
-	patch_apply wined3d-CSMT_Main/0101-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch
-	patch_apply wined3d-CSMT_Main/0102-wined3d-Handle-evit_managed_resources-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0103-wined3d-Send-flips-through-the-command-stream.patch
-	patch_apply wined3d-CSMT_Main/0104-wined3d-Introduce-resource-fencing.patch
-	patch_apply wined3d-CSMT_Main/0105-wined3d-Fence-update_texture-and-update_surface-call.patch
-	patch_apply wined3d-CSMT_Main/0106-wined3d-Dirtify-resources-on-unmap.patch
-	patch_apply wined3d-CSMT_Main/0107-wined3d-Fence-texture-reads-in-draws.patch
-	patch_apply wined3d-CSMT_Main/0108-wined3d-Fence-render-targets-and-depth-stencils.patch
-	patch_apply wined3d-CSMT_Main/0109-wined3d-Fence-blit-operations.patch
-	patch_apply wined3d-CSMT_Main/0110-wined3d-Fence-color_fill-operations.patch
-	patch_apply wined3d-CSMT_Main/0111-wined3d-Fence-clear-calls.patch
-	patch_apply wined3d-CSMT_Main/0112-wined3d-Fence-present-calls.patch
-	patch_apply wined3d-CSMT_Main/0113-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch
-	patch_apply wined3d-CSMT_Main/0114-wined3d-Dirtify-changed-textures-through-the-command.patch
-	patch_apply wined3d-CSMT_Main/0115-wined3d-Wrap-GL-BOs-in-a-structure.patch
-	patch_apply wined3d-CSMT_Main/0116-wined3d-Separate-resource-map-and-draw-buffers.patch
-	patch_apply wined3d-CSMT_Main/0117-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch
-	patch_apply wined3d-CSMT_Main/0118-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch
-	patch_apply wined3d-CSMT_Main/0119-wined3d-Unset-some-objects-in-state_init_default.patch
-	patch_apply wined3d-CSMT_Main/0120-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch
-	patch_apply wined3d-CSMT_Main/0121-wined3d-Use-double-buffered-buffers-for-multithreade.patch
-	patch_apply wined3d-CSMT_Main/0122-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch
-	patch_apply wined3d-CSMT_Main/0123-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch
-	patch_apply wined3d-CSMT_Main/0124-wined3d-Accelerate-DISCARD-buffer-maps.patch
-	patch_apply wined3d-CSMT_Main/0125-wined3d-Accelerate-READONLY-buffer-maps.patch
-	patch_apply wined3d-CSMT_Main/0126-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0127-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0128-wined3d-Send-buffer-preloads-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0129-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch
-	patch_apply wined3d-CSMT_Main/0130-wined3d-Separate-GL-buffer-discard-control-from-igno.patch
-	patch_apply wined3d-CSMT_Main/0131-wined3d-Create-buffers-before-mapping-them.patch
-	patch_apply wined3d-CSMT_Main/0132-wined3d-Destroy-views-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0133-wined3d-Remove-another-glFinish.patch
-	patch_apply wined3d-CSMT_Main/0134-wined3d-Destroy-vertex-declarations-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0135-wined3d-Destroy-shaders-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0136-wined3d-Create-VBOs-through-the-command-stream.patch
-	patch_apply wined3d-CSMT_Main/0137-wined3d-Clean-up-resource-data-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0138-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0139-wined3d-Clean-up-volume-resource-data-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0140-wined3d-Clean-up-surfaces-through-the-cs.patch
-	patch_apply wined3d-CSMT_Main/0141-wined3d-Clean-up-texture-resources-through-the-cs.patch
-	patch_apply wined3d-CSMT_Main/0142-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch
-	patch_apply wined3d-CSMT_Main/0143-wined3d-Unload-resources-through-the-CS-in-device_re.patch
-	patch_apply wined3d-CSMT_Main/0144-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch
-	patch_apply wined3d-CSMT_Main/0145-wined3d-Remove-software-cursor-support.patch
-	patch_apply wined3d-CSMT_Main/0146-wined3d-Create-dummy-textures-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0147-wined3d-Create-the-initial-context-through-the-CS.patch
-	patch_apply wined3d-CSMT_Main/0148-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch
-	patch_apply wined3d-CSMT_Main/0149-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch
-	patch_apply wined3d-CSMT_Main/0150-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch
-	patch_apply wined3d-CSMT_Main/0151-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch
-	patch_apply wined3d-CSMT_Main/0152-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch
-	patch_apply wined3d-CSMT_Main/0153-wined3d-Use-an-event-to-block-the-worker-thread-when.patch
-	patch_apply wined3d-CSMT_Main/0154-wined3d-Fence-preload-operations.patch
-	patch_apply wined3d-CSMT_Main/0155-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
-	patch_apply wined3d-CSMT_Main/0156-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
-	patch_apply wined3d-CSMT_Main/0157-wined3d-Completely-reset-the-state-on-reset.patch
-	patch_apply wined3d-CSMT_Main/0158-wined3d-Send-getdc-and-releasedc-through-the-command.patch
-	patch_apply wined3d-CSMT_Main/0159-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch
-	patch_apply wined3d-CSMT_Main/0160-wined3d-Wait-only-for-the-buffer-to-be-idle.patch
-	patch_apply wined3d-CSMT_Main/0161-wined3d-Add-a-comment-about-worker-thread-lag.patch
-	patch_apply wined3d-CSMT_Main/0162-wined3d-Remove-the-texture-destroy-glFinish.patch
-	patch_apply wined3d-CSMT_Main/0163-wined3d-Move-FBO-destruction-into-the-worker-thread.patch
-	patch_apply wined3d-CSMT_Main/0164-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch
-	patch_apply wined3d-CSMT_Main/0165-Winex11-complain-about-glfinish.patch
-	patch_apply wined3d-CSMT_Main/0166-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch
-	patch_apply wined3d-CSMT_Main/0167-wined3d-Remove-the-device_reset-CS-sync-fixme.patch
-	patch_apply wined3d-CSMT_Main/0168-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch
-	patch_apply wined3d-CSMT_Main/0169-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch
-	patch_apply wined3d-CSMT_Main/0170-wined3d-Don-t-sync-on-redundant-discard-calls.patch
-	patch_apply wined3d-CSMT_Main/0171-wined3d-Don-t-discard-new-buffers.patch
-	patch_apply wined3d-CSMT_Main/0172-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch
-	patch_apply wined3d-CSMT_Main/0173-wined3d-Render-target-lock-hack.patch
-	patch_apply wined3d-CSMT_Main/0174-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch
-	patch_apply wined3d-CSMT_Main/0175-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch
+	patch_apply wined3d-CSMT_Main/0044-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
+	patch_apply wined3d-CSMT_Main/0045-wined3d-Move-the-framebuffer-into-wined3d_state.patch
+	patch_apply wined3d-CSMT_Main/0046-wined3d-Get-rid-of-state-access-in-shader_generate_g.patch
+	patch_apply wined3d-CSMT_Main/0047-wined3d-Preload-buffers-if-streamsrc-is-not-dirty.patch
+	patch_apply wined3d-CSMT_Main/0048-wined3d-Hackily-introduce-a-multithreaded-command-st.patch
+	patch_apply wined3d-CSMT_Main/0049-wined3d-Wait-for-resource-updates-to-finish-when-usi.patch
+	patch_apply wined3d-CSMT_Main/0050-wined3d-Don-t-store-pointers-in-struct-wined3d_cs_pr.patch
+	patch_apply wined3d-CSMT_Main/0051-wined3d-Don-t-put-rectangle-pointers-into-wined3d_cs.patch
+	patch_apply wined3d-CSMT_Main/0052-wined3d-Store-the-color-in-clear-ops-instead-of-a-po.patch
+	patch_apply wined3d-CSMT_Main/0053-wined3d-Pass-the-state-to-draw_primitive.patch
+	patch_apply wined3d-CSMT_Main/0054-wined3d-Wait-for-the-cs-before-destroying-objects.patch
+	patch_apply wined3d-CSMT_Main/0055-wined3d-Give-the-cs-its-own-state.patch
+	patch_apply wined3d-CSMT_Main/0056-wined3d-Send-float-constant-updates-through-the-comm.patch
+	patch_apply wined3d-CSMT_Main/0057-wined3d-Request-a-glFinish-before-modifying-resource.patch
+	patch_apply wined3d-CSMT_Main/0058-wined3d-Finish-the-cs-before-changing-the-texture-lo.patch
+	patch_apply wined3d-CSMT_Main/0059-wined3d-Don-t-call-glFinish-after-clears.patch
+	patch_apply wined3d-CSMT_Main/0060-wined3d-Don-t-call-glFinish-after-draws.patch
+	patch_apply wined3d-CSMT_Main/0061-wined3d-Shadow-device-offscreenBuffer-in-the-context.patch
+	patch_apply wined3d-CSMT_Main/0062-wined3d-Don-t-access-the-stateblock-in-find_draw_buf.patch
+	patch_apply wined3d-CSMT_Main/0063-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch
+	patch_apply wined3d-CSMT_Main/0064-wined3d-Don-t-store-viewport-pointers-in-the-command.patch
+	patch_apply wined3d-CSMT_Main/0065-wined3d-Keep-track-of-the-onscreen-depth-stencil-in-.patch
+	patch_apply wined3d-CSMT_Main/0066-wined3d-Send-base-vertex-index-updates-through-the-c.patch
+	patch_apply wined3d-CSMT_Main/0067-wined3d-Send-primitive-type-updates-through-the-comm.patch
+	patch_apply wined3d-CSMT_Main/0068-wined3d-Send-bool-constant-updates-through-the-comma.patch
+	patch_apply wined3d-CSMT_Main/0069-wined3d-Send-int-constant-updates-through-the-comman.patch
+	patch_apply wined3d-CSMT_Main/0070-wined3d-Send-light-updates-through-the-command-strea.patch
+	patch_apply wined3d-CSMT_Main/0071-wined3d-Prevent-the-command-stream-from-running-ahea.patch
+	patch_apply wined3d-CSMT_Main/0072-wined3d-Wait-for-the-cs-to-finish-before-destroying-.patch
+	patch_apply wined3d-CSMT_Main/0073-wined3d-Run-the-cs-asynchronously.patch
+	patch_apply wined3d-CSMT_Main/0074-wined3d-Send-blits-through-the-command-stream.patch
+	patch_apply wined3d-CSMT_Main/0075-wined3d-Put-update_surface-checks-back-in-place.patch
+	patch_apply wined3d-CSMT_Main/0076-wined3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch
+	patch_apply wined3d-CSMT_Main/0077-wined3d-Add-cs-waiting-debug-code.patch
+	patch_apply wined3d-CSMT_Main/0078-wined3d-Don-t-force-strict-draw-ordering-for-multith.patch
+	patch_apply wined3d-CSMT_Main/0079-wined3d-Send-render-target-view-clears-through-the-c.patch
+	patch_apply wined3d-CSMT_Main/0080-wined3d-Wait-for-the-CS-in-GetDC.patch
+	patch_apply wined3d-CSMT_Main/0081-wined3d-send-resource-maps-through-the-command-strea.patch
+	patch_apply wined3d-CSMT_Main/0082-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch
+	patch_apply wined3d-CSMT_Main/0083-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch
+	patch_apply wined3d-CSMT_Main/0084-wined3d-Don-t-preload-buffers-on-unmap.patch
+	patch_apply wined3d-CSMT_Main/0085-wined3d-Don-t-call-glFinish-before-swapping.patch
+	patch_apply wined3d-CSMT_Main/0086-wined3d-wined3d_-_query_issue-never-fails.patch
+	patch_apply wined3d-CSMT_Main/0087-wined3d-Add-query-support-to-the-command-stream.patch
+	patch_apply wined3d-CSMT_Main/0088-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch
+	patch_apply wined3d-CSMT_Main/0089-wined3d-Poll-queries-automatically-in-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0090-wined3d-Introduce-a-separate-queue-for-priority-comm.patch
+	patch_apply wined3d-CSMT_Main/0091-wined3d-Destroy-queries-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0092-wined3d-Separate-main-and-worker-thread-query-state.patch
+	patch_apply wined3d-CSMT_Main/0093-wined3d-Don-t-poll-queries-that-failed-to-start.patch
+	patch_apply wined3d-CSMT_Main/0094-wined3d-Remove-restated-queries-from-the-poll-list.patch
+	patch_apply wined3d-CSMT_Main/0095-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch
+	patch_apply wined3d-CSMT_Main/0096-wined3d-Put-this-into-the-query-poll-patch.patch
+	patch_apply wined3d-CSMT_Main/0097-wined3d-Send-update_surface-commands-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0098-wined3d-Send-texture-preloads-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0099-wined3d-Send-surface-preloads-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0100-wined3d-Send-update_texture-calls-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0101-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch
+	patch_apply wined3d-CSMT_Main/0102-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch
+	patch_apply wined3d-CSMT_Main/0103-wined3d-Handle-evit_managed_resources-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0104-wined3d-Send-flips-through-the-command-stream.patch
+	patch_apply wined3d-CSMT_Main/0105-wined3d-Introduce-resource-fencing.patch
+	patch_apply wined3d-CSMT_Main/0106-wined3d-Fence-update_texture-and-update_surface-call.patch
+	patch_apply wined3d-CSMT_Main/0107-wined3d-Dirtify-resources-on-unmap.patch
+	patch_apply wined3d-CSMT_Main/0108-wined3d-Fence-texture-reads-in-draws.patch
+	patch_apply wined3d-CSMT_Main/0109-wined3d-Fence-render-targets-and-depth-stencils.patch
+	patch_apply wined3d-CSMT_Main/0110-wined3d-Fence-blit-operations.patch
+	patch_apply wined3d-CSMT_Main/0111-wined3d-Fence-color_fill-operations.patch
+	patch_apply wined3d-CSMT_Main/0112-wined3d-Fence-clear-calls.patch
+	patch_apply wined3d-CSMT_Main/0113-wined3d-Fence-present-calls.patch
+	patch_apply wined3d-CSMT_Main/0114-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch
+	patch_apply wined3d-CSMT_Main/0115-wined3d-Dirtify-changed-textures-through-the-command.patch
+	patch_apply wined3d-CSMT_Main/0116-wined3d-Wrap-GL-BOs-in-a-structure.patch
+	patch_apply wined3d-CSMT_Main/0117-wined3d-Separate-resource-map-and-draw-buffers.patch
+	patch_apply wined3d-CSMT_Main/0118-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch
+	patch_apply wined3d-CSMT_Main/0119-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch
+	patch_apply wined3d-CSMT_Main/0120-wined3d-Unset-some-objects-in-state_init_default.patch
+	patch_apply wined3d-CSMT_Main/0121-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch
+	patch_apply wined3d-CSMT_Main/0122-wined3d-Use-double-buffered-buffers-for-multithreade.patch
+	patch_apply wined3d-CSMT_Main/0123-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch
+	patch_apply wined3d-CSMT_Main/0124-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch
+	patch_apply wined3d-CSMT_Main/0125-wined3d-Accelerate-DISCARD-buffer-maps.patch
+	patch_apply wined3d-CSMT_Main/0126-wined3d-Accelerate-READONLY-buffer-maps.patch
+	patch_apply wined3d-CSMT_Main/0127-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0128-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0129-wined3d-Send-buffer-preloads-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0130-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch
+	patch_apply wined3d-CSMT_Main/0131-wined3d-Separate-GL-buffer-discard-control-from-igno.patch
+	patch_apply wined3d-CSMT_Main/0132-wined3d-Create-buffers-before-mapping-them.patch
+	patch_apply wined3d-CSMT_Main/0133-wined3d-Destroy-views-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0134-wined3d-Remove-another-glFinish.patch
+	patch_apply wined3d-CSMT_Main/0135-wined3d-Destroy-vertex-declarations-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0136-wined3d-Destroy-shaders-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0137-wined3d-Create-VBOs-through-the-command-stream.patch
+	patch_apply wined3d-CSMT_Main/0138-wined3d-Clean-up-resource-data-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0139-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0140-wined3d-Clean-up-volume-resource-data-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0141-wined3d-Clean-up-surfaces-through-the-cs.patch
+	patch_apply wined3d-CSMT_Main/0142-wined3d-Clean-up-texture-resources-through-the-cs.patch
+	patch_apply wined3d-CSMT_Main/0143-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch
+	patch_apply wined3d-CSMT_Main/0144-wined3d-Unload-resources-through-the-CS-in-device_re.patch
+	patch_apply wined3d-CSMT_Main/0145-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch
+	patch_apply wined3d-CSMT_Main/0146-wined3d-Remove-software-cursor-support.patch
+	patch_apply wined3d-CSMT_Main/0147-wined3d-Create-dummy-textures-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0148-wined3d-Create-the-initial-context-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0149-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch
+	patch_apply wined3d-CSMT_Main/0150-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch
+	patch_apply wined3d-CSMT_Main/0151-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch
+	patch_apply wined3d-CSMT_Main/0152-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch
+	patch_apply wined3d-CSMT_Main/0153-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch
+	patch_apply wined3d-CSMT_Main/0154-wined3d-Use-an-event-to-block-the-worker-thread-when.patch
+	patch_apply wined3d-CSMT_Main/0155-wined3d-Fence-preload-operations.patch
+	patch_apply wined3d-CSMT_Main/0156-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
+	patch_apply wined3d-CSMT_Main/0157-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
+	patch_apply wined3d-CSMT_Main/0158-wined3d-Completely-reset-the-state-on-reset.patch
+	patch_apply wined3d-CSMT_Main/0159-wined3d-Send-getdc-and-releasedc-through-the-command.patch
+	patch_apply wined3d-CSMT_Main/0160-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch
+	patch_apply wined3d-CSMT_Main/0161-wined3d-Wait-only-for-the-buffer-to-be-idle.patch
+	patch_apply wined3d-CSMT_Main/0162-wined3d-Add-a-comment-about-worker-thread-lag.patch
+	patch_apply wined3d-CSMT_Main/0163-wined3d-Remove-the-texture-destroy-glFinish.patch
+	patch_apply wined3d-CSMT_Main/0164-wined3d-Move-FBO-destruction-into-the-worker-thread.patch
+	patch_apply wined3d-CSMT_Main/0165-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch
+	patch_apply wined3d-CSMT_Main/0166-Winex11-complain-about-glfinish.patch
+	patch_apply wined3d-CSMT_Main/0167-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch
+	patch_apply wined3d-CSMT_Main/0168-wined3d-Remove-the-device_reset-CS-sync-fixme.patch
+	patch_apply wined3d-CSMT_Main/0169-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch
+	patch_apply wined3d-CSMT_Main/0170-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch
+	patch_apply wined3d-CSMT_Main/0171-wined3d-Don-t-sync-on-redundant-discard-calls.patch
+	patch_apply wined3d-CSMT_Main/0172-wined3d-Don-t-discard-new-buffers.patch
+	patch_apply wined3d-CSMT_Main/0173-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch
+	patch_apply wined3d-CSMT_Main/0174-wined3d-Render-target-lock-hack.patch
+	patch_apply wined3d-CSMT_Main/0175-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch
+	patch_apply wined3d-CSMT_Main/0176-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch
 	patch_apply wined3d-CSMT_Main/9999-IfDefined.patch
 	(
-		echo '+    { "Stefan Dösinger", "wined3d: Merge get_pitch functions.", 2 },';
+		echo '+    { "Sebastian Lackner", "wined3d: Properly initialize format_flags for surfaces and volumes.", 1 },';
+		echo '+    { "Stefan Dösinger", "wined3d: Merge get_pitch functions.", 1 },';
 		echo '+    { "Stefan Dösinger", "wined3d: Pass a context to surface_load_sysmem.", 1 },';
 		echo '+    { "Stefan Dösinger", "wined3d: Pass a context to read_from_framebuffer.", 1 },';
 		echo '+    { "Stefan Dösinger", "wined3d: Pass a context to surface_load_drawable and surface_blt_to_drawable.", 1 },';
diff --git a/patches/wined3d-CSMT_Main/0001-wined3d-Properly-initialize-format_flags-for-surface.patch b/patches/wined3d-CSMT_Main/0001-wined3d-Properly-initialize-format_flags-for-surface.patch
new file mode 100644
index 00000000..f39fa0cc
--- /dev/null
+++ b/patches/wined3d-CSMT_Main/0001-wined3d-Properly-initialize-format_flags-for-surface.patch
@@ -0,0 +1,38 @@
+From 8dc59ef56211678a681315041c0fd23bd490ad25 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 29 Jul 2015 06:35:07 +0200
+Subject: wined3d: Properly initialize format_flags for surfaces and volumes.
+
+---
+ dlls/wined3d/surface.c | 2 ++
+ dlls/wined3d/volume.c  | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
+index 3b033db..38a233d 100644
+--- a/dlls/wined3d/surface.c
++++ b/dlls/wined3d/surface.c
+@@ -5603,6 +5603,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
+     }
+ 
+     surface->container = container;
++    surface->resource.format_flags = container->resource.format_flags;
++
+     surface_validate_location(surface, WINED3D_LOCATION_SYSMEM);
+     list_init(&surface->renderbuffers);
+     list_init(&surface->overlays);
+diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
+index 424938a..4e1c415 100644
+--- a/dlls/wined3d/volume.c
++++ b/dlls/wined3d/volume.c
+@@ -779,6 +779,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture
+     }
+ 
+     volume->container = container;
++    volume->resource.format_flags = container->resource.format_flags;
+ 
+     return WINED3D_OK;
+ }
+-- 
+2.4.5
+
diff --git a/patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch b/patches/wined3d-CSMT_Main/0002-wined3d-Merge-get_pitch-functions.patch
similarity index 99%
rename from patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch
rename to patches/wined3d-CSMT_Main/0002-wined3d-Merge-get_pitch-functions.patch
index c83ae92f..aa975b96 100644
--- a/patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch
+++ b/patches/wined3d-CSMT_Main/0002-wined3d-Merge-get_pitch-functions.patch
@@ -1,7 +1,7 @@
 From fb1391dc1f2274d4336846720bb9869a3b751b0c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Thu, 19 Sep 2013 14:22:24 +0200
-Subject: wined3d: Merge get_pitch functions. (v2)
+Subject: wined3d: Merge get_pitch functions.
 
 ---
  dlls/wined3d/resource.c        | 31 ++++++++++++++++
diff --git a/patches/wined3d-CSMT_Main/0002-wined3d-Pass-a-context-to-surface_load_sysmem.patch b/patches/wined3d-CSMT_Main/0003-wined3d-Pass-a-context-to-surface_load_sysmem.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0002-wined3d-Pass-a-context-to-surface_load_sysmem.patch
rename to patches/wined3d-CSMT_Main/0003-wined3d-Pass-a-context-to-surface_load_sysmem.patch
diff --git a/patches/wined3d-CSMT_Main/0003-wined3d-Pass-a-context-to-read_from_framebuffer.patch b/patches/wined3d-CSMT_Main/0004-wined3d-Pass-a-context-to-read_from_framebuffer.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0003-wined3d-Pass-a-context-to-read_from_framebuffer.patch
rename to patches/wined3d-CSMT_Main/0004-wined3d-Pass-a-context-to-read_from_framebuffer.patch
diff --git a/patches/wined3d-CSMT_Main/0004-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch b/patches/wined3d-CSMT_Main/0005-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0004-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch
rename to patches/wined3d-CSMT_Main/0005-wined3d-Pass-a-context-to-surface_load_drawable-and-.patch
diff --git a/patches/wined3d-CSMT_Main/0005-wined3d-Pass-a-context-to-surface_blt_fbo.patch b/patches/wined3d-CSMT_Main/0006-wined3d-Pass-a-context-to-surface_blt_fbo.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0005-wined3d-Pass-a-context-to-surface_blt_fbo.patch
rename to patches/wined3d-CSMT_Main/0006-wined3d-Pass-a-context-to-surface_blt_fbo.patch
diff --git a/patches/wined3d-CSMT_Main/0006-wined3d-Pass-a-context-to-surface_multisample_resolv.patch b/patches/wined3d-CSMT_Main/0007-wined3d-Pass-a-context-to-surface_multisample_resolv.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0006-wined3d-Pass-a-context-to-surface_multisample_resolv.patch
rename to patches/wined3d-CSMT_Main/0007-wined3d-Pass-a-context-to-surface_multisample_resolv.patch
diff --git a/patches/wined3d-CSMT_Main/0007-wined3d-Pass-a-context-to-surface_load_texture.patch b/patches/wined3d-CSMT_Main/0008-wined3d-Pass-a-context-to-surface_load_texture.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0007-wined3d-Pass-a-context-to-surface_load_texture.patch
rename to patches/wined3d-CSMT_Main/0008-wined3d-Pass-a-context-to-surface_load_texture.patch
diff --git a/patches/wined3d-CSMT_Main/0008-wined3d-Pass-a-context-to-surface_load_location.patch b/patches/wined3d-CSMT_Main/0009-wined3d-Pass-a-context-to-surface_load_location.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0008-wined3d-Pass-a-context-to-surface_load_location.patch
rename to patches/wined3d-CSMT_Main/0009-wined3d-Pass-a-context-to-surface_load_location.patch
diff --git a/patches/wined3d-CSMT_Main/0009-wined3d-Make-surface_load_location-return-nothing.patch b/patches/wined3d-CSMT_Main/0010-wined3d-Make-surface_load_location-return-nothing.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0009-wined3d-Make-surface_load_location-return-nothing.patch
rename to patches/wined3d-CSMT_Main/0010-wined3d-Make-surface_load_location-return-nothing.patch
diff --git a/patches/wined3d-CSMT_Main/0010-wined3d-Store-volume-locations-in-the-resource.patch b/patches/wined3d-CSMT_Main/0011-wined3d-Store-volume-locations-in-the-resource.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0010-wined3d-Store-volume-locations-in-the-resource.patch
rename to patches/wined3d-CSMT_Main/0011-wined3d-Store-volume-locations-in-the-resource.patch
diff --git a/patches/wined3d-CSMT_Main/0011-wined3d-Move-validate_location-to-resource.c.patch b/patches/wined3d-CSMT_Main/0012-wined3d-Move-validate_location-to-resource.c.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0011-wined3d-Move-validate_location-to-resource.c.patch
rename to patches/wined3d-CSMT_Main/0012-wined3d-Move-validate_location-to-resource.c.patch
diff --git a/patches/wined3d-CSMT_Main/0012-wined3d-Move-surface-locations-into-the-resource.patch b/patches/wined3d-CSMT_Main/0013-wined3d-Move-surface-locations-into-the-resource.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0012-wined3d-Move-surface-locations-into-the-resource.patch
rename to patches/wined3d-CSMT_Main/0013-wined3d-Move-surface-locations-into-the-resource.patch
diff --git a/patches/wined3d-CSMT_Main/0013-wined3d-Remove-surface_validate_location.patch b/patches/wined3d-CSMT_Main/0014-wined3d-Remove-surface_validate_location.patch
similarity index 89%
rename from patches/wined3d-CSMT_Main/0013-wined3d-Remove-surface_validate_location.patch
rename to patches/wined3d-CSMT_Main/0014-wined3d-Remove-surface_validate_location.patch
index cabfb06b..6a2109be 100644
--- a/patches/wined3d-CSMT_Main/0013-wined3d-Remove-surface_validate_location.patch
+++ b/patches/wined3d-CSMT_Main/0014-wined3d-Remove-surface_validate_location.patch
@@ -1,4 +1,4 @@
-From bebac68a70a4be81237cd5ba392870eed6f5eccc Mon Sep 17 00:00:00 2001
+From f697640248f83b974829df63769cbb6fb4f6b722 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Sat, 4 Jan 2014 00:53:47 +0100
 Subject: wined3d: Remove surface_validate_location.
@@ -13,10 +13,10 @@ Subject: wined3d: Remove surface_validate_location.
  6 files changed, 20 insertions(+), 30 deletions(-)
 
 diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
-index 2ad6917..35637f2 100644
+index 57bc787..bdfc42d 100644
 --- a/dlls/wined3d/arb_program_shader.c
 +++ b/dlls/wined3d/arb_program_shader.c
-@@ -7921,7 +7921,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter,
+@@ -7864,7 +7864,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter,
  
      context_release(context);
  
@@ -26,7 +26,7 @@ index 2ad6917..35637f2 100644
  }
  
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index e84405e..95df08f 100644
+index 08987f2..210e53e 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
 @@ -392,7 +392,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
@@ -39,10 +39,10 @@ index e84405e..95df08f 100644
              }
          }
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index 8b2fb74..0599757 100644
+index 4a61d1b..8ec6ab8 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -1167,7 +1167,7 @@ static void surface_unload(struct wined3d_resource *resource)
+@@ -1170,7 +1170,7 @@ static void surface_unload(struct wined3d_resource *resource)
           * and all flags get lost */
          surface_prepare_system_memory(surface);
          memset(surface->resource.heap_memory, 0, surface->resource.size);
@@ -51,7 +51,7 @@ index 8b2fb74..0599757 100644
          surface_invalidate_location(surface, ~WINED3D_LOCATION_SYSMEM);
  
          /* We also get here when the ddraw swapchain is destroyed, for example
-@@ -1679,7 +1679,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
+@@ -1683,7 +1683,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
  
      context_release(context);
  
@@ -60,7 +60,7 @@ index 8b2fb74..0599757 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
  
      return WINED3D_OK;
-@@ -2178,7 +2178,7 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
+@@ -2169,7 +2169,7 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
          valid_location = WINED3D_LOCATION_SYSMEM;
      }
  
@@ -69,7 +69,7 @@ index 8b2fb74..0599757 100644
  
      return WINED3D_OK;
  }
-@@ -2723,7 +2723,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
+@@ -2715,7 +2715,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
      {
          TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n",
                  wined3d_debug_location(surface->resource.map_binding));
@@ -78,7 +78,7 @@ index 8b2fb74..0599757 100644
      }
      else
      {
-@@ -3282,7 +3282,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
+@@ -3274,7 +3274,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
  
      /* The texture is now most up to date - If the surface is a render target
       * and has a drawable, this path is never entered. */
@@ -87,7 +87,7 @@ index 8b2fb74..0599757 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
  }
  
-@@ -3555,7 +3555,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
+@@ -3547,7 +3547,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
  
      /* The texture is now most up to date - If the surface is a render target
       * and has a drawable, this path is never entered. */
@@ -96,7 +96,7 @@ index 8b2fb74..0599757 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
  }
  
-@@ -4058,13 +4058,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
+@@ -4053,13 +4053,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
      surface->ds_current_size.cy = surface->resource.height;
  }
  
@@ -110,7 +110,7 @@ index 8b2fb74..0599757 100644
  void surface_invalidate_location(struct wined3d_surface *surface, DWORD location)
  {
      TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location));
-@@ -4452,7 +4445,7 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
+@@ -4447,7 +4440,7 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
              break;
      }
  
@@ -119,7 +119,7 @@ index 8b2fb74..0599757 100644
  
      if (location != WINED3D_LOCATION_SYSMEM && (surface->resource.locations & WINED3D_LOCATION_SYSMEM))
          surface_evict_sysmem(surface);
-@@ -4627,7 +4620,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter,
+@@ -4620,7 +4613,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter,
      wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT,
              (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL);
  
@@ -128,7 +128,7 @@ index 8b2fb74..0599757 100644
      surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);
  }
  
-@@ -5599,7 +5592,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
+@@ -5600,7 +5593,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
                          dst_surface, dst_surface->container->resource.draw_binding, &dst_rect);
                  context_release(context);
  
@@ -137,16 +137,16 @@ index 8b2fb74..0599757 100644
                  surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);
  
                  return WINED3D_OK;
-@@ -5695,7 +5688,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
-     }
- 
+@@ -5698,7 +5691,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
      surface->container = container;
+     surface->resource.format_flags = container->resource.format_flags;
+ 
 -    surface_validate_location(surface, WINED3D_LOCATION_SYSMEM);
 +    wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_SYSMEM);
      list_init(&surface->renderbuffers);
      list_init(&surface->overlays);
  
-@@ -5727,7 +5720,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
+@@ -5730,7 +5723,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
      if (surface->resource.map_binding == WINED3D_LOCATION_DIB)
      {
          wined3d_resource_free_sysmem(&surface->resource);
@@ -156,7 +156,7 @@ index 8b2fb74..0599757 100644
      }
  
 diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
-index e702d61..075bffc 100644
+index 2e91c7c..a62d245 100644
 --- a/dlls/wined3d/swapchain.c
 +++ b/dlls/wined3d/swapchain.c
 @@ -569,19 +569,19 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
@@ -202,10 +202,10 @@ index e702d61..075bffc 100644
      }
  
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index d834cd8..bc9584a 100644
+index 75cf863..cf6e3e3 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -798,9 +798,7 @@ static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *
+@@ -785,9 +785,7 @@ static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *
  
  static void texture2d_sub_resource_validate_location(struct wined3d_resource *sub_resource, DWORD location)
  {
@@ -217,10 +217,10 @@ index d834cd8..bc9584a 100644
  
  static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource,
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 7b5a04f..06774c8 100644
+index 0aa218c..fa842fa 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2409,7 +2409,6 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
+@@ -2442,7 +2442,6 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
          const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN;
  HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point,
          struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN;
@@ -229,5 +229,5 @@ index 7b5a04f..06774c8 100644
          GLenum target, unsigned int level, unsigned int layer, DWORD flags,
          struct wined3d_surface **surface) DECLSPEC_HIDDEN;
 -- 
-2.3.5
+2.4.5
 
diff --git a/patches/wined3d-CSMT_Main/0014-wined3d-Move-invalidate_location-to-resource.c.patch b/patches/wined3d-CSMT_Main/0015-wined3d-Move-invalidate_location-to-resource.c.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0014-wined3d-Move-invalidate_location-to-resource.c.patch
rename to patches/wined3d-CSMT_Main/0015-wined3d-Move-invalidate_location-to-resource.c.patch
diff --git a/patches/wined3d-CSMT_Main/0015-wined3d-Invalidate-containers-via-callback.patch b/patches/wined3d-CSMT_Main/0016-wined3d-Invalidate-containers-via-callback.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0015-wined3d-Invalidate-containers-via-callback.patch
rename to patches/wined3d-CSMT_Main/0016-wined3d-Invalidate-containers-via-callback.patch
diff --git a/patches/wined3d-CSMT_Main/0016-wined3d-Remove-surface_invalidate_location.patch b/patches/wined3d-CSMT_Main/0017-wined3d-Remove-surface_invalidate_location.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0016-wined3d-Remove-surface_invalidate_location.patch
rename to patches/wined3d-CSMT_Main/0017-wined3d-Remove-surface_invalidate_location.patch
diff --git a/patches/wined3d-CSMT_Main/0017-wined3d-Move-bitmap_data-and-user_memory-into-the-re.patch b/patches/wined3d-CSMT_Main/0018-wined3d-Move-bitmap_data-and-user_memory-into-the-re.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0017-wined3d-Move-bitmap_data-and-user_memory-into-the-re.patch
rename to patches/wined3d-CSMT_Main/0018-wined3d-Move-bitmap_data-and-user_memory-into-the-re.patch
diff --git a/patches/wined3d-CSMT_Main/0018-wined3d-Move-load_location-into-the-resource.patch b/patches/wined3d-CSMT_Main/0019-wined3d-Move-load_location-into-the-resource.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0018-wined3d-Move-load_location-into-the-resource.patch
rename to patches/wined3d-CSMT_Main/0019-wined3d-Move-load_location-into-the-resource.patch
diff --git a/patches/wined3d-CSMT_Main/0019-wined3d-Replace-surface_load_location-with-resource_.patch b/patches/wined3d-CSMT_Main/0020-wined3d-Replace-surface_load_location-with-resource_.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0019-wined3d-Replace-surface_load_location-with-resource_.patch
rename to patches/wined3d-CSMT_Main/0020-wined3d-Replace-surface_load_location-with-resource_.patch
diff --git a/patches/wined3d-CSMT_Main/0020-wined3d-Introduce-helper-functions-for-mapping-volum.patch b/patches/wined3d-CSMT_Main/0021-wined3d-Introduce-helper-functions-for-mapping-volum.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0020-wined3d-Introduce-helper-functions-for-mapping-volum.patch
rename to patches/wined3d-CSMT_Main/0021-wined3d-Introduce-helper-functions-for-mapping-volum.patch
diff --git a/patches/wined3d-CSMT_Main/0021-wined3d-Move-volume-PBO-infrastructure-into-the-reso.patch b/patches/wined3d-CSMT_Main/0022-wined3d-Move-volume-PBO-infrastructure-into-the-reso.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0021-wined3d-Move-volume-PBO-infrastructure-into-the-reso.patch
rename to patches/wined3d-CSMT_Main/0022-wined3d-Move-volume-PBO-infrastructure-into-the-reso.patch
diff --git a/patches/wined3d-CSMT_Main/0022-wined3d-Remove-surface-pbo.patch b/patches/wined3d-CSMT_Main/0023-wined3d-Remove-surface-pbo.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0022-wined3d-Remove-surface-pbo.patch
rename to patches/wined3d-CSMT_Main/0023-wined3d-Remove-surface-pbo.patch
diff --git a/patches/wined3d-CSMT_Main/0023-wined3d-Use-resource-buffer-mapping-facilities-in-su.patch b/patches/wined3d-CSMT_Main/0024-wined3d-Use-resource-buffer-mapping-facilities-in-su.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0023-wined3d-Use-resource-buffer-mapping-facilities-in-su.patch
rename to patches/wined3d-CSMT_Main/0024-wined3d-Use-resource-buffer-mapping-facilities-in-su.patch
diff --git a/patches/wined3d-CSMT_Main/0024-wined3d-Move-buffer-creation-into-the-resource.patch b/patches/wined3d-CSMT_Main/0025-wined3d-Move-buffer-creation-into-the-resource.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0024-wined3d-Move-buffer-creation-into-the-resource.patch
rename to patches/wined3d-CSMT_Main/0025-wined3d-Move-buffer-creation-into-the-resource.patch
diff --git a/patches/wined3d-CSMT_Main/0025-wined3d-Handle-WINED3D_LOCATION_DISCARDED-in-surface.patch b/patches/wined3d-CSMT_Main/0026-wined3d-Handle-WINED3D_LOCATION_DISCARDED-in-surface.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0025-wined3d-Handle-WINED3D_LOCATION_DISCARDED-in-surface.patch
rename to patches/wined3d-CSMT_Main/0026-wined3d-Handle-WINED3D_LOCATION_DISCARDED-in-surface.patch
diff --git a/patches/wined3d-CSMT_Main/0026-wined3d-Handle-LOCATION_DISCARDED-in-surface_load_dr.patch b/patches/wined3d-CSMT_Main/0027-wined3d-Handle-LOCATION_DISCARDED-in-surface_load_dr.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0026-wined3d-Handle-LOCATION_DISCARDED-in-surface_load_dr.patch
rename to patches/wined3d-CSMT_Main/0027-wined3d-Handle-LOCATION_DISCARDED-in-surface_load_dr.patch
diff --git a/patches/wined3d-CSMT_Main/0027-wined3d-Handle-WINED3D_LOCATION_DISCARDED-for-sysmem.patch b/patches/wined3d-CSMT_Main/0028-wined3d-Handle-WINED3D_LOCATION_DISCARDED-for-sysmem.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0027-wined3d-Handle-WINED3D_LOCATION_DISCARDED-for-sysmem.patch
rename to patches/wined3d-CSMT_Main/0028-wined3d-Handle-WINED3D_LOCATION_DISCARDED-for-sysmem.patch
diff --git a/patches/wined3d-CSMT_Main/0028-wined3d-Discard-implicit-surfaces-on-unload.patch b/patches/wined3d-CSMT_Main/0029-wined3d-Discard-implicit-surfaces-on-unload.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0028-wined3d-Discard-implicit-surfaces-on-unload.patch
rename to patches/wined3d-CSMT_Main/0029-wined3d-Discard-implicit-surfaces-on-unload.patch
diff --git a/patches/wined3d-CSMT_Main/0029-wined3d-Don-t-try-to-flip-sysmem-copies-in-swapchain.patch b/patches/wined3d-CSMT_Main/0030-wined3d-Don-t-try-to-flip-sysmem-copies-in-swapchain.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0029-wined3d-Don-t-try-to-flip-sysmem-copies-in-swapchain.patch
rename to patches/wined3d-CSMT_Main/0030-wined3d-Don-t-try-to-flip-sysmem-copies-in-swapchain.patch
diff --git a/patches/wined3d-CSMT_Main/0030-wined3d-Discard-the-backbuffer-in-discard-presents.patch b/patches/wined3d-CSMT_Main/0031-wined3d-Discard-the-backbuffer-in-discard-presents.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0030-wined3d-Discard-the-backbuffer-in-discard-presents.patch
rename to patches/wined3d-CSMT_Main/0031-wined3d-Discard-the-backbuffer-in-discard-presents.patch
diff --git a/patches/wined3d-CSMT_Main/0031-wined3d-Allocate-sysmem-for-client-storage-if-it-doe.patch b/patches/wined3d-CSMT_Main/0032-wined3d-Allocate-sysmem-for-client-storage-if-it-doe.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0031-wined3d-Allocate-sysmem-for-client-storage-if-it-doe.patch
rename to patches/wined3d-CSMT_Main/0032-wined3d-Allocate-sysmem-for-client-storage-if-it-doe.patch
diff --git a/patches/wined3d-CSMT_Main/0032-wined3d-Introduce-a-function-to-retrieve-resource-me.patch b/patches/wined3d-CSMT_Main/0033-wined3d-Introduce-a-function-to-retrieve-resource-me.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0032-wined3d-Introduce-a-function-to-retrieve-resource-me.patch
rename to patches/wined3d-CSMT_Main/0033-wined3d-Introduce-a-function-to-retrieve-resource-me.patch
diff --git a/patches/wined3d-CSMT_Main/0033-wined3d-Make-surface_ops-unmap-specific-for-front-bu.patch b/patches/wined3d-CSMT_Main/0034-wined3d-Make-surface_ops-unmap-specific-for-front-bu.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0033-wined3d-Make-surface_ops-unmap-specific-for-front-bu.patch
rename to patches/wined3d-CSMT_Main/0034-wined3d-Make-surface_ops-unmap-specific-for-front-bu.patch
diff --git a/patches/wined3d-CSMT_Main/0034-wined3d-Move-check_block_align-to-resource.c.patch b/patches/wined3d-CSMT_Main/0035-wined3d-Move-check_block_align-to-resource.c.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0034-wined3d-Move-check_block_align-to-resource.c.patch
rename to patches/wined3d-CSMT_Main/0035-wined3d-Move-check_block_align-to-resource.c.patch
diff --git a/patches/wined3d-CSMT_Main/0035-wined3d-Replace-surface-alloc-functions-with-resourc.patch b/patches/wined3d-CSMT_Main/0036-wined3d-Replace-surface-alloc-functions-with-resourc.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0035-wined3d-Replace-surface-alloc-functions-with-resourc.patch
rename to patches/wined3d-CSMT_Main/0036-wined3d-Replace-surface-alloc-functions-with-resourc.patch
diff --git a/patches/wined3d-CSMT_Main/0036-wined3d-Don-t-delete-the-buffer-in-surface_cleanup.patch b/patches/wined3d-CSMT_Main/0037-wined3d-Don-t-delete-the-buffer-in-surface_cleanup.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0036-wined3d-Don-t-delete-the-buffer-in-surface_cleanup.patch
rename to patches/wined3d-CSMT_Main/0037-wined3d-Don-t-delete-the-buffer-in-surface_cleanup.patch
diff --git a/patches/wined3d-CSMT_Main/0037-wined3d-Use-resource-facilities-to-destroy-PBOs.patch b/patches/wined3d-CSMT_Main/0038-wined3d-Use-resource-facilities-to-destroy-PBOs.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0037-wined3d-Use-resource-facilities-to-destroy-PBOs.patch
rename to patches/wined3d-CSMT_Main/0038-wined3d-Use-resource-facilities-to-destroy-PBOs.patch
diff --git a/patches/wined3d-CSMT_Main/0038-wined3d-Move-simple-location-copying-to-the-resource.patch b/patches/wined3d-CSMT_Main/0039-wined3d-Move-simple-location-copying-to-the-resource.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0038-wined3d-Move-simple-location-copying-to-the-resource.patch
rename to patches/wined3d-CSMT_Main/0039-wined3d-Move-simple-location-copying-to-the-resource.patch
diff --git a/patches/wined3d-CSMT_Main/0039-wined3d-Move-most-of-volume_map-to-resource.c.patch b/patches/wined3d-CSMT_Main/0040-wined3d-Move-most-of-volume_map-to-resource.c.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0039-wined3d-Move-most-of-volume_map-to-resource.c.patch
rename to patches/wined3d-CSMT_Main/0040-wined3d-Move-most-of-volume_map-to-resource.c.patch
diff --git a/patches/wined3d-CSMT_Main/0040-wined3d-Use-resource_map-for-surface_map.patch b/patches/wined3d-CSMT_Main/0041-wined3d-Use-resource_map-for-surface_map.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0040-wined3d-Use-resource_map-for-surface_map.patch
rename to patches/wined3d-CSMT_Main/0041-wined3d-Use-resource_map-for-surface_map.patch
diff --git a/patches/wined3d-CSMT_Main/0042-wined3d-Don-t-call-the-public-map-function-in-surfac.patch b/patches/wined3d-CSMT_Main/0042-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
deleted file mode 100644
index 9514536a..00000000
--- a/patches/wined3d-CSMT_Main/0042-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 89a2597787017d7bc966c2a146fa4c4fc59e9ebb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
-Date: Mon, 23 Sep 2013 23:58:41 +0200
-Subject: wined3d: Don't call the public map function in
- surface_convert_format.
-
-TODO: Creating a helper surface and releasing it won't work with the CS.
-surface_cpu_blt will be called via the CS, so it can't call external
-methods that enqueue commands in the stream.
----
- dlls/wined3d/surface.c | 57 +++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 38 insertions(+), 19 deletions(-)
-
-diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index 303a0dc..045ede5 100644
---- a/dlls/wined3d/surface.c
-+++ b/dlls/wined3d/surface.c
-@@ -2253,11 +2253,14 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
- 
- static struct wined3d_texture *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt)
- {
--    struct wined3d_map_desc src_map, dst_map;
-+    void *dst_data = NULL, *src_data = NULL;
-+    UINT src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch;
-     const struct d3dfmt_converter_desc *conv;
-     struct wined3d_texture *ret = NULL;
-     struct wined3d_resource_desc desc;
-     struct wined3d_surface *dst;
-+    struct wined3d_context *context = NULL;
-+    struct wined3d_device *device = source->resource.device;
- 
-     conv = find_converter(source->resource.format->id, to_fmt);
-     if (!conv)
-@@ -2281,30 +2284,46 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_surface *so
-     }
-     dst = surface_from_resource(wined3d_texture_get_sub_resource(ret, 0));
- 
--    memset(&src_map, 0, sizeof(src_map));
--    memset(&dst_map, 0, sizeof(dst_map));
-+    wined3d_resource_get_pitch(&source->resource, &src_row_pitch, &src_slice_pitch);
-+    wined3d_resource_get_pitch(&ret->resource, &dst_row_pitch, &dst_slice_pitch);
- 
--    if (FAILED(wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY)))
--    {
--        ERR("Failed to lock the source surface.\n");
--        wined3d_texture_decref(ret);
--        return NULL;
--    }
--    if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, 0)))
--    {
--        ERR("Failed to lock the destination surface.\n");
--        wined3d_surface_unmap(source);
--        wined3d_texture_decref(ret);
--        return NULL;
--    }
-+    if (device->d3d_initialized)
-+        context = context_acquire(device, NULL);
-+
-+    wined3d_resource_load_location(&source->resource, context, source->resource.map_binding);
-+    src_data = wined3d_resource_get_map_ptr(&source->resource, context, WINED3D_MAP_READONLY);
-+    if (!src_data)
-+        goto error;
- 
--    conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch,
-+    if (!wined3d_resource_prepare_map_memory(&dst->resource, context))
-+        goto error;
-+    dst_data = wined3d_resource_get_map_ptr(&dst->resource, context, 0);
-+    if (!dst_data)
-+        goto error;
-+
-+    conv->convert(src_data, dst_data, src_row_pitch, dst_row_pitch,
-             source->resource.width, source->resource.height);
- 
--    wined3d_surface_unmap(dst);
--    wined3d_surface_unmap(source);
-+    wined3d_resource_release_map_ptr(&dst->resource, context);
-+    wined3d_resource_release_map_ptr(&source->resource, context);
-+
-+    if (context)
-+        context_release(context);
- 
-     return ret;
-+
-+error:
-+    ERR("Surface conversion failed.\n");
-+
-+    if (src_data)
-+        wined3d_resource_release_map_ptr(&source->resource, context);
-+    if (dst_data)
-+        wined3d_resource_release_map_ptr(&ret->resource, context);
-+    if (ret)
-+        wined3d_texture_decref(ret);
-+    if (context)
-+        context_release(context);
-+    return NULL;
- }
- 
- static HRESULT _Blt_ColorFill(BYTE *buf, unsigned int width, unsigned int height,
--- 
-2.1.3
-
diff --git a/patches/wined3d-CSMT_Main/0041-wined3d-Use-client-storage-with-DIB-sections.patch b/patches/wined3d-CSMT_Main/0042-wined3d-Use-client-storage-with-DIB-sections.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0041-wined3d-Use-client-storage-with-DIB-sections.patch
rename to patches/wined3d-CSMT_Main/0042-wined3d-Use-client-storage-with-DIB-sections.patch
diff --git a/patches/wined3d-CSMT_Main/0043-wined3d-Don-t-call-the-public-map-function-in-surfac.patch b/patches/wined3d-CSMT_Main/0043-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
index 8f1fb49b..9514536a 100644
--- a/patches/wined3d-CSMT_Main/0043-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
+++ b/patches/wined3d-CSMT_Main/0043-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
@@ -1,277 +1,101 @@
-From 9d0010d5add477e39747ac3e458d16b5b1fa101f Mon Sep 17 00:00:00 2001
+From 89a2597787017d7bc966c2a146fa4c4fc59e9ebb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
-Date: Tue, 24 Sep 2013 00:31:39 +0200
-Subject: wined3d: Don't call the public map function in surface_cpu_blt.
+Date: Mon, 23 Sep 2013 23:58:41 +0200
+Subject: wined3d: Don't call the public map function in
+ surface_convert_format.
 
+TODO: Creating a helper surface and releasing it won't work with the CS.
+surface_cpu_blt will be called via the CS, so it can't call external
+methods that enqueue commands in the stream.
 ---
- dlls/wined3d/surface.c | 107 +++++++++++++++++++++++++++++++++----------------
- 1 file changed, 72 insertions(+), 35 deletions(-)
+ dlls/wined3d/surface.c | 57 +++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 38 insertions(+), 19 deletions(-)
 
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index ff83f29..df8aea6 100644
+index 303a0dc..045ede5 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -4428,21 +4428,36 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-     const struct wined3d_format *src_format, *dst_format;
-     unsigned int src_fmt_flags, dst_fmt_flags;
-     struct wined3d_texture *src_texture = NULL;
--    struct wined3d_map_desc dst_map, src_map;
-+    void *src_data = NULL, *dst_data = NULL;
+@@ -2253,11 +2253,14 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo
+ 
+ static struct wined3d_texture *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt)
+ {
+-    struct wined3d_map_desc src_map, dst_map;
++    void *dst_data = NULL, *src_data = NULL;
 +    UINT src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch;
-     const BYTE *sbase = NULL;
-     HRESULT hr = WINED3D_OK;
-     const BYTE *sbuf;
-     BYTE *dbuf;
-     int x, y;
-+    struct wined3d_device *device = dst_surface->resource.device;
+     const struct d3dfmt_converter_desc *conv;
+     struct wined3d_texture *ret = NULL;
+     struct wined3d_resource_desc desc;
+     struct wined3d_surface *dst;
 +    struct wined3d_context *context = NULL;
++    struct wined3d_device *device = source->resource.device;
  
-     TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n",
-             dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect),
-             flags, fx, debug_d3dtexturefiltertype(filter));
+     conv = find_converter(source->resource.format->id, to_fmt);
+     if (!conv)
+@@ -2281,30 +2284,46 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_surface *so
+     }
+     dst = surface_from_resource(wined3d_texture_get_sub_resource(ret, 0));
  
+-    memset(&src_map, 0, sizeof(src_map));
+-    memset(&dst_map, 0, sizeof(dst_map));
++    wined3d_resource_get_pitch(&source->resource, &src_row_pitch, &src_slice_pitch);
++    wined3d_resource_get_pitch(&ret->resource, &dst_row_pitch, &dst_slice_pitch);
+ 
+-    if (FAILED(wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY)))
+-    {
+-        ERR("Failed to lock the source surface.\n");
+-        wined3d_texture_decref(ret);
+-        return NULL;
+-    }
+-    if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, 0)))
+-    {
+-        ERR("Failed to lock the destination surface.\n");
+-        wined3d_surface_unmap(source);
+-        wined3d_texture_decref(ret);
+-        return NULL;
+-    }
 +    if (device->d3d_initialized)
 +        context = context_acquire(device, NULL);
 +
-+    if (!wined3d_resource_prepare_map_memory(&dst_surface->resource, context))
-+    {
-+        hr = E_OUTOFMEMORY;
++    wined3d_resource_load_location(&source->resource, context, source->resource.map_binding);
++    src_data = wined3d_resource_get_map_ptr(&source->resource, context, WINED3D_MAP_READONLY);
++    if (!src_data)
++        goto error;
+ 
+-    conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch,
++    if (!wined3d_resource_prepare_map_memory(&dst->resource, context))
++        goto error;
++    dst_data = wined3d_resource_get_map_ptr(&dst->resource, context, 0);
++    if (!dst_data)
 +        goto error;
-+    }
-+    wined3d_resource_load_location(&dst_surface->resource, context, dst_surface->resource.map_binding);
 +
-     if (src_surface == dst_surface)
-     {
--        wined3d_surface_map(dst_surface, &dst_map, NULL, 0);
--        src_map = dst_map;
-+        dst_data = wined3d_resource_get_map_ptr(&dst_surface->resource, context, 0);
-+        wined3d_resource_get_pitch(&dst_surface->resource, &dst_row_pitch, &dst_slice_pitch);
-+        src_data = dst_data;
-+        src_row_pitch = dst_row_pitch;
-         src_format = dst_surface->resource.format;
-         dst_format = src_format;
-         dst_fmt_flags = dst_surface->container->resource.format_flags;
-@@ -4454,6 +4469,12 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-         dst_fmt_flags = dst_surface->container->resource.format_flags;
-         if (src_surface)
-         {
-+            if (!wined3d_resource_prepare_map_memory(&src_surface->resource, context))
-+            {
-+                hr = E_OUTOFMEMORY;
-+                goto error;
-+            }
++    conv->convert(src_data, dst_data, src_row_pitch, dst_row_pitch,
+             source->resource.width, source->resource.height);
+ 
+-    wined3d_surface_unmap(dst);
+-    wined3d_surface_unmap(source);
++    wined3d_resource_release_map_ptr(&dst->resource, context);
++    wined3d_resource_release_map_ptr(&source->resource, context);
 +
-             if (dst_surface->resource.format->id != src_surface->resource.format->id)
-             {
-                 if (!(src_texture = surface_convert_format(src_surface, dst_format->id)))
-@@ -4464,7 +4485,9 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-                 }
-                 src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, 0));
-             }
--            wined3d_surface_map(src_surface, &src_map, NULL, WINED3D_MAP_READONLY);
-+            wined3d_resource_load_location(&src_surface->resource, context, src_surface->resource.map_binding);
-+            wined3d_resource_get_pitch(&src_surface->resource, &src_row_pitch, &src_slice_pitch);
-+            src_data = wined3d_resource_get_map_ptr(&src_surface->resource, context, 0);
-             src_format = src_surface->resource.format;
-             src_fmt_flags = src_surface->container->resource.format_flags;
-         }
-@@ -4474,7 +4497,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-             src_fmt_flags = dst_fmt_flags;
-         }
- 
--        wined3d_surface_map(dst_surface, &dst_map, dst_rect, 0);
-+        wined3d_resource_get_pitch(&dst_surface->resource, &dst_row_pitch, &dst_slice_pitch);
-+        dst_data = wined3d_resource_get_map_ptr(&dst_surface->resource, context, 0);
-     }
- 
-     bpp = dst_surface->resource.format->byte_count;
-@@ -4485,15 +4509,12 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-     width = (dst_rect->right - dst_rect->left) * bpp;
- 
-     if (src_surface)
--        sbase = (BYTE *)src_map.data
--                + ((src_rect->top / src_format->block_height) * src_map.row_pitch)
-+        sbase = (BYTE *)src_data
-+                + ((src_rect->top / src_format->block_height) * src_row_pitch)
-                 + ((src_rect->left / src_format->block_width) * src_format->block_byte_count);
--    if (src_surface != dst_surface)
--        dbuf = dst_map.data;
--    else
--        dbuf = (BYTE *)dst_map.data
--                + ((dst_rect->top / dst_format->block_height) * dst_map.row_pitch)
--                + ((dst_rect->left / dst_format->block_width) * dst_format->block_byte_count);
-+    dbuf = (BYTE *)dst_data
-+            + ((dst_rect->top / dst_format->block_height) * dst_row_pitch)
-+            + ((dst_rect->left / dst_format->block_width) * dst_format->block_byte_count);
- 
-     if (src_fmt_flags & dst_fmt_flags & WINED3DFMT_FLAG_BLOCKS)
-     {
-@@ -4528,7 +4549,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-         }
- 
-         hr = surface_cpu_blt_compressed(sbase, dbuf,
--                src_map.row_pitch, dst_map.row_pitch, dstwidth, dstheight,
-+                src_row_pitch, dst_row_pitch, dstwidth, dstheight,
-                 src_format, flags, fx);
-         goto release;
-     }
-@@ -4536,7 +4557,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-     /* First, all the 'source-less' blits */
-     if (flags & WINEDDBLT_COLORFILL)
-     {
--        hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, fx->u5.dwFillColor);
-+        hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_row_pitch, fx->u5.dwFillColor);
-         flags &= ~WINEDDBLT_COLORFILL;
-     }
- 
-@@ -4585,19 +4606,19 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-                         for (y = 0; y < dstheight; ++y)
-                         {
-                             memcpy(dbuf, sbuf, width);
--                            sbuf += src_map.row_pitch;
--                            dbuf += dst_map.row_pitch;
-+                            sbuf += src_row_pitch;
-+                            dbuf += dst_row_pitch;
-                         }
-                     }
-                     else if (dst_rect->top > src_rect->top)
-                     {
-                         /* Copy from bottom upwards. */
--                        sbuf += src_map.row_pitch * dstheight;
--                        dbuf += dst_map.row_pitch * dstheight;
-+                        sbuf += src_row_pitch * dstheight;
-+                        dbuf += dst_row_pitch * dstheight;
-                         for (y = 0; y < dstheight; ++y)
-                         {
--                            sbuf -= src_map.row_pitch;
--                            dbuf -= dst_map.row_pitch;
-+                            sbuf -= src_row_pitch;
-+                            dbuf -= dst_row_pitch;
-                             memcpy(dbuf, sbuf, width);
-                         }
-                     }
-@@ -4607,8 +4628,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-                         for (y = 0; y < dstheight; ++y)
-                         {
-                             memmove(dbuf, sbuf, width);
--                            sbuf += src_map.row_pitch;
--                            dbuf += dst_map.row_pitch;
-+                            sbuf += src_row_pitch;
-+                            dbuf += dst_row_pitch;
-                         }
-                     }
-                 }
-@@ -4617,9 +4638,9 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-                     /* Stretching in y direction only. */
-                     for (y = sy = 0; y < dstheight; ++y, sy += yinc)
-                     {
--                        sbuf = sbase + (sy >> 16) * src_map.row_pitch;
-+                        sbuf = sbase + (sy >> 16) * src_row_pitch;
-                         memcpy(dbuf, sbuf, width);
--                        dbuf += dst_map.row_pitch;
-+                        dbuf += dst_row_pitch;
-                     }
-                 }
-             }
-@@ -4629,13 +4650,13 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
-                 int last_sy = -1;
-                 for (y = sy = 0; y < dstheight; ++y, sy += yinc)
-                 {
--                    sbuf = sbase + (sy >> 16) * src_map.row_pitch;
-+                    sbuf = sbase + (sy >> 16) * src_row_pitch;
- 
-                     if ((sy >> 16) == (last_sy >> 16))
-                     {
-                         /* This source row is the same as last source row -
-                          * Copy the already stretched row. */
--                        memcpy(dbuf, dbuf - dst_map.row_pitch, width);
-+                        memcpy(dbuf, dbuf - dst_row_pitch, width);
-                     }
-                     else
-                     {
-@@ -4682,14 +4703,14 @@ do { \
-                         }
- #undef STRETCH_ROW
-                     }
--                    dbuf += dst_map.row_pitch;
-+                    dbuf += dst_row_pitch;
-                     last_sy = sy;
-                 }
-             }
-         }
-         else
-         {
--            LONG dstyinc = dst_map.row_pitch, dstxinc = bpp;
-+            LONG dstyinc = dst_row_pitch, dstxinc = bpp;
-             DWORD keylow = 0xffffffff, keyhigh = 0, keymask = 0xffffffff;
-             DWORD destkeylow = 0x0, destkeyhigh = 0xffffffff, destkeymask = 0xffffffff;
-             if (flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYDEST | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_KEYDESTOVERRIDE))
-@@ -4739,7 +4760,7 @@ do { \
-                 LONG tmpxy;
-                 dTopLeft     = dbuf;
-                 dTopRight    = dbuf + ((dstwidth - 1) * bpp);
--                dBottomLeft  = dTopLeft + ((dstheight - 1) * dst_map.row_pitch);
-+                dBottomLeft  = dTopLeft + ((dstheight - 1) * dst_row_pitch);
-                 dBottomRight = dBottomLeft + ((dstwidth - 1) * bpp);
- 
-                 if (fx->dwDDFX & WINEDDBLTFX_ARITHSTRETCHY)
-@@ -4822,7 +4843,7 @@ do { \
-     type *d = (type *)dbuf, *dx, tmp; \
-     for (y = sy = 0; y < dstheight; ++y, sy += yinc) \
-     { \
--        s = (const type *)(sbase + (sy >> 16) * src_map.row_pitch); \
-+        s = (const type *)(sbase + (sy >> 16) * src_row_pitch); \
-         dx = d; \
-         for (x = sx = 0; x < dstwidth; ++x, sx += xinc) \
-         { \
-@@ -4855,7 +4876,7 @@ do { \
-                     BYTE *d = dbuf, *dx;
-                     for (y = sy = 0; y < dstheight; ++y, sy += yinc)
-                     {
--                        sbuf = sbase + (sy >> 16) * src_map.row_pitch;
-+                        sbuf = sbase + (sy >> 16) * src_row_pitch;
-                         dx = d;
-                         for (x = sx = 0; x < dstwidth; ++x, sx+= xinc)
-                         {
-@@ -4886,6 +4907,10 @@ do { \
-         }
-     }
- 
-+    wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->resource.map_binding);
-+    if (dst_surface->container)
-+        wined3d_texture_set_dirty(dst_surface->container);
-+
- error:
-     if (flags && FIXME_ON(d3d_surface))
-     {
-@@ -4893,12 +4918,24 @@ error:
-     }
- 
- release:
--    wined3d_surface_unmap(dst_surface);
--    if (src_surface && src_surface != dst_surface)
--        wined3d_surface_unmap(src_surface);
-+    if (dst_data)
-+    {
-+        wined3d_resource_release_map_ptr(&dst_surface->resource, context);
-+
-+        if (dst_surface->container->swapchain
-+                && dst_surface->container == dst_surface->container->swapchain->front_buffer)
-+        {
-+            dst_surface->lockedRect = *dst_rect;
-+            dst_surface->surface_ops->surface_frontbuffer_updated(dst_surface);
-+        }
-+    }
-+    if (src_surface && src_surface != dst_surface && src_data)
-+        wined3d_resource_release_map_ptr(&src_surface->resource, context);
-     /* Release the converted surface, if any. */
-     if (src_texture)
-         wined3d_texture_decref(src_texture);
 +    if (context)
 +        context_release(context);
  
-     return hr;
+     return ret;
++
++error:
++    ERR("Surface conversion failed.\n");
++
++    if (src_data)
++        wined3d_resource_release_map_ptr(&source->resource, context);
++    if (dst_data)
++        wined3d_resource_release_map_ptr(&ret->resource, context);
++    if (ret)
++        wined3d_texture_decref(ret);
++    if (context)
++        context_release(context);
++    return NULL;
  }
+ 
+ static HRESULT _Blt_ColorFill(BYTE *buf, unsigned int width, unsigned int height,
 -- 
-2.4.2
+2.1.3
 
diff --git a/patches/wined3d-CSMT_Main/0044-wined3d-Don-t-call-the-public-map-function-in-surfac.patch b/patches/wined3d-CSMT_Main/0044-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
new file mode 100644
index 00000000..8f1fb49b
--- /dev/null
+++ b/patches/wined3d-CSMT_Main/0044-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
@@ -0,0 +1,277 @@
+From 9d0010d5add477e39747ac3e458d16b5b1fa101f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
+Date: Tue, 24 Sep 2013 00:31:39 +0200
+Subject: wined3d: Don't call the public map function in surface_cpu_blt.
+
+---
+ dlls/wined3d/surface.c | 107 +++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 72 insertions(+), 35 deletions(-)
+
+diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
+index ff83f29..df8aea6 100644
+--- a/dlls/wined3d/surface.c
++++ b/dlls/wined3d/surface.c
+@@ -4428,21 +4428,36 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+     const struct wined3d_format *src_format, *dst_format;
+     unsigned int src_fmt_flags, dst_fmt_flags;
+     struct wined3d_texture *src_texture = NULL;
+-    struct wined3d_map_desc dst_map, src_map;
++    void *src_data = NULL, *dst_data = NULL;
++    UINT src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch;
+     const BYTE *sbase = NULL;
+     HRESULT hr = WINED3D_OK;
+     const BYTE *sbuf;
+     BYTE *dbuf;
+     int x, y;
++    struct wined3d_device *device = dst_surface->resource.device;
++    struct wined3d_context *context = NULL;
+ 
+     TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n",
+             dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect),
+             flags, fx, debug_d3dtexturefiltertype(filter));
+ 
++    if (device->d3d_initialized)
++        context = context_acquire(device, NULL);
++
++    if (!wined3d_resource_prepare_map_memory(&dst_surface->resource, context))
++    {
++        hr = E_OUTOFMEMORY;
++        goto error;
++    }
++    wined3d_resource_load_location(&dst_surface->resource, context, dst_surface->resource.map_binding);
++
+     if (src_surface == dst_surface)
+     {
+-        wined3d_surface_map(dst_surface, &dst_map, NULL, 0);
+-        src_map = dst_map;
++        dst_data = wined3d_resource_get_map_ptr(&dst_surface->resource, context, 0);
++        wined3d_resource_get_pitch(&dst_surface->resource, &dst_row_pitch, &dst_slice_pitch);
++        src_data = dst_data;
++        src_row_pitch = dst_row_pitch;
+         src_format = dst_surface->resource.format;
+         dst_format = src_format;
+         dst_fmt_flags = dst_surface->container->resource.format_flags;
+@@ -4454,6 +4469,12 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+         dst_fmt_flags = dst_surface->container->resource.format_flags;
+         if (src_surface)
+         {
++            if (!wined3d_resource_prepare_map_memory(&src_surface->resource, context))
++            {
++                hr = E_OUTOFMEMORY;
++                goto error;
++            }
++
+             if (dst_surface->resource.format->id != src_surface->resource.format->id)
+             {
+                 if (!(src_texture = surface_convert_format(src_surface, dst_format->id)))
+@@ -4464,7 +4485,9 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                 }
+                 src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, 0));
+             }
+-            wined3d_surface_map(src_surface, &src_map, NULL, WINED3D_MAP_READONLY);
++            wined3d_resource_load_location(&src_surface->resource, context, src_surface->resource.map_binding);
++            wined3d_resource_get_pitch(&src_surface->resource, &src_row_pitch, &src_slice_pitch);
++            src_data = wined3d_resource_get_map_ptr(&src_surface->resource, context, 0);
+             src_format = src_surface->resource.format;
+             src_fmt_flags = src_surface->container->resource.format_flags;
+         }
+@@ -4474,7 +4497,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+             src_fmt_flags = dst_fmt_flags;
+         }
+ 
+-        wined3d_surface_map(dst_surface, &dst_map, dst_rect, 0);
++        wined3d_resource_get_pitch(&dst_surface->resource, &dst_row_pitch, &dst_slice_pitch);
++        dst_data = wined3d_resource_get_map_ptr(&dst_surface->resource, context, 0);
+     }
+ 
+     bpp = dst_surface->resource.format->byte_count;
+@@ -4485,15 +4509,12 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+     width = (dst_rect->right - dst_rect->left) * bpp;
+ 
+     if (src_surface)
+-        sbase = (BYTE *)src_map.data
+-                + ((src_rect->top / src_format->block_height) * src_map.row_pitch)
++        sbase = (BYTE *)src_data
++                + ((src_rect->top / src_format->block_height) * src_row_pitch)
+                 + ((src_rect->left / src_format->block_width) * src_format->block_byte_count);
+-    if (src_surface != dst_surface)
+-        dbuf = dst_map.data;
+-    else
+-        dbuf = (BYTE *)dst_map.data
+-                + ((dst_rect->top / dst_format->block_height) * dst_map.row_pitch)
+-                + ((dst_rect->left / dst_format->block_width) * dst_format->block_byte_count);
++    dbuf = (BYTE *)dst_data
++            + ((dst_rect->top / dst_format->block_height) * dst_row_pitch)
++            + ((dst_rect->left / dst_format->block_width) * dst_format->block_byte_count);
+ 
+     if (src_fmt_flags & dst_fmt_flags & WINED3DFMT_FLAG_BLOCKS)
+     {
+@@ -4528,7 +4549,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+         }
+ 
+         hr = surface_cpu_blt_compressed(sbase, dbuf,
+-                src_map.row_pitch, dst_map.row_pitch, dstwidth, dstheight,
++                src_row_pitch, dst_row_pitch, dstwidth, dstheight,
+                 src_format, flags, fx);
+         goto release;
+     }
+@@ -4536,7 +4557,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+     /* First, all the 'source-less' blits */
+     if (flags & WINEDDBLT_COLORFILL)
+     {
+-        hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, fx->u5.dwFillColor);
++        hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_row_pitch, fx->u5.dwFillColor);
+         flags &= ~WINEDDBLT_COLORFILL;
+     }
+ 
+@@ -4585,19 +4606,19 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                         for (y = 0; y < dstheight; ++y)
+                         {
+                             memcpy(dbuf, sbuf, width);
+-                            sbuf += src_map.row_pitch;
+-                            dbuf += dst_map.row_pitch;
++                            sbuf += src_row_pitch;
++                            dbuf += dst_row_pitch;
+                         }
+                     }
+                     else if (dst_rect->top > src_rect->top)
+                     {
+                         /* Copy from bottom upwards. */
+-                        sbuf += src_map.row_pitch * dstheight;
+-                        dbuf += dst_map.row_pitch * dstheight;
++                        sbuf += src_row_pitch * dstheight;
++                        dbuf += dst_row_pitch * dstheight;
+                         for (y = 0; y < dstheight; ++y)
+                         {
+-                            sbuf -= src_map.row_pitch;
+-                            dbuf -= dst_map.row_pitch;
++                            sbuf -= src_row_pitch;
++                            dbuf -= dst_row_pitch;
+                             memcpy(dbuf, sbuf, width);
+                         }
+                     }
+@@ -4607,8 +4628,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                         for (y = 0; y < dstheight; ++y)
+                         {
+                             memmove(dbuf, sbuf, width);
+-                            sbuf += src_map.row_pitch;
+-                            dbuf += dst_map.row_pitch;
++                            sbuf += src_row_pitch;
++                            dbuf += dst_row_pitch;
+                         }
+                     }
+                 }
+@@ -4617,9 +4638,9 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                     /* Stretching in y direction only. */
+                     for (y = sy = 0; y < dstheight; ++y, sy += yinc)
+                     {
+-                        sbuf = sbase + (sy >> 16) * src_map.row_pitch;
++                        sbuf = sbase + (sy >> 16) * src_row_pitch;
+                         memcpy(dbuf, sbuf, width);
+-                        dbuf += dst_map.row_pitch;
++                        dbuf += dst_row_pitch;
+                     }
+                 }
+             }
+@@ -4629,13 +4650,13 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                 int last_sy = -1;
+                 for (y = sy = 0; y < dstheight; ++y, sy += yinc)
+                 {
+-                    sbuf = sbase + (sy >> 16) * src_map.row_pitch;
++                    sbuf = sbase + (sy >> 16) * src_row_pitch;
+ 
+                     if ((sy >> 16) == (last_sy >> 16))
+                     {
+                         /* This source row is the same as last source row -
+                          * Copy the already stretched row. */
+-                        memcpy(dbuf, dbuf - dst_map.row_pitch, width);
++                        memcpy(dbuf, dbuf - dst_row_pitch, width);
+                     }
+                     else
+                     {
+@@ -4682,14 +4703,14 @@ do { \
+                         }
+ #undef STRETCH_ROW
+                     }
+-                    dbuf += dst_map.row_pitch;
++                    dbuf += dst_row_pitch;
+                     last_sy = sy;
+                 }
+             }
+         }
+         else
+         {
+-            LONG dstyinc = dst_map.row_pitch, dstxinc = bpp;
++            LONG dstyinc = dst_row_pitch, dstxinc = bpp;
+             DWORD keylow = 0xffffffff, keyhigh = 0, keymask = 0xffffffff;
+             DWORD destkeylow = 0x0, destkeyhigh = 0xffffffff, destkeymask = 0xffffffff;
+             if (flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYDEST | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_KEYDESTOVERRIDE))
+@@ -4739,7 +4760,7 @@ do { \
+                 LONG tmpxy;
+                 dTopLeft     = dbuf;
+                 dTopRight    = dbuf + ((dstwidth - 1) * bpp);
+-                dBottomLeft  = dTopLeft + ((dstheight - 1) * dst_map.row_pitch);
++                dBottomLeft  = dTopLeft + ((dstheight - 1) * dst_row_pitch);
+                 dBottomRight = dBottomLeft + ((dstwidth - 1) * bpp);
+ 
+                 if (fx->dwDDFX & WINEDDBLTFX_ARITHSTRETCHY)
+@@ -4822,7 +4843,7 @@ do { \
+     type *d = (type *)dbuf, *dx, tmp; \
+     for (y = sy = 0; y < dstheight; ++y, sy += yinc) \
+     { \
+-        s = (const type *)(sbase + (sy >> 16) * src_map.row_pitch); \
++        s = (const type *)(sbase + (sy >> 16) * src_row_pitch); \
+         dx = d; \
+         for (x = sx = 0; x < dstwidth; ++x, sx += xinc) \
+         { \
+@@ -4855,7 +4876,7 @@ do { \
+                     BYTE *d = dbuf, *dx;
+                     for (y = sy = 0; y < dstheight; ++y, sy += yinc)
+                     {
+-                        sbuf = sbase + (sy >> 16) * src_map.row_pitch;
++                        sbuf = sbase + (sy >> 16) * src_row_pitch;
+                         dx = d;
+                         for (x = sx = 0; x < dstwidth; ++x, sx+= xinc)
+                         {
+@@ -4886,6 +4907,10 @@ do { \
+         }
+     }
+ 
++    wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->resource.map_binding);
++    if (dst_surface->container)
++        wined3d_texture_set_dirty(dst_surface->container);
++
+ error:
+     if (flags && FIXME_ON(d3d_surface))
+     {
+@@ -4893,12 +4918,24 @@ error:
+     }
+ 
+ release:
+-    wined3d_surface_unmap(dst_surface);
+-    if (src_surface && src_surface != dst_surface)
+-        wined3d_surface_unmap(src_surface);
++    if (dst_data)
++    {
++        wined3d_resource_release_map_ptr(&dst_surface->resource, context);
++
++        if (dst_surface->container->swapchain
++                && dst_surface->container == dst_surface->container->swapchain->front_buffer)
++        {
++            dst_surface->lockedRect = *dst_rect;
++            dst_surface->surface_ops->surface_frontbuffer_updated(dst_surface);
++        }
++    }
++    if (src_surface && src_surface != dst_surface && src_data)
++        wined3d_resource_release_map_ptr(&src_surface->resource, context);
+     /* Release the converted surface, if any. */
+     if (src_texture)
+         wined3d_texture_decref(src_texture);
++    if (context)
++        context_release(context);
+ 
+     return hr;
+ }
+-- 
+2.4.2
+
diff --git a/patches/wined3d-CSMT_Main/0044-wined3d-Move-the-framebuffer-into-wined3d_state.patch b/patches/wined3d-CSMT_Main/0045-wined3d-Move-the-framebuffer-into-wined3d_state.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0044-wined3d-Move-the-framebuffer-into-wined3d_state.patch
rename to patches/wined3d-CSMT_Main/0045-wined3d-Move-the-framebuffer-into-wined3d_state.patch
diff --git a/patches/wined3d-CSMT_Main/0045-wined3d-Get-rid-of-state-access-in-shader_generate_g.patch b/patches/wined3d-CSMT_Main/0046-wined3d-Get-rid-of-state-access-in-shader_generate_g.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0045-wined3d-Get-rid-of-state-access-in-shader_generate_g.patch
rename to patches/wined3d-CSMT_Main/0046-wined3d-Get-rid-of-state-access-in-shader_generate_g.patch
diff --git a/patches/wined3d-CSMT_Main/0046-wined3d-Preload-buffers-if-streamsrc-is-not-dirty.patch b/patches/wined3d-CSMT_Main/0047-wined3d-Preload-buffers-if-streamsrc-is-not-dirty.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0046-wined3d-Preload-buffers-if-streamsrc-is-not-dirty.patch
rename to patches/wined3d-CSMT_Main/0047-wined3d-Preload-buffers-if-streamsrc-is-not-dirty.patch
diff --git a/patches/wined3d-CSMT_Main/0047-wined3d-Hackily-introduce-a-multithreaded-command-st.patch b/patches/wined3d-CSMT_Main/0048-wined3d-Hackily-introduce-a-multithreaded-command-st.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0047-wined3d-Hackily-introduce-a-multithreaded-command-st.patch
rename to patches/wined3d-CSMT_Main/0048-wined3d-Hackily-introduce-a-multithreaded-command-st.patch
diff --git a/patches/wined3d-CSMT_Main/0048-wined3d-Wait-for-resource-updates-to-finish-when-usi.patch b/patches/wined3d-CSMT_Main/0049-wined3d-Wait-for-resource-updates-to-finish-when-usi.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0048-wined3d-Wait-for-resource-updates-to-finish-when-usi.patch
rename to patches/wined3d-CSMT_Main/0049-wined3d-Wait-for-resource-updates-to-finish-when-usi.patch
diff --git a/patches/wined3d-CSMT_Main/0049-wined3d-Don-t-store-pointers-in-struct-wined3d_cs_pr.patch b/patches/wined3d-CSMT_Main/0050-wined3d-Don-t-store-pointers-in-struct-wined3d_cs_pr.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0049-wined3d-Don-t-store-pointers-in-struct-wined3d_cs_pr.patch
rename to patches/wined3d-CSMT_Main/0050-wined3d-Don-t-store-pointers-in-struct-wined3d_cs_pr.patch
diff --git a/patches/wined3d-CSMT_Main/0050-wined3d-Don-t-put-rectangle-pointers-into-wined3d_cs.patch b/patches/wined3d-CSMT_Main/0051-wined3d-Don-t-put-rectangle-pointers-into-wined3d_cs.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0050-wined3d-Don-t-put-rectangle-pointers-into-wined3d_cs.patch
rename to patches/wined3d-CSMT_Main/0051-wined3d-Don-t-put-rectangle-pointers-into-wined3d_cs.patch
diff --git a/patches/wined3d-CSMT_Main/0051-wined3d-Store-the-color-in-clear-ops-instead-of-a-po.patch b/patches/wined3d-CSMT_Main/0052-wined3d-Store-the-color-in-clear-ops-instead-of-a-po.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0051-wined3d-Store-the-color-in-clear-ops-instead-of-a-po.patch
rename to patches/wined3d-CSMT_Main/0052-wined3d-Store-the-color-in-clear-ops-instead-of-a-po.patch
diff --git a/patches/wined3d-CSMT_Main/0052-wined3d-Pass-the-state-to-draw_primitive.patch b/patches/wined3d-CSMT_Main/0053-wined3d-Pass-the-state-to-draw_primitive.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0052-wined3d-Pass-the-state-to-draw_primitive.patch
rename to patches/wined3d-CSMT_Main/0053-wined3d-Pass-the-state-to-draw_primitive.patch
diff --git a/patches/wined3d-CSMT_Main/0053-wined3d-Wait-for-the-cs-before-destroying-objects.patch b/patches/wined3d-CSMT_Main/0054-wined3d-Wait-for-the-cs-before-destroying-objects.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0053-wined3d-Wait-for-the-cs-before-destroying-objects.patch
rename to patches/wined3d-CSMT_Main/0054-wined3d-Wait-for-the-cs-before-destroying-objects.patch
diff --git a/patches/wined3d-CSMT_Main/0054-wined3d-Give-the-cs-its-own-state.patch b/patches/wined3d-CSMT_Main/0055-wined3d-Give-the-cs-its-own-state.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0054-wined3d-Give-the-cs-its-own-state.patch
rename to patches/wined3d-CSMT_Main/0055-wined3d-Give-the-cs-its-own-state.patch
diff --git a/patches/wined3d-CSMT_Main/0055-wined3d-Send-float-constant-updates-through-the-comm.patch b/patches/wined3d-CSMT_Main/0056-wined3d-Send-float-constant-updates-through-the-comm.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0055-wined3d-Send-float-constant-updates-through-the-comm.patch
rename to patches/wined3d-CSMT_Main/0056-wined3d-Send-float-constant-updates-through-the-comm.patch
diff --git a/patches/wined3d-CSMT_Main/0056-wined3d-Request-a-glFinish-before-modifying-resource.patch b/patches/wined3d-CSMT_Main/0057-wined3d-Request-a-glFinish-before-modifying-resource.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0056-wined3d-Request-a-glFinish-before-modifying-resource.patch
rename to patches/wined3d-CSMT_Main/0057-wined3d-Request-a-glFinish-before-modifying-resource.patch
diff --git a/patches/wined3d-CSMT_Main/0057-wined3d-Finish-the-cs-before-changing-the-texture-lo.patch b/patches/wined3d-CSMT_Main/0058-wined3d-Finish-the-cs-before-changing-the-texture-lo.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0057-wined3d-Finish-the-cs-before-changing-the-texture-lo.patch
rename to patches/wined3d-CSMT_Main/0058-wined3d-Finish-the-cs-before-changing-the-texture-lo.patch
diff --git a/patches/wined3d-CSMT_Main/0058-wined3d-Don-t-call-glFinish-after-clears.patch b/patches/wined3d-CSMT_Main/0059-wined3d-Don-t-call-glFinish-after-clears.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0058-wined3d-Don-t-call-glFinish-after-clears.patch
rename to patches/wined3d-CSMT_Main/0059-wined3d-Don-t-call-glFinish-after-clears.patch
diff --git a/patches/wined3d-CSMT_Main/0059-wined3d-Don-t-call-glFinish-after-draws.patch b/patches/wined3d-CSMT_Main/0060-wined3d-Don-t-call-glFinish-after-draws.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0059-wined3d-Don-t-call-glFinish-after-draws.patch
rename to patches/wined3d-CSMT_Main/0060-wined3d-Don-t-call-glFinish-after-draws.patch
diff --git a/patches/wined3d-CSMT_Main/0060-wined3d-Shadow-device-offscreenBuffer-in-the-context.patch b/patches/wined3d-CSMT_Main/0061-wined3d-Shadow-device-offscreenBuffer-in-the-context.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0060-wined3d-Shadow-device-offscreenBuffer-in-the-context.patch
rename to patches/wined3d-CSMT_Main/0061-wined3d-Shadow-device-offscreenBuffer-in-the-context.patch
diff --git a/patches/wined3d-CSMT_Main/0061-wined3d-Don-t-access-the-stateblock-in-find_draw_buf.patch b/patches/wined3d-CSMT_Main/0062-wined3d-Don-t-access-the-stateblock-in-find_draw_buf.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0061-wined3d-Don-t-access-the-stateblock-in-find_draw_buf.patch
rename to patches/wined3d-CSMT_Main/0062-wined3d-Don-t-access-the-stateblock-in-find_draw_buf.patch
diff --git a/patches/wined3d-CSMT_Main/0062-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch b/patches/wined3d-CSMT_Main/0063-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0062-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch
rename to patches/wined3d-CSMT_Main/0063-wined3d-Pass-the-depth-stencil-to-swapchain-present.patch
diff --git a/patches/wined3d-CSMT_Main/0063-wined3d-Don-t-store-viewport-pointers-in-the-command.patch b/patches/wined3d-CSMT_Main/0064-wined3d-Don-t-store-viewport-pointers-in-the-command.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0063-wined3d-Don-t-store-viewport-pointers-in-the-command.patch
rename to patches/wined3d-CSMT_Main/0064-wined3d-Don-t-store-viewport-pointers-in-the-command.patch
diff --git a/patches/wined3d-CSMT_Main/0064-wined3d-Keep-track-of-the-onscreen-depth-stencil-in-.patch b/patches/wined3d-CSMT_Main/0065-wined3d-Keep-track-of-the-onscreen-depth-stencil-in-.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0064-wined3d-Keep-track-of-the-onscreen-depth-stencil-in-.patch
rename to patches/wined3d-CSMT_Main/0065-wined3d-Keep-track-of-the-onscreen-depth-stencil-in-.patch
diff --git a/patches/wined3d-CSMT_Main/0065-wined3d-Send-base-vertex-index-updates-through-the-c.patch b/patches/wined3d-CSMT_Main/0066-wined3d-Send-base-vertex-index-updates-through-the-c.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0065-wined3d-Send-base-vertex-index-updates-through-the-c.patch
rename to patches/wined3d-CSMT_Main/0066-wined3d-Send-base-vertex-index-updates-through-the-c.patch
diff --git a/patches/wined3d-CSMT_Main/0066-wined3d-Send-primitive-type-updates-through-the-comm.patch b/patches/wined3d-CSMT_Main/0067-wined3d-Send-primitive-type-updates-through-the-comm.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0066-wined3d-Send-primitive-type-updates-through-the-comm.patch
rename to patches/wined3d-CSMT_Main/0067-wined3d-Send-primitive-type-updates-through-the-comm.patch
diff --git a/patches/wined3d-CSMT_Main/0067-wined3d-Send-bool-constant-updates-through-the-comma.patch b/patches/wined3d-CSMT_Main/0068-wined3d-Send-bool-constant-updates-through-the-comma.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0067-wined3d-Send-bool-constant-updates-through-the-comma.patch
rename to patches/wined3d-CSMT_Main/0068-wined3d-Send-bool-constant-updates-through-the-comma.patch
diff --git a/patches/wined3d-CSMT_Main/0068-wined3d-Send-int-constant-updates-through-the-comman.patch b/patches/wined3d-CSMT_Main/0069-wined3d-Send-int-constant-updates-through-the-comman.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0068-wined3d-Send-int-constant-updates-through-the-comman.patch
rename to patches/wined3d-CSMT_Main/0069-wined3d-Send-int-constant-updates-through-the-comman.patch
diff --git a/patches/wined3d-CSMT_Main/0069-wined3d-Send-light-updates-through-the-command-strea.patch b/patches/wined3d-CSMT_Main/0070-wined3d-Send-light-updates-through-the-command-strea.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0069-wined3d-Send-light-updates-through-the-command-strea.patch
rename to patches/wined3d-CSMT_Main/0070-wined3d-Send-light-updates-through-the-command-strea.patch
diff --git a/patches/wined3d-CSMT_Main/0070-wined3d-Prevent-the-command-stream-from-running-ahea.patch b/patches/wined3d-CSMT_Main/0071-wined3d-Prevent-the-command-stream-from-running-ahea.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0070-wined3d-Prevent-the-command-stream-from-running-ahea.patch
rename to patches/wined3d-CSMT_Main/0071-wined3d-Prevent-the-command-stream-from-running-ahea.patch
diff --git a/patches/wined3d-CSMT_Main/0071-wined3d-Wait-for-the-cs-to-finish-before-destroying-.patch b/patches/wined3d-CSMT_Main/0072-wined3d-Wait-for-the-cs-to-finish-before-destroying-.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0071-wined3d-Wait-for-the-cs-to-finish-before-destroying-.patch
rename to patches/wined3d-CSMT_Main/0072-wined3d-Wait-for-the-cs-to-finish-before-destroying-.patch
diff --git a/patches/wined3d-CSMT_Main/0072-wined3d-Run-the-cs-asynchronously.patch b/patches/wined3d-CSMT_Main/0073-wined3d-Run-the-cs-asynchronously.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0072-wined3d-Run-the-cs-asynchronously.patch
rename to patches/wined3d-CSMT_Main/0073-wined3d-Run-the-cs-asynchronously.patch
diff --git a/patches/wined3d-CSMT_Main/0073-wined3d-Send-blits-through-the-command-stream.patch b/patches/wined3d-CSMT_Main/0074-wined3d-Send-blits-through-the-command-stream.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0073-wined3d-Send-blits-through-the-command-stream.patch
rename to patches/wined3d-CSMT_Main/0074-wined3d-Send-blits-through-the-command-stream.patch
diff --git a/patches/wined3d-CSMT_Main/0074-wined3d-Put-update_surface-checks-back-in-place.patch b/patches/wined3d-CSMT_Main/0075-wined3d-Put-update_surface-checks-back-in-place.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0074-wined3d-Put-update_surface-checks-back-in-place.patch
rename to patches/wined3d-CSMT_Main/0075-wined3d-Put-update_surface-checks-back-in-place.patch
diff --git a/patches/wined3d-CSMT_Main/0075-wined3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch b/patches/wined3d-CSMT_Main/0076-wined3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0075-wined3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch
rename to patches/wined3d-CSMT_Main/0076-wined3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch
diff --git a/patches/wined3d-CSMT_Main/0076-wined3d-Add-cs-waiting-debug-code.patch b/patches/wined3d-CSMT_Main/0077-wined3d-Add-cs-waiting-debug-code.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0076-wined3d-Add-cs-waiting-debug-code.patch
rename to patches/wined3d-CSMT_Main/0077-wined3d-Add-cs-waiting-debug-code.patch
diff --git a/patches/wined3d-CSMT_Main/0077-wined3d-Don-t-force-strict-draw-ordering-for-multith.patch b/patches/wined3d-CSMT_Main/0078-wined3d-Don-t-force-strict-draw-ordering-for-multith.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0077-wined3d-Don-t-force-strict-draw-ordering-for-multith.patch
rename to patches/wined3d-CSMT_Main/0078-wined3d-Don-t-force-strict-draw-ordering-for-multith.patch
diff --git a/patches/wined3d-CSMT_Main/0078-wined3d-Send-render-target-view-clears-through-the-c.patch b/patches/wined3d-CSMT_Main/0079-wined3d-Send-render-target-view-clears-through-the-c.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0078-wined3d-Send-render-target-view-clears-through-the-c.patch
rename to patches/wined3d-CSMT_Main/0079-wined3d-Send-render-target-view-clears-through-the-c.patch
diff --git a/patches/wined3d-CSMT_Main/0079-wined3d-Wait-for-the-CS-in-GetDC.patch b/patches/wined3d-CSMT_Main/0080-wined3d-Wait-for-the-CS-in-GetDC.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0079-wined3d-Wait-for-the-CS-in-GetDC.patch
rename to patches/wined3d-CSMT_Main/0080-wined3d-Wait-for-the-CS-in-GetDC.patch
diff --git a/patches/wined3d-CSMT_Main/0080-wined3d-send-resource-maps-through-the-command-strea.patch b/patches/wined3d-CSMT_Main/0081-wined3d-send-resource-maps-through-the-command-strea.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0080-wined3d-send-resource-maps-through-the-command-strea.patch
rename to patches/wined3d-CSMT_Main/0081-wined3d-send-resource-maps-through-the-command-strea.patch
diff --git a/patches/wined3d-CSMT_Main/0081-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch b/patches/wined3d-CSMT_Main/0082-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0081-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch
rename to patches/wined3d-CSMT_Main/0082-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch
diff --git a/patches/wined3d-CSMT_Main/0082-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch b/patches/wined3d-CSMT_Main/0083-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0082-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch
rename to patches/wined3d-CSMT_Main/0083-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch
diff --git a/patches/wined3d-CSMT_Main/0083-wined3d-Don-t-preload-buffers-on-unmap.patch b/patches/wined3d-CSMT_Main/0084-wined3d-Don-t-preload-buffers-on-unmap.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0083-wined3d-Don-t-preload-buffers-on-unmap.patch
rename to patches/wined3d-CSMT_Main/0084-wined3d-Don-t-preload-buffers-on-unmap.patch
diff --git a/patches/wined3d-CSMT_Main/0084-wined3d-Don-t-call-glFinish-before-swapping.patch b/patches/wined3d-CSMT_Main/0085-wined3d-Don-t-call-glFinish-before-swapping.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0084-wined3d-Don-t-call-glFinish-before-swapping.patch
rename to patches/wined3d-CSMT_Main/0085-wined3d-Don-t-call-glFinish-before-swapping.patch
diff --git a/patches/wined3d-CSMT_Main/0085-wined3d-wined3d_-_query_issue-never-fails.patch b/patches/wined3d-CSMT_Main/0086-wined3d-wined3d_-_query_issue-never-fails.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0085-wined3d-wined3d_-_query_issue-never-fails.patch
rename to patches/wined3d-CSMT_Main/0086-wined3d-wined3d_-_query_issue-never-fails.patch
diff --git a/patches/wined3d-CSMT_Main/0086-wined3d-Add-query-support-to-the-command-stream.patch b/patches/wined3d-CSMT_Main/0087-wined3d-Add-query-support-to-the-command-stream.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0086-wined3d-Add-query-support-to-the-command-stream.patch
rename to patches/wined3d-CSMT_Main/0087-wined3d-Add-query-support-to-the-command-stream.patch
diff --git a/patches/wined3d-CSMT_Main/0087-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch b/patches/wined3d-CSMT_Main/0088-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0087-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch
rename to patches/wined3d-CSMT_Main/0088-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch
diff --git a/patches/wined3d-CSMT_Main/0088-wined3d-Poll-queries-automatically-in-the-CS.patch b/patches/wined3d-CSMT_Main/0089-wined3d-Poll-queries-automatically-in-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0088-wined3d-Poll-queries-automatically-in-the-CS.patch
rename to patches/wined3d-CSMT_Main/0089-wined3d-Poll-queries-automatically-in-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0089-wined3d-Introduce-a-separate-queue-for-priority-comm.patch b/patches/wined3d-CSMT_Main/0090-wined3d-Introduce-a-separate-queue-for-priority-comm.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0089-wined3d-Introduce-a-separate-queue-for-priority-comm.patch
rename to patches/wined3d-CSMT_Main/0090-wined3d-Introduce-a-separate-queue-for-priority-comm.patch
diff --git a/patches/wined3d-CSMT_Main/0090-wined3d-Destroy-queries-through-the-CS.patch b/patches/wined3d-CSMT_Main/0091-wined3d-Destroy-queries-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0090-wined3d-Destroy-queries-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0091-wined3d-Destroy-queries-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0091-wined3d-Separate-main-and-worker-thread-query-state.patch b/patches/wined3d-CSMT_Main/0092-wined3d-Separate-main-and-worker-thread-query-state.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0091-wined3d-Separate-main-and-worker-thread-query-state.patch
rename to patches/wined3d-CSMT_Main/0092-wined3d-Separate-main-and-worker-thread-query-state.patch
diff --git a/patches/wined3d-CSMT_Main/0092-wined3d-Don-t-poll-queries-that-failed-to-start.patch b/patches/wined3d-CSMT_Main/0093-wined3d-Don-t-poll-queries-that-failed-to-start.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0092-wined3d-Don-t-poll-queries-that-failed-to-start.patch
rename to patches/wined3d-CSMT_Main/0093-wined3d-Don-t-poll-queries-that-failed-to-start.patch
diff --git a/patches/wined3d-CSMT_Main/0093-wined3d-Remove-restated-queries-from-the-poll-list.patch b/patches/wined3d-CSMT_Main/0094-wined3d-Remove-restated-queries-from-the-poll-list.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0093-wined3d-Remove-restated-queries-from-the-poll-list.patch
rename to patches/wined3d-CSMT_Main/0094-wined3d-Remove-restated-queries-from-the-poll-list.patch
diff --git a/patches/wined3d-CSMT_Main/0094-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch b/patches/wined3d-CSMT_Main/0095-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0094-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch
rename to patches/wined3d-CSMT_Main/0095-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch
diff --git a/patches/wined3d-CSMT_Main/0095-wined3d-Put-this-into-the-query-poll-patch.patch b/patches/wined3d-CSMT_Main/0096-wined3d-Put-this-into-the-query-poll-patch.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0095-wined3d-Put-this-into-the-query-poll-patch.patch
rename to patches/wined3d-CSMT_Main/0096-wined3d-Put-this-into-the-query-poll-patch.patch
diff --git a/patches/wined3d-CSMT_Main/0096-wined3d-Send-update_surface-commands-through-the-CS.patch b/patches/wined3d-CSMT_Main/0097-wined3d-Send-update_surface-commands-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0096-wined3d-Send-update_surface-commands-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0097-wined3d-Send-update_surface-commands-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0097-wined3d-Send-texture-preloads-through-the-CS.patch b/patches/wined3d-CSMT_Main/0098-wined3d-Send-texture-preloads-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0097-wined3d-Send-texture-preloads-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0098-wined3d-Send-texture-preloads-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0098-wined3d-Send-surface-preloads-through-the-CS.patch b/patches/wined3d-CSMT_Main/0099-wined3d-Send-surface-preloads-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0098-wined3d-Send-surface-preloads-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0099-wined3d-Send-surface-preloads-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0099-wined3d-Send-update_texture-calls-through-the-CS.patch b/patches/wined3d-CSMT_Main/0100-wined3d-Send-update_texture-calls-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0099-wined3d-Send-update_texture-calls-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0100-wined3d-Send-update_texture-calls-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0100-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch b/patches/wined3d-CSMT_Main/0101-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0100-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch
rename to patches/wined3d-CSMT_Main/0101-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch
diff --git a/patches/wined3d-CSMT_Main/0101-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch b/patches/wined3d-CSMT_Main/0102-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0101-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch
rename to patches/wined3d-CSMT_Main/0102-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch
diff --git a/patches/wined3d-CSMT_Main/0102-wined3d-Handle-evit_managed_resources-through-the-CS.patch b/patches/wined3d-CSMT_Main/0103-wined3d-Handle-evit_managed_resources-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0102-wined3d-Handle-evit_managed_resources-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0103-wined3d-Handle-evit_managed_resources-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0103-wined3d-Send-flips-through-the-command-stream.patch b/patches/wined3d-CSMT_Main/0104-wined3d-Send-flips-through-the-command-stream.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0103-wined3d-Send-flips-through-the-command-stream.patch
rename to patches/wined3d-CSMT_Main/0104-wined3d-Send-flips-through-the-command-stream.patch
diff --git a/patches/wined3d-CSMT_Main/0104-wined3d-Introduce-resource-fencing.patch b/patches/wined3d-CSMT_Main/0105-wined3d-Introduce-resource-fencing.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0104-wined3d-Introduce-resource-fencing.patch
rename to patches/wined3d-CSMT_Main/0105-wined3d-Introduce-resource-fencing.patch
diff --git a/patches/wined3d-CSMT_Main/0105-wined3d-Fence-update_texture-and-update_surface-call.patch b/patches/wined3d-CSMT_Main/0106-wined3d-Fence-update_texture-and-update_surface-call.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0105-wined3d-Fence-update_texture-and-update_surface-call.patch
rename to patches/wined3d-CSMT_Main/0106-wined3d-Fence-update_texture-and-update_surface-call.patch
diff --git a/patches/wined3d-CSMT_Main/0106-wined3d-Dirtify-resources-on-unmap.patch b/patches/wined3d-CSMT_Main/0107-wined3d-Dirtify-resources-on-unmap.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0106-wined3d-Dirtify-resources-on-unmap.patch
rename to patches/wined3d-CSMT_Main/0107-wined3d-Dirtify-resources-on-unmap.patch
diff --git a/patches/wined3d-CSMT_Main/0107-wined3d-Fence-texture-reads-in-draws.patch b/patches/wined3d-CSMT_Main/0108-wined3d-Fence-texture-reads-in-draws.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0107-wined3d-Fence-texture-reads-in-draws.patch
rename to patches/wined3d-CSMT_Main/0108-wined3d-Fence-texture-reads-in-draws.patch
diff --git a/patches/wined3d-CSMT_Main/0108-wined3d-Fence-render-targets-and-depth-stencils.patch b/patches/wined3d-CSMT_Main/0109-wined3d-Fence-render-targets-and-depth-stencils.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0108-wined3d-Fence-render-targets-and-depth-stencils.patch
rename to patches/wined3d-CSMT_Main/0109-wined3d-Fence-render-targets-and-depth-stencils.patch
diff --git a/patches/wined3d-CSMT_Main/0109-wined3d-Fence-blit-operations.patch b/patches/wined3d-CSMT_Main/0110-wined3d-Fence-blit-operations.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0109-wined3d-Fence-blit-operations.patch
rename to patches/wined3d-CSMT_Main/0110-wined3d-Fence-blit-operations.patch
diff --git a/patches/wined3d-CSMT_Main/0110-wined3d-Fence-color_fill-operations.patch b/patches/wined3d-CSMT_Main/0111-wined3d-Fence-color_fill-operations.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0110-wined3d-Fence-color_fill-operations.patch
rename to patches/wined3d-CSMT_Main/0111-wined3d-Fence-color_fill-operations.patch
diff --git a/patches/wined3d-CSMT_Main/0111-wined3d-Fence-clear-calls.patch b/patches/wined3d-CSMT_Main/0112-wined3d-Fence-clear-calls.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0111-wined3d-Fence-clear-calls.patch
rename to patches/wined3d-CSMT_Main/0112-wined3d-Fence-clear-calls.patch
diff --git a/patches/wined3d-CSMT_Main/0112-wined3d-Fence-present-calls.patch b/patches/wined3d-CSMT_Main/0113-wined3d-Fence-present-calls.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0112-wined3d-Fence-present-calls.patch
rename to patches/wined3d-CSMT_Main/0113-wined3d-Fence-present-calls.patch
diff --git a/patches/wined3d-CSMT_Main/0113-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch b/patches/wined3d-CSMT_Main/0114-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0113-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch
rename to patches/wined3d-CSMT_Main/0114-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch
diff --git a/patches/wined3d-CSMT_Main/0114-wined3d-Dirtify-changed-textures-through-the-command.patch b/patches/wined3d-CSMT_Main/0115-wined3d-Dirtify-changed-textures-through-the-command.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0114-wined3d-Dirtify-changed-textures-through-the-command.patch
rename to patches/wined3d-CSMT_Main/0115-wined3d-Dirtify-changed-textures-through-the-command.patch
diff --git a/patches/wined3d-CSMT_Main/0115-wined3d-Wrap-GL-BOs-in-a-structure.patch b/patches/wined3d-CSMT_Main/0116-wined3d-Wrap-GL-BOs-in-a-structure.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0115-wined3d-Wrap-GL-BOs-in-a-structure.patch
rename to patches/wined3d-CSMT_Main/0116-wined3d-Wrap-GL-BOs-in-a-structure.patch
diff --git a/patches/wined3d-CSMT_Main/0116-wined3d-Separate-resource-map-and-draw-buffers.patch b/patches/wined3d-CSMT_Main/0117-wined3d-Separate-resource-map-and-draw-buffers.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0116-wined3d-Separate-resource-map-and-draw-buffers.patch
rename to patches/wined3d-CSMT_Main/0117-wined3d-Separate-resource-map-and-draw-buffers.patch
diff --git a/patches/wined3d-CSMT_Main/0117-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch b/patches/wined3d-CSMT_Main/0118-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0117-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch
rename to patches/wined3d-CSMT_Main/0118-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch
diff --git a/patches/wined3d-CSMT_Main/0118-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch b/patches/wined3d-CSMT_Main/0119-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0118-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch
rename to patches/wined3d-CSMT_Main/0119-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch
diff --git a/patches/wined3d-CSMT_Main/0119-wined3d-Unset-some-objects-in-state_init_default.patch b/patches/wined3d-CSMT_Main/0120-wined3d-Unset-some-objects-in-state_init_default.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0119-wined3d-Unset-some-objects-in-state_init_default.patch
rename to patches/wined3d-CSMT_Main/0120-wined3d-Unset-some-objects-in-state_init_default.patch
diff --git a/patches/wined3d-CSMT_Main/0120-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch b/patches/wined3d-CSMT_Main/0121-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0120-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch
rename to patches/wined3d-CSMT_Main/0121-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch
diff --git a/patches/wined3d-CSMT_Main/0121-wined3d-Use-double-buffered-buffers-for-multithreade.patch b/patches/wined3d-CSMT_Main/0122-wined3d-Use-double-buffered-buffers-for-multithreade.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0121-wined3d-Use-double-buffered-buffers-for-multithreade.patch
rename to patches/wined3d-CSMT_Main/0122-wined3d-Use-double-buffered-buffers-for-multithreade.patch
diff --git a/patches/wined3d-CSMT_Main/0122-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch b/patches/wined3d-CSMT_Main/0123-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0122-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch
rename to patches/wined3d-CSMT_Main/0123-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch
diff --git a/patches/wined3d-CSMT_Main/0123-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch b/patches/wined3d-CSMT_Main/0124-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0123-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch
rename to patches/wined3d-CSMT_Main/0124-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch
diff --git a/patches/wined3d-CSMT_Main/0124-wined3d-Accelerate-DISCARD-buffer-maps.patch b/patches/wined3d-CSMT_Main/0125-wined3d-Accelerate-DISCARD-buffer-maps.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0124-wined3d-Accelerate-DISCARD-buffer-maps.patch
rename to patches/wined3d-CSMT_Main/0125-wined3d-Accelerate-DISCARD-buffer-maps.patch
diff --git a/patches/wined3d-CSMT_Main/0125-wined3d-Accelerate-READONLY-buffer-maps.patch b/patches/wined3d-CSMT_Main/0126-wined3d-Accelerate-READONLY-buffer-maps.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0125-wined3d-Accelerate-READONLY-buffer-maps.patch
rename to patches/wined3d-CSMT_Main/0126-wined3d-Accelerate-READONLY-buffer-maps.patch
diff --git a/patches/wined3d-CSMT_Main/0126-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch b/patches/wined3d-CSMT_Main/0127-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0126-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0127-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0127-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch b/patches/wined3d-CSMT_Main/0128-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0127-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch
rename to patches/wined3d-CSMT_Main/0128-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0128-wined3d-Send-buffer-preloads-through-the-CS.patch b/patches/wined3d-CSMT_Main/0129-wined3d-Send-buffer-preloads-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0128-wined3d-Send-buffer-preloads-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0129-wined3d-Send-buffer-preloads-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0129-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch b/patches/wined3d-CSMT_Main/0130-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0129-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch
rename to patches/wined3d-CSMT_Main/0130-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch
diff --git a/patches/wined3d-CSMT_Main/0130-wined3d-Separate-GL-buffer-discard-control-from-igno.patch b/patches/wined3d-CSMT_Main/0131-wined3d-Separate-GL-buffer-discard-control-from-igno.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0130-wined3d-Separate-GL-buffer-discard-control-from-igno.patch
rename to patches/wined3d-CSMT_Main/0131-wined3d-Separate-GL-buffer-discard-control-from-igno.patch
diff --git a/patches/wined3d-CSMT_Main/0131-wined3d-Create-buffers-before-mapping-them.patch b/patches/wined3d-CSMT_Main/0132-wined3d-Create-buffers-before-mapping-them.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0131-wined3d-Create-buffers-before-mapping-them.patch
rename to patches/wined3d-CSMT_Main/0132-wined3d-Create-buffers-before-mapping-them.patch
diff --git a/patches/wined3d-CSMT_Main/0132-wined3d-Destroy-views-through-the-CS.patch b/patches/wined3d-CSMT_Main/0133-wined3d-Destroy-views-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0132-wined3d-Destroy-views-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0133-wined3d-Destroy-views-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0133-wined3d-Remove-another-glFinish.patch b/patches/wined3d-CSMT_Main/0134-wined3d-Remove-another-glFinish.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0133-wined3d-Remove-another-glFinish.patch
rename to patches/wined3d-CSMT_Main/0134-wined3d-Remove-another-glFinish.patch
diff --git a/patches/wined3d-CSMT_Main/0134-wined3d-Destroy-vertex-declarations-through-the-CS.patch b/patches/wined3d-CSMT_Main/0135-wined3d-Destroy-vertex-declarations-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0134-wined3d-Destroy-vertex-declarations-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0135-wined3d-Destroy-vertex-declarations-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0135-wined3d-Destroy-shaders-through-the-CS.patch b/patches/wined3d-CSMT_Main/0136-wined3d-Destroy-shaders-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0135-wined3d-Destroy-shaders-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0136-wined3d-Destroy-shaders-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0136-wined3d-Create-VBOs-through-the-command-stream.patch b/patches/wined3d-CSMT_Main/0137-wined3d-Create-VBOs-through-the-command-stream.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0136-wined3d-Create-VBOs-through-the-command-stream.patch
rename to patches/wined3d-CSMT_Main/0137-wined3d-Create-VBOs-through-the-command-stream.patch
diff --git a/patches/wined3d-CSMT_Main/0137-wined3d-Clean-up-resource-data-through-the-CS.patch b/patches/wined3d-CSMT_Main/0138-wined3d-Clean-up-resource-data-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0137-wined3d-Clean-up-resource-data-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0138-wined3d-Clean-up-resource-data-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0138-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch b/patches/wined3d-CSMT_Main/0139-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0138-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0139-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0139-wined3d-Clean-up-volume-resource-data-through-the-CS.patch b/patches/wined3d-CSMT_Main/0140-wined3d-Clean-up-volume-resource-data-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0139-wined3d-Clean-up-volume-resource-data-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0140-wined3d-Clean-up-volume-resource-data-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0140-wined3d-Clean-up-surfaces-through-the-cs.patch b/patches/wined3d-CSMT_Main/0141-wined3d-Clean-up-surfaces-through-the-cs.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0140-wined3d-Clean-up-surfaces-through-the-cs.patch
rename to patches/wined3d-CSMT_Main/0141-wined3d-Clean-up-surfaces-through-the-cs.patch
diff --git a/patches/wined3d-CSMT_Main/0141-wined3d-Clean-up-texture-resources-through-the-cs.patch b/patches/wined3d-CSMT_Main/0142-wined3d-Clean-up-texture-resources-through-the-cs.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0141-wined3d-Clean-up-texture-resources-through-the-cs.patch
rename to patches/wined3d-CSMT_Main/0142-wined3d-Clean-up-texture-resources-through-the-cs.patch
diff --git a/patches/wined3d-CSMT_Main/0142-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch b/patches/wined3d-CSMT_Main/0143-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0142-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch
rename to patches/wined3d-CSMT_Main/0143-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch
diff --git a/patches/wined3d-CSMT_Main/0143-wined3d-Unload-resources-through-the-CS-in-device_re.patch b/patches/wined3d-CSMT_Main/0144-wined3d-Unload-resources-through-the-CS-in-device_re.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0143-wined3d-Unload-resources-through-the-CS-in-device_re.patch
rename to patches/wined3d-CSMT_Main/0144-wined3d-Unload-resources-through-the-CS-in-device_re.patch
diff --git a/patches/wined3d-CSMT_Main/0144-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch b/patches/wined3d-CSMT_Main/0145-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0144-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch
rename to patches/wined3d-CSMT_Main/0145-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch
diff --git a/patches/wined3d-CSMT_Main/0145-wined3d-Remove-software-cursor-support.patch b/patches/wined3d-CSMT_Main/0146-wined3d-Remove-software-cursor-support.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0145-wined3d-Remove-software-cursor-support.patch
rename to patches/wined3d-CSMT_Main/0146-wined3d-Remove-software-cursor-support.patch
diff --git a/patches/wined3d-CSMT_Main/0146-wined3d-Create-dummy-textures-through-the-CS.patch b/patches/wined3d-CSMT_Main/0147-wined3d-Create-dummy-textures-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0146-wined3d-Create-dummy-textures-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0147-wined3d-Create-dummy-textures-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0147-wined3d-Create-the-initial-context-through-the-CS.patch b/patches/wined3d-CSMT_Main/0148-wined3d-Create-the-initial-context-through-the-CS.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0147-wined3d-Create-the-initial-context-through-the-CS.patch
rename to patches/wined3d-CSMT_Main/0148-wined3d-Create-the-initial-context-through-the-CS.patch
diff --git a/patches/wined3d-CSMT_Main/0148-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch b/patches/wined3d-CSMT_Main/0149-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0148-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch
rename to patches/wined3d-CSMT_Main/0149-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch
diff --git a/patches/wined3d-CSMT_Main/0149-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch b/patches/wined3d-CSMT_Main/0150-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0149-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch
rename to patches/wined3d-CSMT_Main/0150-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch
diff --git a/patches/wined3d-CSMT_Main/0150-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch b/patches/wined3d-CSMT_Main/0151-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0150-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch
rename to patches/wined3d-CSMT_Main/0151-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch
diff --git a/patches/wined3d-CSMT_Main/0151-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch b/patches/wined3d-CSMT_Main/0152-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0151-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch
rename to patches/wined3d-CSMT_Main/0152-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch
diff --git a/patches/wined3d-CSMT_Main/0152-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch b/patches/wined3d-CSMT_Main/0153-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0152-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch
rename to patches/wined3d-CSMT_Main/0153-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch
diff --git a/patches/wined3d-CSMT_Main/0153-wined3d-Use-an-event-to-block-the-worker-thread-when.patch b/patches/wined3d-CSMT_Main/0154-wined3d-Use-an-event-to-block-the-worker-thread-when.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0153-wined3d-Use-an-event-to-block-the-worker-thread-when.patch
rename to patches/wined3d-CSMT_Main/0154-wined3d-Use-an-event-to-block-the-worker-thread-when.patch
diff --git a/patches/wined3d-CSMT_Main/0154-wined3d-Fence-preload-operations.patch b/patches/wined3d-CSMT_Main/0155-wined3d-Fence-preload-operations.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0154-wined3d-Fence-preload-operations.patch
rename to patches/wined3d-CSMT_Main/0155-wined3d-Fence-preload-operations.patch
diff --git a/patches/wined3d-CSMT_Main/0155-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch b/patches/wined3d-CSMT_Main/0156-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0155-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
rename to patches/wined3d-CSMT_Main/0156-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
diff --git a/patches/wined3d-CSMT_Main/0156-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch b/patches/wined3d-CSMT_Main/0157-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0156-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
rename to patches/wined3d-CSMT_Main/0157-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
diff --git a/patches/wined3d-CSMT_Main/0157-wined3d-Completely-reset-the-state-on-reset.patch b/patches/wined3d-CSMT_Main/0158-wined3d-Completely-reset-the-state-on-reset.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0157-wined3d-Completely-reset-the-state-on-reset.patch
rename to patches/wined3d-CSMT_Main/0158-wined3d-Completely-reset-the-state-on-reset.patch
diff --git a/patches/wined3d-CSMT_Main/0158-wined3d-Send-getdc-and-releasedc-through-the-command.patch b/patches/wined3d-CSMT_Main/0159-wined3d-Send-getdc-and-releasedc-through-the-command.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0158-wined3d-Send-getdc-and-releasedc-through-the-command.patch
rename to patches/wined3d-CSMT_Main/0159-wined3d-Send-getdc-and-releasedc-through-the-command.patch
diff --git a/patches/wined3d-CSMT_Main/0159-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch b/patches/wined3d-CSMT_Main/0160-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0159-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch
rename to patches/wined3d-CSMT_Main/0160-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch
diff --git a/patches/wined3d-CSMT_Main/0160-wined3d-Wait-only-for-the-buffer-to-be-idle.patch b/patches/wined3d-CSMT_Main/0161-wined3d-Wait-only-for-the-buffer-to-be-idle.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0160-wined3d-Wait-only-for-the-buffer-to-be-idle.patch
rename to patches/wined3d-CSMT_Main/0161-wined3d-Wait-only-for-the-buffer-to-be-idle.patch
diff --git a/patches/wined3d-CSMT_Main/0161-wined3d-Add-a-comment-about-worker-thread-lag.patch b/patches/wined3d-CSMT_Main/0162-wined3d-Add-a-comment-about-worker-thread-lag.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0161-wined3d-Add-a-comment-about-worker-thread-lag.patch
rename to patches/wined3d-CSMT_Main/0162-wined3d-Add-a-comment-about-worker-thread-lag.patch
diff --git a/patches/wined3d-CSMT_Main/0162-wined3d-Remove-the-texture-destroy-glFinish.patch b/patches/wined3d-CSMT_Main/0163-wined3d-Remove-the-texture-destroy-glFinish.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0162-wined3d-Remove-the-texture-destroy-glFinish.patch
rename to patches/wined3d-CSMT_Main/0163-wined3d-Remove-the-texture-destroy-glFinish.patch
diff --git a/patches/wined3d-CSMT_Main/0163-wined3d-Move-FBO-destruction-into-the-worker-thread.patch b/patches/wined3d-CSMT_Main/0164-wined3d-Move-FBO-destruction-into-the-worker-thread.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0163-wined3d-Move-FBO-destruction-into-the-worker-thread.patch
rename to patches/wined3d-CSMT_Main/0164-wined3d-Move-FBO-destruction-into-the-worker-thread.patch
diff --git a/patches/wined3d-CSMT_Main/0164-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch b/patches/wined3d-CSMT_Main/0165-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0164-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch
rename to patches/wined3d-CSMT_Main/0165-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch
diff --git a/patches/wined3d-CSMT_Main/0165-Winex11-complain-about-glfinish.patch b/patches/wined3d-CSMT_Main/0166-Winex11-complain-about-glfinish.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0165-Winex11-complain-about-glfinish.patch
rename to patches/wined3d-CSMT_Main/0166-Winex11-complain-about-glfinish.patch
diff --git a/patches/wined3d-CSMT_Main/0166-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch b/patches/wined3d-CSMT_Main/0167-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0166-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch
rename to patches/wined3d-CSMT_Main/0167-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch
diff --git a/patches/wined3d-CSMT_Main/0167-wined3d-Remove-the-device_reset-CS-sync-fixme.patch b/patches/wined3d-CSMT_Main/0168-wined3d-Remove-the-device_reset-CS-sync-fixme.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0167-wined3d-Remove-the-device_reset-CS-sync-fixme.patch
rename to patches/wined3d-CSMT_Main/0168-wined3d-Remove-the-device_reset-CS-sync-fixme.patch
diff --git a/patches/wined3d-CSMT_Main/0168-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch b/patches/wined3d-CSMT_Main/0169-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0168-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch
rename to patches/wined3d-CSMT_Main/0169-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch
diff --git a/patches/wined3d-CSMT_Main/0169-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch b/patches/wined3d-CSMT_Main/0170-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0169-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch
rename to patches/wined3d-CSMT_Main/0170-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch
diff --git a/patches/wined3d-CSMT_Main/0170-wined3d-Don-t-sync-on-redundant-discard-calls.patch b/patches/wined3d-CSMT_Main/0171-wined3d-Don-t-sync-on-redundant-discard-calls.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0170-wined3d-Don-t-sync-on-redundant-discard-calls.patch
rename to patches/wined3d-CSMT_Main/0171-wined3d-Don-t-sync-on-redundant-discard-calls.patch
diff --git a/patches/wined3d-CSMT_Main/0171-wined3d-Don-t-discard-new-buffers.patch b/patches/wined3d-CSMT_Main/0172-wined3d-Don-t-discard-new-buffers.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0171-wined3d-Don-t-discard-new-buffers.patch
rename to patches/wined3d-CSMT_Main/0172-wined3d-Don-t-discard-new-buffers.patch
diff --git a/patches/wined3d-CSMT_Main/0172-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch b/patches/wined3d-CSMT_Main/0173-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0172-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch
rename to patches/wined3d-CSMT_Main/0173-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch
diff --git a/patches/wined3d-CSMT_Main/0173-wined3d-Render-target-lock-hack.patch b/patches/wined3d-CSMT_Main/0174-wined3d-Render-target-lock-hack.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0173-wined3d-Render-target-lock-hack.patch
rename to patches/wined3d-CSMT_Main/0174-wined3d-Render-target-lock-hack.patch
diff --git a/patches/wined3d-CSMT_Main/0174-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch b/patches/wined3d-CSMT_Main/0175-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0174-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch
rename to patches/wined3d-CSMT_Main/0175-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch
diff --git a/patches/wined3d-CSMT_Main/0175-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch b/patches/wined3d-CSMT_Main/0176-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch
similarity index 100%
rename from patches/wined3d-CSMT_Main/0175-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch
rename to patches/wined3d-CSMT_Main/0176-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch
diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
index 99794034..bf31c39c 100644
--- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch
+++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
@@ -1131,16 +1131,24 @@ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
  
      if (desc->pool == WINED3D_POOL_DEFAULT && desc->usage & WINED3DUSAGE_DYNAMIC
              && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]
-@@ -523,7 +980,9 @@
+@@ -523,11 +980,17 @@
      {
          wined3d_resource_free_sysmem(&volume->resource);
          volume->resource.map_binding = WINED3D_LOCATION_BUFFER;
 +#if defined(STAGING_CSMT)
          volume->resource.map_heap_memory = NULL;
-+#endif /* STAGING_CSMT */
      }
  
      volume->container = container;
+     volume->resource.format_flags = container->resource.format_flags;
++#else  /* STAGING_CSMT */
++    }
++
++    volume->container = container;
++#endif /* STAGING_CSMT */
+ 
+     return WINED3D_OK;
+ }
 diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
 --- a/dlls/wined3d/utils.c
 +++ b/dlls/wined3d/utils.c
@@ -9267,11 +9275,13 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
  
  static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_texture *container,
          const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags)
-@@ -5395,7 +7087,11 @@
+@@ -5395,9 +7087,13 @@
      }
  
      surface->container = container;
 +#if defined(STAGING_CSMT)
+     surface->resource.format_flags = container->resource.format_flags;
+ 
      wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_SYSMEM);
 +#else  /* STAGING_CSMT */
 +    surface_validate_location(surface, WINED3D_LOCATION_SYSMEM);
@@ -9279,7 +9289,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
      list_init(&surface->renderbuffers);
      list_init(&surface->overlays);
  
-@@ -5427,9 +7123,14 @@
+@@ -5429,9 +7125,14 @@
      if (surface->resource.map_binding == WINED3D_LOCATION_DIB)
      {
          wined3d_resource_free_sysmem(&surface->resource);
@@ -9294,7 +9304,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
      }
  
      return hr;
-@@ -5456,7 +7157,11 @@
+@@ -5458,7 +7159,11 @@
      if (FAILED(hr = surface_init(object, container, desc, target, level, layer, flags)))
      {
          WARN("Failed to initialize surface, returning %#x.\n", hr);