Marcus Meissner : wined3d: Move texture reference decrement to end of usage (Coverity).
Alexandre Julliard
julliard at winehq.org
Mon Oct 1 13:35:02 CDT 2012
Module: wine
Branch: master
Commit: 8ec6ebe4fb3fbd30dca46c28c381209f711c89d9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec6ebe4fb3fbd30dca46c28c381209f711c89d9
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Sat Sep 29 11:14:54 2012 +0200
wined3d: Move texture reference decrement to end of usage (Coverity).
---
dlls/wined3d/device.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 6927f9f..fa35105 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3524,8 +3524,6 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device,
{
LONG bind_count = InterlockedDecrement(&prev->resource.bind_count);
- wined3d_texture_decref(prev);
-
if (!texture && stage < gl_info->limits.texture_stages)
{
device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP));
@@ -3549,6 +3547,8 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device,
}
}
}
+
+ wined3d_texture_decref(prev);
}
device_invalidate_state(device, STATE_SAMPLER(stage));
More information about the wine-cvs
mailing list