wined3d-CSMT_Main: Update patchset for CSMT (commandstream multithreading), to keep in sync with upstream repository.

patches/patchinstall.sh

@@ -5565,189 +5565,187 @@ fi
 # | 	dlls/winex11.drv/opengl.c
 # |
 if test "$enable_wined3d_CSMT_Main" -eq 1; then
-	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/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/0043-wined3d-Don-t-call-the-public-map-function-in-surfac.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-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-Only-discard-buffers-that-are-in-use.patch
-	patch_apply wined3d-CSMT_Main/0176-wined3d-Destroy-samplers-through-the-command-stream.patch
-	patch_apply wined3d-CSMT_Main/0177-wined3d-Hack-to-reject-unsupported-color-fills.patch
-	patch_apply wined3d-CSMT_Main/0178-wined3d-Alloc-the-buffer-map-array-before-mapping-th.patch
-	patch_apply wined3d-CSMT_Main/0179-wined3d-Avoid-unnecessary-call-to-wined3d_resource_g.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-Don-t-force-strict-draw-ordering-for-multith.patch
+	patch_apply wined3d-CSMT_Main/0077-wined3d-Send-render-target-view-clears-through-the-c.patch
+	patch_apply wined3d-CSMT_Main/0078-wined3d-Wait-for-the-CS-in-GetDC.patch
+	patch_apply wined3d-CSMT_Main/0079-wined3d-send-resource-maps-through-the-command-strea.patch
+	patch_apply wined3d-CSMT_Main/0080-wined3d-Get-rid-of-the-end_scene-flush-and-finish.patch
+	patch_apply wined3d-CSMT_Main/0081-wined3d-Replace-the-linked-lists-with-a-ringbuffer.patch
+	patch_apply wined3d-CSMT_Main/0082-wined3d-Don-t-preload-buffers-on-unmap.patch
+	patch_apply wined3d-CSMT_Main/0083-wined3d-Don-t-call-glFinish-before-swapping.patch
+	patch_apply wined3d-CSMT_Main/0084-wined3d-wined3d_-_query_issue-never-fails.patch
+	patch_apply wined3d-CSMT_Main/0085-wined3d-Add-query-support-to-the-command-stream.patch
+	patch_apply wined3d-CSMT_Main/0086-wined3d-Check-our-CS-state-to-find-out-if-a-query-is.patch
+	patch_apply wined3d-CSMT_Main/0087-wined3d-Poll-queries-automatically-in-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0088-wined3d-Introduce-a-separate-queue-for-priority-comm.patch
+	patch_apply wined3d-CSMT_Main/0089-wined3d-Destroy-queries-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0090-wined3d-Separate-main-and-worker-thread-query-state.patch
+	patch_apply wined3d-CSMT_Main/0091-wined3d-Don-t-poll-queries-that-failed-to-start.patch
+	patch_apply wined3d-CSMT_Main/0092-wined3d-Remove-restated-queries-from-the-poll-list.patch
+	patch_apply wined3d-CSMT_Main/0093-wined3d-Don-t-reset-the-query-state-if-it-doesn-t-ha.patch
+	patch_apply wined3d-CSMT_Main/0094-wined3d-Put-this-into-the-query-poll-patch.patch
+	patch_apply wined3d-CSMT_Main/0095-wined3d-Send-update_surface-commands-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0096-wined3d-Send-texture-preloads-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0097-wined3d-Send-surface-preloads-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0098-wined3d-Send-update_texture-calls-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0099-wined3d-Get-rid-of-the-surface_upload_data-glFinish.patch
+	patch_apply wined3d-CSMT_Main/0100-wined3d-Don-t-lock-the-src-volume-in-device_update_v.patch
+	patch_apply wined3d-CSMT_Main/0101-wined3d-Handle-evit_managed_resources-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0102-wined3d-Send-flips-through-the-command-stream.patch
+	patch_apply wined3d-CSMT_Main/0103-wined3d-Introduce-resource-fencing.patch
+	patch_apply wined3d-CSMT_Main/0104-wined3d-Fence-update_texture-and-update_surface-call.patch
+	patch_apply wined3d-CSMT_Main/0105-wined3d-Dirtify-resources-on-unmap.patch
+	patch_apply wined3d-CSMT_Main/0106-wined3d-Fence-texture-reads-in-draws.patch
+	patch_apply wined3d-CSMT_Main/0107-wined3d-Fence-render-targets-and-depth-stencils.patch
+	patch_apply wined3d-CSMT_Main/0108-wined3d-Fence-blit-operations.patch
+	patch_apply wined3d-CSMT_Main/0109-wined3d-Fence-color_fill-operations.patch
+	patch_apply wined3d-CSMT_Main/0110-wined3d-Fence-clear-calls.patch
+	patch_apply wined3d-CSMT_Main/0111-wined3d-Fence-present-calls.patch
+	patch_apply wined3d-CSMT_Main/0112-wined3d-Make-resource-maps-and-unmaps-a-priority-com.patch
+	patch_apply wined3d-CSMT_Main/0113-wined3d-Dirtify-changed-textures-through-the-command.patch
+	patch_apply wined3d-CSMT_Main/0114-wined3d-Wrap-GL-BOs-in-a-structure.patch
+	patch_apply wined3d-CSMT_Main/0115-wined3d-Separate-resource-map-and-draw-buffers.patch
+	patch_apply wined3d-CSMT_Main/0116-wined3d-Implement-DISCARD-resource-maps-with-buffers.patch
+	patch_apply wined3d-CSMT_Main/0117-wined3d-Implement-DISCARD-resource-maps-with-heap-me.patch
+	patch_apply wined3d-CSMT_Main/0118-wined3d-Unset-some-objects-in-state_init_default.patch
+	patch_apply wined3d-CSMT_Main/0119-wined3d-Don-t-request-the-frontbuffer-to-create-dumm.patch
+	patch_apply wined3d-CSMT_Main/0120-wined3d-Use-double-buffered-buffers-for-multithreade.patch
+	patch_apply wined3d-CSMT_Main/0121-wined3d-Don-t-synchronize-NOOVERWRITE-buffer-maps.patch
+	patch_apply wined3d-CSMT_Main/0122-wined3d-Separate-buffer-map-write-and-draw-read-memo.patch
+	patch_apply wined3d-CSMT_Main/0123-wined3d-Accelerate-DISCARD-buffer-maps.patch
+	patch_apply wined3d-CSMT_Main/0124-wined3d-Accelerate-READONLY-buffer-maps.patch
+	patch_apply wined3d-CSMT_Main/0125-wined3d-Access-the-buffer-dirty-areas-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0126-wined3d-Ignore-buffer-resource.map_count-in-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0127-wined3d-Send-buffer-preloads-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0128-wined3d-Use-glBufferSubData-instead-of-glMapBufferRa.patch
+	patch_apply wined3d-CSMT_Main/0129-wined3d-Separate-GL-buffer-discard-control-from-igno.patch
+	patch_apply wined3d-CSMT_Main/0130-wined3d-Create-buffers-before-mapping-them.patch
+	patch_apply wined3d-CSMT_Main/0131-wined3d-Destroy-views-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0132-wined3d-Remove-another-glFinish.patch
+	patch_apply wined3d-CSMT_Main/0133-wined3d-Destroy-vertex-declarations-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0134-wined3d-Destroy-shaders-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0135-wined3d-Create-VBOs-through-the-command-stream.patch
+	patch_apply wined3d-CSMT_Main/0136-wined3d-Clean-up-resource-data-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0137-wined3d-Clean-up-buffer-resource-data-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0138-wined3d-Clean-up-volume-resource-data-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0139-wined3d-Clean-up-surfaces-through-the-cs.patch
+	patch_apply wined3d-CSMT_Main/0140-wined3d-Clean-up-texture-resources-through-the-cs.patch
+	patch_apply wined3d-CSMT_Main/0141-wined3d-Unload-resources-through-the-CS-in-uninit_3d.patch
+	patch_apply wined3d-CSMT_Main/0142-wined3d-Unload-resources-through-the-CS-in-device_re.patch
+	patch_apply wined3d-CSMT_Main/0143-wined3d-Don-t-glFinish-after-a-depth-buffer-blit.patch
+	patch_apply wined3d-CSMT_Main/0144-wined3d-Remove-software-cursor-support.patch
+	patch_apply wined3d-CSMT_Main/0145-wined3d-Create-dummy-textures-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0146-wined3d-Create-the-initial-context-through-the-CS.patch
+	patch_apply wined3d-CSMT_Main/0147-wined3d-Recreate-ctx-and-dummy-textures-through-the-.patch
+	patch_apply wined3d-CSMT_Main/0148-wined3d-Ignore-WINED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch
+	patch_apply wined3d-CSMT_Main/0149-wined3d-Delete-GL-contexts-through-the-CS-in-reset.patch
+	patch_apply wined3d-CSMT_Main/0150-wined3d-Delete-GL-contexts-through-the-CS-in-uninit_.patch
+	patch_apply wined3d-CSMT_Main/0151-wined3d-Invoke-surface_unload-through-the-CS-in-wine.patch
+	patch_apply wined3d-CSMT_Main/0152-wined3d-Use-an-event-to-block-the-worker-thread-when.patch
+	patch_apply wined3d-CSMT_Main/0153-wined3d-Fence-preload-operations.patch
+	patch_apply wined3d-CSMT_Main/0154-d3d8-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
+	patch_apply wined3d-CSMT_Main/0155-d3d9-tests-D3DLOCK_NO_DIRTY_UPDATE-on-managed-textur.patch
+	patch_apply wined3d-CSMT_Main/0156-wined3d-Completely-reset-the-state-on-reset.patch
+	patch_apply wined3d-CSMT_Main/0157-wined3d-Send-getdc-and-releasedc-through-the-command.patch
+	patch_apply wined3d-CSMT_Main/0158-wined3d-Set-map_heap_memory-NULL-when-allocating-a-P.patch
+	patch_apply wined3d-CSMT_Main/0159-wined3d-Wait-only-for-the-buffer-to-be-idle.patch
+	patch_apply wined3d-CSMT_Main/0160-wined3d-Add-a-comment-about-worker-thread-lag.patch
+	patch_apply wined3d-CSMT_Main/0161-wined3d-Remove-the-texture-destroy-glFinish.patch
+	patch_apply wined3d-CSMT_Main/0162-wined3d-Move-FBO-destruction-into-the-worker-thread.patch
+	patch_apply wined3d-CSMT_Main/0163-wined3d-Don-t-incref-decref-textures-in-color-depth-.patch
+	patch_apply wined3d-CSMT_Main/0164-Winex11-complain-about-glfinish.patch
+	patch_apply wined3d-CSMT_Main/0165-wined3d-Make-sure-the-new-window-is-set-up-before-se.patch
+	patch_apply wined3d-CSMT_Main/0166-wined3d-Remove-the-device_reset-CS-sync-fixme.patch
+	patch_apply wined3d-CSMT_Main/0167-wined3d-Put-GL_APPLE_flush_buffer_range-syncing-back.patch
+	patch_apply wined3d-CSMT_Main/0168-wined3d-Wait-for-the-resource-to-be-idle-when-destro.patch
+	patch_apply wined3d-CSMT_Main/0169-wined3d-Don-t-sync-on-redundant-discard-calls.patch
+	patch_apply wined3d-CSMT_Main/0170-wined3d-Don-t-discard-new-buffers.patch
+	patch_apply wined3d-CSMT_Main/0171-wined3d-Don-t-try-to-sync-VBOs-manually-on-OSX-with-.patch
+	patch_apply wined3d-CSMT_Main/0172-wined3d-Render-target-lock-hack.patch
+	patch_apply wined3d-CSMT_Main/0173-wined3d-Avoid-calling-wined3d_surface_blt-from-surfa.patch
+	patch_apply wined3d-CSMT_Main/0174-wined3d-Only-discard-buffers-that-are-in-use.patch
+	patch_apply wined3d-CSMT_Main/0175-wined3d-Destroy-samplers-through-the-command-stream.patch
+	patch_apply wined3d-CSMT_Main/0176-wined3d-Hack-to-reject-unsupported-color-fills.patch
+	patch_apply wined3d-CSMT_Main/0177-wined3d-Alloc-the-buffer-map-array-before-mapping-th.patch
+	patch_apply wined3d-CSMT_Main/0178-wined3d-Send-update_sub_resource-calls-through-the-c.patch
 	patch_apply wined3d-CSMT_Main/9998-wined3d-Enable-CSMT-by-default-print-a-winediag-mess.patch
 	patch_apply wined3d-CSMT_Main/9999-IfDefined.patch
 	(
-		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 },';
@@ -5925,7 +5923,7 @@ if test "$enable_wined3d_CSMT_Main" -eq 1; then
 		echo '+    { "Stefan Dösinger", "wined3d: Destroy samplers through the command stream.", 1 },';
 		echo '+    { "Stefan Dösinger", "wined3d: Hack to reject unsupported color fills.", 1 },';
 		echo '+    { "Stefan Dösinger", "wined3d: Alloc the buffer map array before mapping the buffer.", 1 },';
-		echo '+    { "Sebastian Lackner", "wined3d: Avoid unnecessary call to wined3d_resource_get_patch.", 1 },';
+		echo '+    { "Stefan Dösinger", "wined3d: Send update_sub_resource calls through the command stream.", 1 },';
 		echo '+    { "Sebastian Lackner", "wined3d: Enable CSMT by default, print a winediag message informing about this patchset.", 1 },';
 		echo '+    { "Wine Staging Team", "Autogenerated #ifdef patch for wined3d-CSMT_Main.", 1 },';
 	) >> "$patchlist"

patches/wined3d-CSMT_Main/0001-wined3d-Merge-get_pitch-functions.patch

@@ -1,18 +1,18 @@
-From 0bff3caeafd1080f6fd6244abdf8a87ddff6c3d2 Mon Sep 17 00:00:00 2001
+From b8718b23cf22dcdb8cfde0bb64101c7243ae44b5 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.
 
 ---
  dlls/wined3d/resource.c        | 31 +++++++++++++++++
- dlls/wined3d/surface.c         | 78 ++++++++++++++++++++----------------------
+ dlls/wined3d/surface.c         | 75 +++++++++++++++++++-----------------------
  dlls/wined3d/texture.c         |  2 +-
- dlls/wined3d/volume.c          | 28 ++-------------
+ dlls/wined3d/volume.c          | 28 ++--------------
  dlls/wined3d/wined3d_private.h |  5 +--
- 5 files changed, 74 insertions(+), 70 deletions(-)
+ 5 files changed, 70 insertions(+), 71 deletions(-)
 
 diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index 1891165..0968cd2 100644
+index 1891165..86441d1 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
 @@ -414,3 +414,34 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource)
@@ -20,7 +20,7 @@ index 1891165..0968cd2 100644
          resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB;
  }
 +
-+void wined3d_resource_get_pitch(const struct wined3d_resource *resource, UINT *row_pitch,
++void CDECL wined3d_resource_get_pitch(const struct wined3d_resource *resource, UINT *row_pitch,
 +        UINT *slice_pitch)
 +{
 +    unsigned int alignment;
@@ -51,7 +51,7 @@ index 1891165..0968cd2 100644
 +    TRACE("Returning row pitch %u, slice pitch %u.\n", *row_pitch, *slice_pitch);
 +}
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index 2b5e734..c96c44c 100644
+index e9e0620..f6be430 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
 @@ -364,6 +364,7 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface)
@@ -158,7 +158,7 @@ index 2b5e734..c96c44c 100644
  }
  
  HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y)
-@@ -2109,20 +2100,22 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
+@@ -2109,20 +2100,21 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
          surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY;
          valid_location = WINED3D_LOCATION_USER_MEMORY;
      }
@@ -181,11 +181,10 @@ index 2b5e734..c96c44c 100644
                  1, width, height, 1);
 -        surface->pitch = wined3d_format_calculate_pitch(texture_resource->format, width);
 +        surface->resource.custom_row_pitch = wined3d_format_calculate_pitch(texture_resource->format, width);
-+        surface->resource.custom_slice_pitch = surface->resource.custom_row_pitch * surface->resource.height; /* FIXME */
      }
  
      /* The format might be changed to a format that needs conversion.
-@@ -2589,7 +2582,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
+@@ -2742,7 +2734,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
      if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH)
          map_desc->row_pitch = surface->resource.width * format->byte_count;
      else
@@ -194,7 +193,7 @@ index 2b5e734..c96c44c 100644
      map_desc->slice_pitch = 0;
  
      if (!rect)
-@@ -2716,6 +2709,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc
+@@ -2869,6 +2861,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc
      int i;
      BOOL srcIsUpsideDown;
      struct wined3d_bo_address data;
@@ -202,7 +201,7 @@ index 2b5e734..c96c44c 100644
  
      surface_get_memory(surface, &data, dst_location);
  
-@@ -2752,8 +2746,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc
+@@ -2905,8 +2898,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc
      }
  
      /* Setup pixel store pack state -- to glReadPixels into the correct place */
@@ -213,18 +212,16 @@ index 2b5e734..c96c44c 100644
      checkGLcall("glPixelStorei");
  
      gl_info->gl_ops.gl.p_glReadPixels(0, 0,
-@@ -2770,7 +2764,9 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc
+@@ -2923,8 +2916,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc
      {
          /* glReadPixels returns the image upside down, and there is no way to prevent this.
           * Flip the lines in software. */
 -        UINT pitch = wined3d_surface_get_pitch(surface);
-+        UINT pitch, slice_pitch;
-+
-+        wined3d_resource_get_pitch(&surface->resource, &pitch, &slice_pitch);
- 
+-
          if (!(row = HeapAlloc(GetProcessHeap(), 0, pitch)))
              goto error;
-@@ -3967,7 +3963,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+ 
+@@ -4120,7 +4111,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
      const struct wined3d_color_key_conversion *conversion;
      struct wined3d_texture *texture = surface->container;
      struct wined3d_context *context;
@@ -233,7 +230,7 @@ index 2b5e734..c96c44c 100644
      struct wined3d_bo_address data;
      struct wined3d_format format;
      POINT dst_point = {0, 0};
-@@ -4055,7 +4051,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -4208,7 +4199,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
      wined3d_texture_bind_and_dirtify(texture, context, srgb);
  
      width = surface->resource.width;
@@ -242,7 +239,7 @@ index 2b5e734..c96c44c 100644
  
      format = *texture->resource.format;
      if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE)))
-@@ -4093,9 +4089,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -4246,9 +4237,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
              context_release(context);
              return E_OUTOFMEMORY;
          }
@@ -254,7 +251,7 @@ index 2b5e734..c96c44c 100644
          data.addr = mem;
      }
      else if (conversion)
-@@ -4115,14 +4111,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
+@@ -4268,14 +4259,14 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
          }
          if (texture->swapchain && texture->swapchain->palette)
              palette = texture->swapchain->palette;
@@ -286,7 +283,7 @@ index b369809..3485ac2 100644
          FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch);
  
 diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
-index 4e1c415..eec1492 100644
+index 424938a..b672d4a 100644
 --- a/dlls/wined3d/volume.c
 +++ b/dlls/wined3d/volume.c
 @@ -40,30 +40,6 @@ BOOL volume_prepare_system_memory(struct wined3d_volume *volume)
@@ -339,7 +336,7 @@ index 4e1c415..eec1492 100644
  
      if (!box)
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index d1ba5e4..77463aa 100644
+index 919e818..7c26e44 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
 @@ -2164,6 +2164,7 @@ struct wined3d_resource

patches/wined3d-CSMT_Main/0001-wined3d-Properly-initialize-format_flags-for-surface.patch

@@ -1,38 +0,0 @@
-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
-

patches/wined3d-CSMT_Main/0013-wined3d-Remove-surface_validate_location.patch

@@ -1,4 +1,4 @@
-From 09cdb67f93b21136003250e7cb60ec1a55877e26 Mon Sep 17 00:00:00 2001
+From 013c83727f4fbbf15bbbe7ccb12d42d58d17e18d 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.
@@ -48,7 +48,7 @@ index 1ef681a..2683140 100644
  }
  
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index b669ca3..4b4769f 100644
+index 1dd4b69..4f646e4 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
 @@ -1170,7 +1170,7 @@ static void surface_unload(struct wined3d_resource *resource)
@@ -69,7 +69,7 @@ index b669ca3..4b4769f 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
  
      return WINED3D_OK;
-@@ -2170,7 +2170,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;
      }
  
@@ -78,7 +78,7 @@ index b669ca3..4b4769f 100644
  
      return WINED3D_OK;
  }
-@@ -2716,7 +2716,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));
@@ -87,7 +87,7 @@ index b669ca3..4b4769f 100644
      }
      else
      {
-@@ -3288,7 +3288,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
+@@ -3283,7 +3283,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. */
@@ -96,7 +96,7 @@ index b669ca3..4b4769f 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
  }
  
-@@ -3561,7 +3561,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
+@@ -3556,7 +3556,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. */
@@ -105,7 +105,7 @@ index b669ca3..4b4769f 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
  }
  
-@@ -4067,13 +4067,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
+@@ -4062,13 +4062,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
      surface->ds_current_size.cy = surface->resource.height;
  }
  
@@ -119,7 +119,7 @@ index b669ca3..4b4769f 100644
  void surface_invalidate_location(struct wined3d_surface *surface, DWORD location)
  {
      TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location));
-@@ -4461,7 +4454,7 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
+@@ -4456,7 +4449,7 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
              break;
      }
  
@@ -128,7 +128,7 @@ index b669ca3..4b4769f 100644
  
      if (location != WINED3D_LOCATION_SYSMEM && (surface->resource.locations & WINED3D_LOCATION_SYSMEM))
          surface_evict_sysmem(surface);
-@@ -4635,7 +4628,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter,
+@@ -4630,7 +4623,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);
  
@@ -137,7 +137,7 @@ index b669ca3..4b4769f 100644
      surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);
  }
  
-@@ -5615,7 +5608,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
+@@ -5610,7 +5603,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);
  
@@ -146,16 +146,16 @@ index b669ca3..4b4769f 100644
                  surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);
  
                  return WINED3D_OK;
-@@ -5707,7 +5700,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
-     surface->container = container;
-     surface->resource.format_flags = container->resource.format_flags;
+@@ -5700,7 +5693,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
+     }
  
+     surface->container = container;
 -    surface_validate_location(surface, WINED3D_LOCATION_SYSMEM);
 +    wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_SYSMEM);
      list_init(&surface->renderbuffers);
      list_init(&surface->overlays);
  
-@@ -5739,7 +5732,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
+@@ -5732,7 +5725,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);