From: Eric Pouech eric.pouech@gmail.com
Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/texture.c | 16 ++++++++-------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 30 +++++++++++++++--------------- 6 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1a953f8e218..460313d69f6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -129,7 +129,7 @@ static void wined3d_buffer_invalidate_range(struct wined3d_buffer *buffer, DWORD ERR("Buffer %p does not have any up to date location.\n", buffer); }
-void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) +void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, unsigned int location) { wined3d_buffer_invalidate_range(buffer, location, 0, 0); } @@ -573,7 +573,7 @@ static void wined3d_buffer_unload_location(struct wined3d_buffer *buffer, }
BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, - struct wined3d_context *context, DWORD location) + struct wined3d_context *context, unsigned int location) { struct wined3d_bo_address src, dst; struct wined3d_range range; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index e8d2ef5191e..682e5aef5b4 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -851,7 +851,7 @@ static void wined3d_context_gl_apply_fbo_state(struct wined3d_context_gl *contex /* Context activation is done by the caller. */ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, - struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, unsigned int location) { struct wined3d_rendertarget_info ds_info = {{0}};
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 42ef054cdaa..a22c9975606 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -137,7 +137,7 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) return GL_BACK; }
-static DWORD wined3d_resource_access_from_location(DWORD location) +static DWORD wined3d_resource_access_from_location(unsigned int location) { switch (location) { @@ -685,7 +685,7 @@ static void wined3d_texture_evict_sysmem(struct wined3d_texture *texture) }
void wined3d_texture_validate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) + unsigned int sub_resource_idx, unsigned int location) { struct wined3d_texture_sub_resource *sub_resource; DWORD previous_locations; @@ -709,7 +709,7 @@ static void wined3d_texture_set_dirty(struct wined3d_texture *texture) }
void wined3d_texture_invalidate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) + unsigned int sub_resource_idx, unsigned int location) { struct wined3d_texture_sub_resource *sub_resource; DWORD previous_locations; @@ -734,7 +734,7 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, }
void wined3d_texture_get_bo_address(const struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) + unsigned int sub_resource_idx, struct wined3d_bo_address *data, unsigned int location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx];
@@ -777,7 +777,7 @@ void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { DWORD current = texture->sub_resources[sub_resource_idx].locations; BOOL ret; @@ -3460,7 +3460,7 @@ static bool wined3d_texture_gl_clear(struct wined3d_texture *texture,
/* Context activation is done by the caller. */ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); @@ -4763,7 +4763,7 @@ static BOOL wined3d_texture_no3d_prepare_location(struct wined3d_texture *textur }
static BOOL wined3d_texture_no3d_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); @@ -5584,7 +5584,7 @@ static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture, }
static BOOL wined3d_texture_vk_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { if (!wined3d_texture_vk_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 47500460a2e..2cf90996f45 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6960,7 +6960,7 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb return memcmp(ka, kb, sizeof(*ka)); }
-const char *wined3d_debug_location(DWORD location) +const char *wined3d_debug_location(unsigned int location) { struct debug_buffer buffer; const char *prefix = ""; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index c4b65921ea7..5f2b082b9bd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -471,7 +471,7 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg }
void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, - struct wined3d_context *context, DWORD location) + struct wined3d_context *context, unsigned int location) { struct wined3d_resource *resource = view->resource; unsigned int i, sub_resource_idx, layer_count; @@ -491,12 +491,12 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view }
void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, - struct wined3d_context *context, DWORD location) + struct wined3d_context *context, unsigned int location) { wined3d_view_load_location(view->resource, &view->desc, context, location); }
-void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) +void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, unsigned int location) { struct wined3d_resource *resource = view->resource; unsigned int i, sub_resource_idx, layer_count; @@ -515,7 +515,7 @@ void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_vie wined3d_texture_validate_location(texture, sub_resource_idx, location); }
-void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, DWORD location) +void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, unsigned int location) { wined3d_view_invalidate_location(view->resource, &view->desc, location); } @@ -1517,7 +1517,7 @@ void * CDECL wined3d_unordered_access_view_get_parent(const struct wined3d_unord }
void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, - DWORD location) + unsigned int location) { wined3d_view_invalidate_location(view->resource, &view->desc, location); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00786bdda3d..97f196e23a6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2445,7 +2445,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, unsigned int rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, - struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, unsigned int location) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) DECLSPEC_HIDDEN; @@ -4499,7 +4499,7 @@ void wined3d_resource_memory_colour_fill(struct wined3d_resource *resource, #define WINED3D_LOCATION_RB_MULTISAMPLE 0x00000080 #define WINED3D_LOCATION_RB_RESOLVED 0x00000100
-const char *wined3d_debug_location(DWORD location) DECLSPEC_HIDDEN; +const char *wined3d_debug_location(unsigned int location) DECLSPEC_HIDDEN;
struct wined3d_blt_info { @@ -4711,16 +4711,16 @@ void wined3d_texture_cleanup(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_get_bo_address(const struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, struct wined3d_bo_address *data, unsigned int location) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_invalidate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, unsigned int location) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; BOOL wined3d_texture_load_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) @@ -4735,7 +4735,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, unsigned int location) DECLSPEC_HIDDEN; bool wined3d_texture_validate_sub_resource_idx(const struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) DECLSPEC_HIDDEN; @@ -4798,7 +4798,7 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win }
static inline BOOL wined3d_texture_gl_is_multisample_location(const struct wined3d_texture_gl *texture_gl, - DWORD location) + unsigned int location) { if (location == WINED3D_LOCATION_RB_MULTISAMPLE) return TRUE; @@ -5331,11 +5331,11 @@ void wined3d_buffer_copy_bo_address(struct wined3d_buffer *dst_buffer, struct wi unsigned int dst_offset, const struct wined3d_const_bo_address *src_addr, unsigned int size) DECLSPEC_HIDDEN; DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; +void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, unsigned int location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; @@ -5422,13 +5422,13 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg void wined3d_rendertarget_view_get_box(struct wined3d_rendertarget_view *view, struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, - DWORD location) DECLSPEC_HIDDEN; + unsigned int location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; + struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, - DWORD location) DECLSPEC_HIDDEN; + unsigned int location) DECLSPEC_HIDDEN; DWORD wined3d_rendertarget_view_get_locations(const struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN;
@@ -5581,7 +5581,7 @@ void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, - DWORD location) DECLSPEC_HIDDEN; + unsigned int location) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) DECLSPEC_HIDDEN;