From: Eric Pouech eric.pouech@gmail.com
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 641bf0355eb..7fa3022635f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1734,10 +1734,10 @@ void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, width, height, row_pitch, slice_pitch); }
-DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) +unsigned int CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, unsigned int lod) { struct wined3d_resource *resource; - DWORD old = texture->lod; + unsigned int old = texture->lod;
TRACE("texture %p, lod %u.\n", texture, lod);
@@ -1771,14 +1771,14 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) return old; }
-DWORD CDECL wined3d_texture_get_lod(const struct wined3d_texture *texture) +unsigned int CDECL wined3d_texture_get_lod(const struct wined3d_texture *texture) { TRACE("texture %p, returning %u.\n", texture, texture->lod);
return texture->lod; }
-DWORD CDECL wined3d_texture_get_level_count(const struct wined3d_texture *texture) +UINT CDECL wined3d_texture_get_level_count(const struct wined3d_texture *texture) { TRACE("texture %p, returning %u.\n", texture, texture->level_count);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 12dc08da352..d21cefea211 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4557,11 +4557,11 @@ struct wined3d_texture unsigned int pow2_width; unsigned int pow2_height; UINT layer_count; - UINT level_count; + unsigned int level_count; unsigned int download_count; unsigned int sysmem_count; float pow2_matrix[16]; - UINT lod; + unsigned int lod; DWORD sampler; uint32_t flags; DWORD update_map_binding; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1660b424441..a59a4e5205d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2841,13 +2841,13 @@ HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_ HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, - UINT layer_count, UINT level_count, uint32_t flags, const struct wined3d_sub_resource_data *data, + UINT layer_count, unsigned int level_count, uint32_t flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture); struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource); ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc); -DWORD __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); -DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); +unsigned int __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); +unsigned int __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_get_overlay_position(const struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG *x, LONG *y); void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture); @@ -2861,7 +2861,7 @@ ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, uint32_t flags, const struct wined3d_color_key *color_key); -DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); +unsigned int __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, unsigned int lod); HRESULT __cdecl wined3d_texture_set_overlay_position(struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG x, LONG y); void __cdecl wined3d_texture_set_sub_resource_parent(struct wined3d_texture *texture,