=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Rename buffer_internal_preload () to wined3d_buffer_load().
Alexandre Julliard
julliard at winehq.org
Wed Oct 19 20:47:57 CDT 2016
Module: wine
Branch: master
Commit: 5f86ef7b1e9614d9794e304a6b9af5ace3cb8d9a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f86ef7b1e9614d9794e304a6b9af5ace3cb8d9a
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Sun Oct 16 21:46:46 2016 +0200
wined3d: Rename buffer_internal_preload() to wined3d_buffer_load().
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/buffer.c | 4 ++--
dlls/wined3d/context.c | 8 ++++----
dlls/wined3d/wined3d_private.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 49bed64..ae835be 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -740,7 +740,7 @@ void buffer_mark_used(struct wined3d_buffer *buffer)
}
/* Context activation is done by the caller. */
-void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context,
+void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context,
const struct wined3d_state *state)
{
DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD);
@@ -1219,7 +1219,7 @@ static void buffer_resource_preload(struct wined3d_resource *resource)
struct wined3d_context *context;
context = context_acquire(resource->device, NULL);
- buffer_internal_preload(buffer_from_resource(resource), context, NULL);
+ wined3d_buffer_load(buffer_from_resource(resource), context, NULL);
context_release(context);
}
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 87d417c..38e081b 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3200,7 +3200,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st
}
else
{
- buffer_internal_preload(buffer, context, state);
+ wined3d_buffer_load(buffer, context, state);
buffer_get_memory(buffer, context, &data);
element->data.buffer_object = data.buffer_object;
element->data.addr += (ULONG_PTR)data.addr;
@@ -3304,7 +3304,7 @@ static void context_load_shader_resources(struct wined3d_context *context, const
for (j = 0; j < WINED3D_MAX_CBS; ++j)
{
if (state->cb[i][j])
- buffer_internal_preload(state->cb[i][j], context, state);
+ wined3d_buffer_load(state->cb[i][j], context, state);
}
for (j = 0; j < shader->reg_maps.sampler_map.count; ++j)
@@ -3318,7 +3318,7 @@ static void context_load_shader_resources(struct wined3d_context *context, const
}
if (view->resource->type == WINED3D_RTYPE_BUFFER)
- buffer_internal_preload(buffer_from_resource(view->resource), context, state);
+ wined3d_buffer_load(buffer_from_resource(view->resource), context, state);
else
wined3d_texture_load(texture_from_resource(view->resource), context, FALSE);
}
@@ -3430,7 +3430,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context,
if (state->index_buffer)
{
if (context->stream_info.all_vbo)
- buffer_internal_preload(state->index_buffer, context, state);
+ wined3d_buffer_load(state->index_buffer, context, state);
else
buffer_get_sysmem(state->index_buffer, context);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4326bee..5e4b072 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3181,9 +3181,9 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc
void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context,
struct wined3d_bo_address *data) DECLSPEC_HIDDEN;
BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN;
-void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context,
- const struct wined3d_state *state) DECLSPEC_HIDDEN;
void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN;
+void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context,
+ const struct wined3d_state *state) DECLSPEC_HIDDEN;
HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset,
struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN;
HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer,
More information about the wine-cvs
mailing list