wined3d: Unload texture resources through texture ops.

dlls/wined3d/adapter_gl.c

@@ -4746,61 +4746,6 @@ static HRESULT adapter_gl_create_texture(struct wined3d_device *device,
     return hr;
 }
 
-static void wined3d_texture_gl_destroy_object(void *object)
-{
-    struct wined3d_renderbuffer_entry *entry, *entry2;
-    struct wined3d_texture_gl *texture_gl = object;
-    struct wined3d_context *context = NULL;
-    const struct wined3d_gl_info *gl_info;
-    struct wined3d_device *device;
-    unsigned int sub_count, i;
-    GLuint buffer_object;
-
-    TRACE("texture_gl %p.\n", texture_gl);
-
-    sub_count = texture_gl->t.level_count * texture_gl->t.layer_count;
-    for (i = 0; i < sub_count; ++i)
-    {
-        if (!(buffer_object = texture_gl->t.sub_resources[i].buffer_object))
-            continue;
-
-        TRACE("Deleting buffer object %u.\n", buffer_object);
-
-        if (!context)
-        {
-            context = context_acquire(texture_gl->t.resource.device, NULL, 0);
-            gl_info = wined3d_context_gl(context)->gl_info;
-        }
-
-        GL_EXTCALL(glDeleteBuffers(1, &buffer_object));
-    }
-
-    if (!list_empty(&texture_gl->renderbuffers))
-    {
-        device = texture_gl->t.resource.device;
-        if (!context)
-        {
-            context = context_acquire(device, NULL, 0);
-            gl_info = wined3d_context_gl(context)->gl_info;
-        }
-
-        LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture_gl->renderbuffers, struct wined3d_renderbuffer_entry, entry)
-        {
-            TRACE("Deleting renderbuffer %u.\n", entry->id);
-            context_gl_resource_released(device, entry->id, TRUE);
-            gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id);
-            heap_free(entry);
-        }
-    }
-
-    if (context)
-        context_release(context);
-
-    wined3d_texture_gl_unload_texture(texture_gl);
-
-    heap_free(texture_gl);
-}
-
 static void adapter_gl_destroy_texture(struct wined3d_texture *texture)
 {
     struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture);
@@ -4820,7 +4765,7 @@ static void adapter_gl_destroy_texture(struct wined3d_texture *texture)
     texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent);
 
     wined3d_texture_cleanup(&texture_gl->t);
-    wined3d_cs_destroy_object(device->cs, wined3d_texture_gl_destroy_object, texture_gl);
+    wined3d_cs_destroy_object(device->cs, heap_free, texture_gl);
 
     if (swapchain_count)
         wined3d_device_decref(device);

dlls/wined3d/device.c

@@ -1146,6 +1146,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
     wine_rb_clear(&device->samplers, device_free_sampler, NULL);
 
     device->adapter->adapter_ops->adapter_uninit_3d(device);
+    device->d3d_initialized = FALSE;
 
     if ((view = device->fb.depth_stencil))
     {
@@ -1170,8 +1171,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
 
     heap_free(device->swapchains);
     device->swapchains = NULL;
-
-    device->d3d_initialized = FALSE;
 }
 
 /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw

dlls/wined3d/wined3d_private.h

@@ -3470,6 +3470,8 @@ struct wined3d_texture_ops
             struct wined3d_context *context, unsigned int location);
     BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx,
             struct wined3d_context *context, unsigned int location);
+    void (*texture_unload_location)(struct wined3d_texture *texture,
+            struct wined3d_context *context, unsigned int location);
     void (*texture_upload_data)(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr,
             const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch,
             unsigned int src_slice_pitch, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx,
@@ -3745,7 +3747,6 @@ void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl,
 void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl,
         struct wined3d_context_gl *context_gl, unsigned int level,
         const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN;
-void wined3d_texture_gl_unload_texture(struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN;
 
 struct wined3d_texture_vk
 {