[PATCH 4/6] wined3d: Rename buffer_get_sysmem() to wined3d_buffer_load_sysmem().
Józef Kucia
jkucia at codeweavers.com
Sun Oct 16 14:46:47 CDT 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/wined3d/buffer.c | 8 ++++----
dlls/wined3d/context.c | 4 ++--
dlls/wined3d/device.c | 2 +-
dlls/wined3d/drawprim.c | 6 +++---
dlls/wined3d/state.c | 2 +-
dlls/wined3d/wined3d_private.h | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index ae835be..b6338d1 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -493,7 +493,7 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer)
}
/* Context activation is done by the caller. */
-BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context)
+BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context)
{
const struct wined3d_gl_info *gl_info = context->gl_info;
@@ -528,7 +528,7 @@ static void buffer_unload(struct wined3d_resource *resource)
/* Download the buffer, but don't permanently enable double buffering */
if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER))
{
- buffer_get_sysmem(buffer, context);
+ wined3d_buffer_load_sysmem(buffer, context);
buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER;
}
@@ -875,7 +875,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *
ERR("Converting data in non-vertex buffer.\n");
if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER))
- buffer_get_sysmem(buffer, context);
+ wined3d_buffer_load_sysmem(buffer, context);
/* Now for each vertex in the buffer that needs conversion */
vertex_count = buffer->resource.size / buffer->stride;
@@ -1010,7 +1010,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI
else
{
TRACE("Falling back to doublebuffered operation.\n");
- buffer_get_sysmem(buffer, context);
+ wined3d_buffer_load_sysmem(buffer, context);
}
TRACE("New pointer is %p.\n", buffer->resource.heap_memory);
buffer->map_ptr = NULL;
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 38e081b..1ca12bc 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3194,7 +3194,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st
WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n",
state->load_base_vertex_index);
element->data.buffer_object = 0;
- element->data.addr += (ULONG_PTR)buffer_get_sysmem(buffer, context);
+ element->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context);
if ((UINT_PTR)element->data.addr < -state->load_base_vertex_index * element->stride)
FIXME("System memory vertex data load offset is negative!\n");
}
@@ -3432,7 +3432,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context,
if (context->stream_info.all_vbo)
wined3d_buffer_load(state->index_buffer, context, state);
else
- buffer_get_sysmem(state->index_buffer, context);
+ wined3d_buffer_load_sysmem(state->index_buffer, context);
}
for (i = 0; i < context->numDirtyEntries; ++i)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 9bf6042..89b781c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3174,7 +3174,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device,
e = &stream_info.elements[i];
buffer = state->streams[e->stream_idx].buffer;
e->data.buffer_object = 0;
- e->data.addr += (ULONG_PTR)buffer_get_sysmem(buffer, context);
+ e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context);
if (buffer->buffer_object)
{
GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object));
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index e5b30db..4833845 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -135,7 +135,7 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct
element = &si->elements[element_idx];
ptr = element->data.addr + element->stride * i;
if (element->data.buffer_object)
- ptr += (ULONG_PTR)buffer_get_sysmem(state->streams[element->stream_idx].buffer, context);
+ ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(state->streams[element->stream_idx].buffer, context);
ops->generic[element->format->emit_idx](element_idx, ptr);
}
@@ -201,7 +201,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const
* supported or other reason), or with user pointer drawing idx_data
* will be non-NULL. */
if (idx_size && !idx_data)
- idx_data = buffer_get_sysmem(state->index_buffer, context);
+ idx_data = wined3d_buffer_load_sysmem(state->index_buffer, context);
ops = &d3d_info->ffp_attrib_ops;
@@ -402,7 +402,7 @@ static void remove_vbos(struct wined3d_context *context,
{
struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer;
e->data.buffer_object = 0;
- e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, context));
+ e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context));
}
}
}
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index d462ea5..9e36bcd 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4081,7 +4081,7 @@ static void load_numbered_arrays(struct wined3d_context *context,
* figure out the system memory address. */
const BYTE *ptr = element->data.addr;
if (element->data.buffer_object)
- ptr += (ULONG_PTR)buffer_get_sysmem(stream->buffer, context);
+ ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(stream->buffer, context);
if (context->numbered_array_mask & (1u << i))
unload_numbered_array(context, i);
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 5e4b072..c3152a2 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3180,10 +3180,10 @@ 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_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;
+BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) 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,
--
2.7.3
More information about the wine-patches
mailing list