October 2016 - Wine-commits

Iván Matellanes : msvcirt: Add a partial implementation of class stdiostream.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 384e74cd75dbcbb48d552f8dec2dd1a25ebea869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=384e74cd75dbcbb48d552f8de… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:03 2016 +0200 msvcirt: Add a partial implementation of class stdiostream. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 34 +++++++++++++++++----------------- dlls/msvcrt20/msvcrt20.spec | 34 +++++++++++++++++----------------- dlls/msvcrt40/msvcrt40.spec | 34 +++++++++++++++++----------------- 4 files changed, 95 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=384e74cd75dbcbb48d552…

1 0

Iván Matellanes : msvcirt: Implement stdiostream constructors.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 6d1901f88564ac1ef1bd96c21a123b09654fc80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1901f88564ac1ef1bd96c21… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:04 2016 +0200 msvcirt: Implement stdiostream constructors. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 15 +++- dlls/msvcirt/tests/msvcirt.c | 177 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d1901f88564ac1ef1bd9…

1 0

Aric Stewart : hidclass.sys: Watch return for STATUS_PENDING not IRP status.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: b53846b60b0d94000741e96fc4f24fd04344d54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53846b60b0d94000741e96fc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 05:58:47 2016 +0200 hidclass.sys: Watch return for STATUS_PENDING not IRP status. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/main.c | 4 ++-- dlls/hidclass.sys/pnp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index b9b5a3a..f5a60e9 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -112,9 +112,9 @@ NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG buffer, out_size, TRUE, NULL, &irp_status); IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); - IoCallDriver(device, irp); + status = IoCallDriver(device, irp); - if (irp->IoStatus.u.Status == STATUS_PENDING) + if (status == STATUS_PENDING) WaitForSingleObject(event, INFINITE); memcpy(out_buff, buffer, out_size); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 1e607df..5df7692 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -61,8 +61,8 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH irpsp->Parameters.QueryId.IdType = type; IoSetCompletionRoutine(irp, internalComplete, event, TRUE, TRUE, TRUE); - IoCallDriver(device, irp); - if (irp->IoStatus.u.Status == STATUS_PENDING) + status = IoCallDriver(device, irp); + if (status == STATUS_PENDING) WaitForSingleObject(event, INFINITE); *id = (WCHAR*)irp->IoStatus.Information;

1 0

Józef Kucia : wined3d: Introduce wined3d_buffer_prepapre_location().
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 171e272f852465e1d015c79f0ebc632e4643f873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171e272f852465e1d015c79f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:50 2016 +0200 wined3d: Introduce wined3d_buffer_prepapre_location(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c7f0d81..558be1b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -538,6 +538,32 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) return refcount; } +static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, DWORD location) +{ + switch (location) + { + case WINED3D_LOCATION_SYSMEM: + if (buffer->resource.heap_memory) + return TRUE; + + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + { + ERR("Failed to allocate system memory.\n"); + return FALSE; + } + return TRUE; + + case WINED3D_LOCATION_BUFFER: + FIXME("Not implemented yet.\n"); + return FALSE; + + default: + ERR("Invalid location %s.\n", wined3d_debug_location(location)); + return FALSE; + } +} + /* Context activation is done by the caller. */ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { @@ -547,8 +573,8 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c if (buffer->resource.heap_memory) return buffer->resource.heap_memory; - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - ERR("Failed to allocate system memory.\n"); + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + return NULL; buffer_bind(buffer, context); GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory));

1 0

Józef Kucia : wined3d: Introduce wined3d_buffer_load_location().
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 645d3cac14b1303d0152ac6463586ce147c25b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=645d3cac14b1303d0152ac646… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:51 2016 +0200 wined3d: Introduce wined3d_buffer_load_location(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 558be1b..94b290f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -564,25 +564,67 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, } } -/* Context activation is done by the caller. */ -BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; - /* Heap_memory exists if the buffer is double buffered or has no buffer object at all. */ - if (buffer->resource.heap_memory) - return buffer->resource.heap_memory; + TRACE("buffer %p, context %p, location %s.\n", + buffer, context, wined3d_debug_location(location)); + + if (buffer->locations & location) + { + TRACE("Location (%#x) is already up to date.\n", location); + return WINED3D_OK; + } + + if (!buffer->locations) + { + ERR("Buffer %p does not have any up to date location.\n", buffer); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_DISCARDED); + return wined3d_buffer_load_location(buffer, context, location); + } + + TRACE("Current buffer location %s.\n", wined3d_debug_location(buffer->locations)); + + if (!wined3d_buffer_prepare_location(buffer, context, location)) + return FALSE; + + if (buffer->locations & WINED3D_LOCATION_DISCARDED) + { + TRACE("Buffer previously discarded, nothing to do.\n"); + wined3d_buffer_validate_location(buffer, location); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); + return TRUE; + } + + switch (location) + { + case WINED3D_LOCATION_SYSMEM: + buffer_bind(buffer, context); + GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, + buffer->resource.heap_memory)); + checkGLcall("buffer download"); + buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + break; - if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_SYSMEM)) - return NULL; + case WINED3D_LOCATION_BUFFER: + FIXME("Not implemented yet.\n"); + return FALSE; - buffer_bind(buffer, context); - GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); - checkGLcall("buffer download"); - buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + default: + ERR("Invalid location %s.\n", wined3d_debug_location(location)); + return FALSE; + } - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_validate_location(buffer, location); + return TRUE; +} +/* Context activation is done by the caller. */ +BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) +{ + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); return buffer->resource.heap_memory; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45a24f1..8001e5e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3185,6 +3185,8 @@ void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD 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; 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;

1 0

Józef Kucia : wined3d: Do not assume that WINED3D_LOCATION_SYSMEM is always valid for double buffered buffers.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 3c847a20c13d8037c5b1c83e1a112d61a1aa2b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c847a20c13d8037c5b1c83e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:52 2016 +0200 wined3d: Do not assume that WINED3D_LOCATION_SYSMEM is always valid for double buffered buffers. We now have API that allows invalidating locations for buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 94b290f..4a4d367 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -975,13 +975,13 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (!buffer->conversion_map) { /* That means that there is nothing to fixup. Just upload from - * buffer->resource.heap_memory directly into the vbo. Do not + * buffer->resource.heap_memory directly into the BO. Do not * free the system memory copy because drawPrimitive may need it if * the stride is 0, for instancing emulation, vertex blending * emulation or shader emulation. */ TRACE("No conversion needed.\n"); - /* Nothing to do because we locked directly into the vbo */ + /* Nothing to do because heap memory exists if the buffer is double buffer or has no BO at all. */ if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) return; @@ -1056,6 +1056,8 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) { + struct wined3d_device *device = buffer->resource.device; + struct wined3d_context *context; LONG count; BYTE *base; @@ -1087,6 +1089,13 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) { + if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) + { + context = context_acquire(device, NULL); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + context_release(context); + } + if (!(flags & WINED3D_MAP_READONLY)) wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); } @@ -1097,8 +1106,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (count == 1) { - struct wined3d_device *device = buffer->resource.device; - struct wined3d_context *context; const struct wined3d_gl_info *gl_info; context = context_acquire(device, NULL); @@ -1254,6 +1261,11 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ dst_buffer_mem = dst_buffer->resource.heap_memory; src_buffer_mem = src_buffer->resource.heap_memory; + if (dst_buffer_mem && (dst_offset || size != dst_buffer->resource.size)) + wined3d_buffer_load_location(dst_buffer, context, WINED3D_LOCATION_SYSMEM); + if (src_buffer_mem) + wined3d_buffer_load_location(src_buffer, context, WINED3D_LOCATION_SYSMEM); + if (!dst_buffer_mem && !src_buffer_mem) { if (gl_info->supported[ARB_COPY_BUFFER])

1 0

Józef Kucia : wined3d: Move buffer_get_memory() under wined3d_buffer_load_sysmem().
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 8db3b5512e034ee448bbbb7631e4cd79cc362edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db3b5512e034ee448bbbb763… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:53 2016 +0200 wined3d: Move buffer_get_memory() under wined3d_buffer_load_sysmem(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4a4d367..8f356d8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -504,31 +504,6 @@ static inline unsigned int fixup_transformed_pos(float *p) return 4 * sizeof(*p); } -/* Context activation is done by the caller. */ -void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, - struct wined3d_bo_address *data) -{ - data->buffer_object = buffer->buffer_object; - if (!buffer->buffer_object) - { - if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) - { - buffer_create_buffer_object(buffer, context); - if (buffer->buffer_object) - { - data->buffer_object = buffer->buffer_object; - data->addr = NULL; - return; - } - } - data->addr = buffer->resource.heap_memory; - } - else - { - data->addr = NULL; - } -} - ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedIncrement(&buffer->resource.ref); @@ -628,6 +603,31 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } +/* Context activation is done by the caller. */ +void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, + struct wined3d_bo_address *data) +{ + data->buffer_object = buffer->buffer_object; + if (!buffer->buffer_object) + { + if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) + { + buffer_create_buffer_object(buffer, context); + if (buffer->buffer_object) + { + data->buffer_object = buffer->buffer_object; + data->addr = NULL; + return; + } + } + data->addr = buffer->resource.heap_memory; + } + else + { + data->addr = NULL; + } +} + static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource);

1 0

Józef Kucia : wined3d: Implement wined3d_buffer_prepare_location() for WINED3D_LOCATION_BUFFER.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 4e7ef680e3cecaeccb96a0e827f97019efa751cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7ef680e3cecaeccb96a0e82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:54 2016 +0200 wined3d: Implement wined3d_buffer_prepare_location() for WINED3D_LOCATION_BUFFER. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 104 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8f356d8..e559586 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -162,20 +162,20 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g } /* Context activation is done by the caller. */ -static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) +static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wined3d_context *context) { - GLenum gl_usage = GL_STATIC_DRAW_ARB; - GLenum error; const struct wined3d_gl_info *gl_info = context->gl_info; + GLenum gl_usage = GL_STATIC_DRAW; + GLenum error; - TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", - This, debug_d3dusage(This->resource.usage)); + TRACE("Creating an OpenGL buffer object for wined3d_buffer %p with usage %s.\n", + buffer, debug_d3dusage(buffer->resource.usage)); /* Make sure that the gl error is cleared. Do not use checkGLcall - * here because checkGLcall just prints a fixme and continues. However, - * if an error during VBO creation occurs we can fall back to non-vbo operation - * with full functionality(but performance loss) - */ + * here because checkGLcall just prints a fixme and continues. However, + * if an error during VBO creation occurs we can fall back to non-VBO operation + * with full functionality(but performance loss). + */ while (gl_info->gl_ops.gl.p_glGetError() != GL_NO_ERROR); /* Basically the FVF parameter passed to CreateVertexBuffer is no good. @@ -184,72 +184,72 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine * to be verified to check if the rhw and color values are in the correct * format. */ - GL_EXTCALL(glGenBuffers(1, &This->buffer_object)); + GL_EXTCALL(glGenBuffers(1, &buffer->buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); - if (!This->buffer_object || error != GL_NO_ERROR) + if (!buffer->buffer_object || error != GL_NO_ERROR) { - ERR("Failed to create a VBO with error %s (%#x)\n", debug_glerror(error), error); + ERR("Failed to create a BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - buffer_bind(This, context); + buffer_bind(buffer, context); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { - ERR("Failed to bind the VBO with error %s (%#x)\n", debug_glerror(error), error); + ERR("Failed to bind the BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - if (This->resource.usage & WINED3DUSAGE_DYNAMIC) + if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) { TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); gl_usage = GL_STREAM_DRAW_ARB; - if(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); - checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)"); - This->flags |= WINED3D_BUFFER_APPLESYNC; + GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + checkGLcall("glBufferParameteriAPPLE"); + buffer->flags |= WINED3D_BUFFER_APPLESYNC; } - /* No setup is needed here for GL_ARB_map_buffer_range */ + /* No setup is needed here for GL_ARB_map_buffer_range. */ } /* Reserve memory for the buffer. The amount of data won't change * so we are safe with calling glBufferData once and * calling glBufferSubData on updates. Upload the actual data in case - * we're not double buffering, so we can release the heap mem afterwards + * we're not double buffering, so we can release the heap mem afterwards. */ - GL_EXTCALL(glBufferData(This->buffer_type_hint, This->resource.size, This->resource.heap_memory, gl_usage)); + GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, buffer->resource.heap_memory, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { - ERR("glBufferData failed with error %s (%#x)\n", debug_glerror(error), error); + ERR("glBufferData failed with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - This->buffer_object_usage = gl_usage; + buffer->buffer_object_usage = gl_usage; - if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) { - buffer_invalidate_bo_range(This, 0, 0); + buffer_invalidate_bo_range(buffer, 0, 0); } else { - wined3d_resource_free_sysmem(&This->resource); - wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); - wined3d_buffer_invalidate_location(This, WINED3D_LOCATION_SYSMEM); + wined3d_resource_free_sysmem(&buffer->resource); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); } - return; + return TRUE; fail: - /* Clean up all VBO init, but continue because we can work without a VBO :-) */ - ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur.\n"); - This->flags &= ~WINED3D_BUFFER_USE_BO; - delete_gl_buffer(This, gl_info); - buffer_clear_dirty_areas(This); + /* Clean up all BO init, but continue because we can work without a BO :-) */ + ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; + delete_gl_buffer(buffer, gl_info); + buffer_clear_dirty_areas(buffer); + return FALSE; } static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, @@ -530,8 +530,15 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; case WINED3D_LOCATION_BUFFER: - FIXME("Not implemented yet.\n"); - return FALSE; + if (buffer->buffer_object) + return TRUE; + + if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); + return FALSE; + } + return buffer_create_buffer_object(buffer, context); default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); @@ -612,7 +619,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co { if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) { - buffer_create_buffer_object(buffer, context); + wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); if (buffer->buffer_object) { data->buffer_object = buffer->buffer_object; @@ -878,20 +885,15 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * buffer_mark_used(buffer); - if (!buffer->buffer_object) + /* TODO: Make converting independent from VBOs */ + if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) { - /* TODO: Make converting independent from VBOs */ - if (buffer->flags & WINED3D_BUFFER_USE_BO) - { - buffer_create_buffer_object(buffer, context); - } - else - { - /* Not doing any conversion */ - return; - } + /* Not doing any conversion */ + return; } + wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); + /* Reading the declaration makes only sense if we have valid state information * (i.e., if this function is called during draws). */ if (state)

1 0

Józef Kucia : wined3d: Introduce wined3d_buffer_get_memory().
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 2e15ae85a1f7f0799a296cd8b7627a4ec5e2db3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e15ae85a1f7f0799a296cd8b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:57 2016 +0200 wined3d: Introduce wined3d_buffer_get_memory(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 26 +++++++++++++++++++++++++- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e559586..86493db 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -611,7 +611,7 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c } /* Context activation is done by the caller. */ -void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, +static void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) { data->buffer_object = buffer->buffer_object; @@ -635,6 +635,30 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co } } +void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, + struct wined3d_bo_address *data, DWORD locations) +{ + TRACE("buffer %p, data %p, locations %s.\n", + buffer, data, wined3d_debug_location(locations)); + + if (locations & WINED3D_LOCATION_BUFFER) + { + data->buffer_object = buffer->buffer_object; + data->addr = NULL; + return; + } + if (locations & WINED3D_LOCATION_SYSMEM) + { + data->buffer_object = 0; + data->addr = buffer->resource.heap_memory; + return; + } + + ERR("Unexpected locations %s.\n", wined3d_debug_location(locations)); + data->buffer_object = 0; + data->addr = NULL; +} + static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1ca12bc..88d34e6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3201,7 +3201,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { wined3d_buffer_load(buffer, context, state); - buffer_get_memory(buffer, context, &data); + wined3d_buffer_get_memory(buffer, &data, buffer->locations); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8001e5e..4e7bb88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3179,9 +3179,9 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, - struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, + struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Prefer current locations to WINED3D_LOCATION_SYSMEM in wined3d_buffer_copy ().
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 6ced2a82930f11a80695ff0a3290e6125af52cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ced2a82930f11a80695ff0a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:58 2016 +0200 wined3d: Prefer current locations to WINED3D_LOCATION_SYSMEM in wined3d_buffer_copy(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 71 ++++++++++++--------------------------------------- 1 file changed, 17 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 86493db..eae55e1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -111,12 +111,6 @@ static void wined3d_buffer_invalidate_range(struct wined3d_buffer *buffer, DWORD TRACE("buffer %p, location %s, offset %u, size %u.\n", buffer, wined3d_debug_location(location), offset, size); - if ((offset || size) && (location & ~WINED3D_LOCATION_BUFFER)) - { - ERR("Range can be invalidated only for WINED3D_LOCATION_BUFFER.\n"); - return; - } - if (location & WINED3D_LOCATION_BUFFER) buffer_invalidate_bo_range(buffer, offset, size); @@ -610,31 +604,6 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } -/* Context activation is done by the caller. */ -static void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, - struct wined3d_bo_address *data) -{ - data->buffer_object = buffer->buffer_object; - if (!buffer->buffer_object) - { - if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) - { - wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); - if (buffer->buffer_object) - { - data->buffer_object = buffer->buffer_object; - data->addr = NULL; - return; - } - } - data->addr = buffer->resource.heap_memory; - } - else - { - data->addr = NULL; - } -} - void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) { @@ -1269,11 +1238,12 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) 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) { - BYTE *dst_buffer_mem, *src_buffer_mem, *dst_ptr, *src_ptr; - struct wined3d_bo_address dst_bo_address, src_bo_address; const struct wined3d_gl_info *gl_info; + struct wined3d_bo_address dst, src; struct wined3d_context *context; struct wined3d_device *device; + BYTE *dst_ptr, *src_ptr; + DWORD dst_location; HRESULT hr; device = dst_buffer->resource.device; @@ -1281,24 +1251,17 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ context = context_acquire(device, NULL); gl_info = context->gl_info; - buffer_get_memory(dst_buffer, context, &dst_bo_address); - buffer_get_memory(src_buffer, context, &src_bo_address); - - dst_buffer_mem = dst_buffer->resource.heap_memory; - src_buffer_mem = src_buffer->resource.heap_memory; - - if (dst_buffer_mem && (dst_offset || size != dst_buffer->resource.size)) - wined3d_buffer_load_location(dst_buffer, context, WINED3D_LOCATION_SYSMEM); - if (src_buffer_mem) - wined3d_buffer_load_location(src_buffer, context, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); + wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); - if (!dst_buffer_mem && !src_buffer_mem) + if (dst.buffer_object && src.buffer_object) { if (gl_info->supported[ARB_COPY_BUFFER]) { - GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src_bo_address.buffer_object)); - GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst_bo_address.buffer_object)); - GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, src_offset, dst_offset, size)); + GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src.buffer_object)); + GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst.buffer_object)); + GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, + src_offset, dst_offset, size)); checkGLcall("direct buffer copy"); } else @@ -1323,25 +1286,25 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ wined3d_buffer_unmap(dst_buffer); } } - else if (dst_buffer_mem && !src_buffer_mem) + else if (!dst.buffer_object && src.buffer_object) { buffer_bind(src_buffer, context); - GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst_buffer_mem + dst_offset)); + GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst.addr + dst_offset)); checkGLcall("buffer download"); } - else if (!dst_buffer_mem && src_buffer_mem) + else if (dst.buffer_object && !src.buffer_object) { buffer_bind(dst_buffer, context); - GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src_buffer_mem + src_offset)); + GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src.addr + src_offset)); checkGLcall("buffer upload"); } else { - memcpy(dst_buffer_mem + dst_offset, src_buffer_mem + src_offset, size); + memcpy(dst.addr + dst_offset, src.addr + src_offset, size); } - if (dst_buffer_mem) - wined3d_buffer_invalidate_range(dst_buffer, WINED3D_LOCATION_BUFFER, dst_offset, size); + dst_location = dst.buffer_object ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM; + wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); context_release(context); return WINED3D_OK;

1 0