From: Eric Pouech eric.pouech@gmail.com
Note: choice of UINT is consistent with internal field's type in struct wined3d_texture and parameter in wined3d_texture_create(); but isn't with adapter_create_texture() methods which rather use unsigned int.
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/texture.c | 8 ++++---- include/wine/wined3d.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 641bf0355eb..436f61acf64 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) +UINT CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, UINT lod) { struct wined3d_resource *resource; - DWORD old = texture->lod; + UINT 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) +UINT 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/include/wine/wined3d.h b/include/wine/wined3d.h index 1660b424441..8178ce60d75 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2846,8 +2846,8 @@ HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const stru 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); +UINT __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); +UINT __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); +UINT __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, UINT 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,