--- dlls/d3d8/volume.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 -- 5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 8e4f27c..00ff1f2 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -121,7 +121,7 @@ static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DES TRACE("iface %p, desc %p.\n", iface, desc);
wined3d_mutex_lock(); - wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume); + wined3d_resource = wined3d_texture_get_sub_resource(volume->texture->wined3d_texture, volume->sub_resource_idx); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock();
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 2ca6627..b7a6542 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -122,7 +122,7 @@ static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DES TRACE("iface %p, desc %p.\n", iface, desc);
wined3d_mutex_lock(); - wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume); + wined3d_resource = wined3d_texture_get_sub_resource(volume->texture->wined3d_texture, volume->sub_resource_idx); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock();
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bc3f790..7654b22 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -280,5 +280,3 @@ @ cdecl wined3d_vertex_declaration_decref(ptr) @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) - -@ cdecl wined3d_volume_get_resource(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 85c4603..1c82fbc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2330,6 +2330,7 @@ HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wi void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN; struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, UINT *slice_pitch) DECLSPEC_HIDDEN; +struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 12c57f8..257abe8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2566,8 +2566,6 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration);
-struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); - /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) {