Commit 90f4ae69 authored by Alexandre Julliard's avatar Alexandre Julliard

wined3d: Remove unused offset parameter in buffer_get_memory.

parent 8bfc89ee
......@@ -612,7 +612,7 @@ static inline void fixup_transformed_pos(float *p)
}
/* Context activation is done by the caller. */
const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object)
const BYTE *buffer_get_memory(IWineD3DBuffer *iface, GLuint *buffer_object)
{
struct wined3d_buffer *This = (struct wined3d_buffer *)iface;
......@@ -626,14 +626,14 @@ const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer
if (This->buffer_object)
{
*buffer_object = This->buffer_object;
return (const BYTE *)offset;
return NULL;
}
}
return This->resource.allocatedMemory + offset;
return This->resource.allocatedMemory;
}
else
{
return (const BYTE *)offset;
return NULL;
}
}
......
......@@ -213,7 +213,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This,
else
{
TRACE("Stream %u isn't UP, %p\n", element->input_slot, This->stateBlock->streamSource[element->input_slot]);
data = buffer_get_memory(This->stateBlock->streamSource[element->input_slot], 0, &buffer_object);
data = buffer_get_memory(This->stateBlock->streamSource[element->input_slot], &buffer_object);
/* Can't use vbo's if the base vertex index is negative. OpenGL doesn't accept negative offsets
* (or rather offsets bigger than the vbo, because the pointer is unsigned), so use system memory
......
......@@ -2526,7 +2526,7 @@ struct wined3d_buffer
UINT *conversion_shift; /* NULL if no shifted conversion */
};
const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object) DECLSPEC_HIDDEN;
const BYTE *buffer_get_memory(IWineD3DBuffer *iface, GLuint *buffer_object) DECLSPEC_HIDDEN;
BYTE *buffer_get_sysmem(struct wined3d_buffer *This) DECLSPEC_HIDDEN;
HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device,
UINT size, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, GLenum bind_hint,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment