Matteo Bruni : wined3d: Fix the TRACE in wined3d_texture_remove_buffer_object().

Alexandre Julliard julliard at winehq.org
Tue Mar 14 16:14:36 CDT 2017


Module: wine
Branch: master
Commit: 630ba97900c350cae1a6f1c52630e88a0b81f548
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=630ba97900c350cae1a6f1c52630e88a0b81f548

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Tue Mar 14 00:09:53 2017 +0100

wined3d: Fix the TRACE in wined3d_texture_remove_buffer_object().

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/texture.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 2688735..5279af8 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -435,16 +435,16 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc
 static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture,
         unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info)
 {
-    GLuint *buffer_object;
+    GLuint *buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object;
 
-    buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object;
     GL_EXTCALL(glDeleteBuffers(1, buffer_object));
     checkGLcall("glDeleteBuffers");
-    wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER);
-    *buffer_object = 0;
 
     TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n",
             *buffer_object, texture, sub_resource_idx);
+
+    wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER);
+    *buffer_object = 0;
 }
 
 static void wined3d_texture_update_map_binding(struct wined3d_texture *texture)




More information about the wine-cvs mailing list