wined3d-CSMT_Main: Avoid unnecessary call to wined3d_resource_get_patch.

This commit is contained in:
Sebastian Lackner 2015-09-04 14:00:40 +02:00
parent 3cabc8a125
commit 36aa7ea01e
3 changed files with 111 additions and 87 deletions

View File

@ -5743,6 +5743,7 @@ if test "$enable_wined3d_CSMT_Main" -eq 1; then
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/0180-wined3d-Avoid-unnecessary-call-to-wined3d_resource_g.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
(
@ -5924,6 +5925,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 '+ { "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"

View File

@ -0,0 +1,26 @@
From 3c2959e90d46d734c2a4f97d3790deb8a8979153 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 4 Sep 2015 13:59:56 +0200
Subject: wined3d: Avoid unnecessary call to wined3d_resource_get_patch.
---
dlls/wined3d/surface.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c1413cc..b8be30d 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2588,9 +2588,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface,
{
/* glReadPixels returns the image upside down, and there is no way to prevent this.
* Flip the lines in software. */
- UINT pitch, slice_pitch;
-
- wined3d_resource_get_pitch(&surface->resource, &pitch, &slice_pitch);
if (!(row = HeapAlloc(GetProcessHeap(), 0, pitch)))
goto error;
--
2.5.1

File diff suppressed because it is too large Load Diff