ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Rename buffer_internal_preload() to wined3d_buffer_load(). 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2016-10-16 21:46:46 +02:00 committed by Alexandre Julliard
parent e3a8cd20ce
commit 5f86ef7b1e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/buffer.c
View File

@ -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);
}

8
dlls/wined3d/context.c
View File

@ -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);
}

4
dlls/wined3d/wined3d_private.h
View File

@ -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,