wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Józef Kucia : wined3d: Recognize SM5 imm_atomic_alloc opcode.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 7d5be69365a6fe2623667324984d98d0501ac5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5be69365a6fe26236673249… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:48 2016 +0200 wined3d: Recognize SM5 imm_atomic_alloc opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 94e19f7..35fa23f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5294,6 +5294,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMAD */ NULL, /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, + /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0489507..dfcf5cf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8628,6 +8628,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMAD */ shader_glsl_mad, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, + /* WINED3DSIH_IMM_ATOMIC_ALLOC */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 00c6028..b8adca1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -126,6 +126,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMAD */ "imad", /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", + /* WINED3DSIH_IMM_ATOMIC_ALLOC */ "imm_atomic_alloc", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c685e87..6793883 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -226,6 +226,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, WINED3D_SM5_OP_STORE_STRUCTURED = 0xa8, + WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, }; @@ -777,6 +778,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ef2414..2669275 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -634,6 +634,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMAD, WINED3DSIH_IMAX, WINED3DSIH_IMIN, + WINED3DSIH_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMUL, WINED3DSIH_INE,

1 0

Józef Kucia : d3d11: Replace "This" with "device".
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 18069aaa019a6b60bb9fd22266f0a9b3403700cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18069aaa019a6b60bb9fd2226… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:47 2016 +0200 d3d11: Replace "This" with "device". 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/d3d11/device.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0e4ef97..843639a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2867,20 +2867,20 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device1 *iface, REFIID riid, void **ppv) { - struct d3d_device *This = impl_from_ID3D10Device(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); + struct d3d_device *device = impl_from_ID3D10Device(iface); + return IUnknown_QueryInterface(device->outer_unk, riid, ppv); } static ULONG STDMETHODCALLTYPE d3d10_device_AddRef(ID3D10Device1 *iface) { - struct d3d_device *This = impl_from_ID3D10Device(iface); - return IUnknown_AddRef(This->outer_unk); + struct d3d_device *device = impl_from_ID3D10Device(iface); + return IUnknown_AddRef(device->outer_unk); } static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device1 *iface) { - struct d3d_device *This = impl_from_ID3D10Device(iface); - return IUnknown_Release(This->outer_unk); + struct d3d_device *device = impl_from_ID3D10Device(iface); + return IUnknown_Release(device->outer_unk); } /* ID3D10Device methods */ @@ -2928,13 +2928,13 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device1 *iface, ID3D10PixelShader *shader) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_pixel_shader *ps = unsafe_impl_from_ID3D10PixelShader(shader); TRACE("iface %p, shader %p\n", iface, shader); wined3d_mutex_lock(); - wined3d_device_set_pixel_shader(This->wined3d_device, ps ? ps->wined3d_shader : NULL); + wined3d_device_set_pixel_shader(device->wined3d_device, ps ? ps->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -2961,40 +2961,40 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device1 *iface, ID3D10VertexShader *shader) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_vertex_shader *vs = unsafe_impl_from_ID3D10VertexShader(shader); TRACE("iface %p, shader %p\n", iface, shader); wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(This->wined3d_device, vs ? vs->wined3d_shader : NULL); + wined3d_device_set_vertex_shader(device->wined3d_device, vs ? vs->wined3d_shader : NULL); wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_DrawIndexed(ID3D10Device1 *iface, UINT index_count, UINT start_index_location, INT base_vertex_location) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); wined3d_mutex_lock(); - wined3d_device_set_base_vertex_index(This->wined3d_device, base_vertex_location); - wined3d_device_draw_indexed_primitive(This->wined3d_device, start_index_location, index_count); + wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); + wined3d_device_draw_indexed_primitive(device->wined3d_device, start_index_location, index_count); wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_Draw(ID3D10Device1 *iface, UINT vertex_count, UINT start_vertex_location) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, vertex_count %u, start_vertex_location %u\n", iface, vertex_count, start_vertex_location); wined3d_mutex_lock(); - wined3d_device_draw_primitive(This->wined3d_device, start_vertex_location, vertex_count); + wined3d_device_draw_primitive(device->wined3d_device, start_vertex_location, vertex_count); wined3d_mutex_unlock(); } @@ -3021,13 +3021,13 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device1 *iface, ID3D10InputLayout *input_layout) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_input_layout *layout = unsafe_impl_from_ID3D10InputLayout(input_layout); TRACE("iface %p, input_layout %p\n", iface, input_layout); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(This->wined3d_device, + wined3d_device_set_vertex_declaration(device->wined3d_device, layout ? layout->wined3d_decl : NULL); wined3d_mutex_unlock(); } @@ -3035,7 +3035,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device1 *iface static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device1 *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p\n", @@ -3046,7 +3046,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device1 *ifa { struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - wined3d_device_set_stream_source(This->wined3d_device, start_slot + i, + wined3d_device_set_stream_source(device->wined3d_device, start_slot + i, buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); } wined3d_mutex_unlock(); @@ -3055,14 +3055,14 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device1 *ifa static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device1 *iface, ID3D10Buffer *buffer, DXGI_FORMAT format, UINT offset) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_buffer *buffer_impl = unsafe_impl_from_ID3D10Buffer(buffer); TRACE("iface %p, buffer %p, format %s, offset %u.\n", iface, buffer, debug_dxgi_format(format), offset); wined3d_mutex_lock(); - wined3d_device_set_index_buffer(This->wined3d_device, + wined3d_device_set_index_buffer(device->wined3d_device, buffer_impl ? buffer_impl->wined3d_buffer : NULL, wined3dformat_from_dxgi_format(format), offset); wined3d_mutex_unlock(); @@ -3137,12 +3137,12 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device1 *iface, ID3 static void STDMETHODCALLTYPE d3d10_device_IASetPrimitiveTopology(ID3D10Device1 *iface, D3D10_PRIMITIVE_TOPOLOGY topology) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, topology %s\n", iface, debug_d3d10_primitive_topology(topology)); wined3d_mutex_lock(); - wined3d_device_set_primitive_type(This->wined3d_device, (enum wined3d_primitive_type)topology); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)topology); wined3d_mutex_unlock(); } @@ -3794,12 +3794,12 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device1 *iface, ID3 static void STDMETHODCALLTYPE d3d10_device_IAGetPrimitiveTopology(ID3D10Device1 *iface, D3D10_PRIMITIVE_TOPOLOGY *topology) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, topology %p\n", iface, topology); wined3d_mutex_lock(); - wined3d_device_get_primitive_type(This->wined3d_device, (enum wined3d_primitive_type *)topology); + wined3d_device_get_primitive_type(device->wined3d_device, (enum wined3d_primitive_type *)topology); wined3d_mutex_unlock(); }

1 0

Józef Kucia : d3d11: Rename set_{ds, rt, sr}desc_from_resource() functions.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 599aa89fb0c45a4b272c017a1086867898c987b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599aa89fb0c45a4b272c017a1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:46 2016 +0200 d3d11: Rename set_{ds, rt, sr}desc_from_resource() functions. 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/d3d11/view.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index c5263ef..122253c 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT set_dsv_desc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; @@ -114,7 +114,7 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 } default: - FIXME("Unhandled resource dimension %#x.\n", dimension); + ERR("Unhandled resource dimension %#x.\n", dimension); case D3D11_RESOURCE_DIMENSION_BUFFER: case D3D11_RESOURCE_DIMENSION_TEXTURE3D: return E_INVALIDARG; @@ -204,7 +204,7 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res return S_OK; } -static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT set_rtv_desc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; HRESULT hr; @@ -438,7 +438,7 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res return S_OK; } -static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT set_srv_desc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; @@ -551,7 +551,7 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I } default: - FIXME("Unhandled resource dimension %#x.\n", dimension); + ERR("Unhandled resource dimension %#x.\n", dimension); case D3D11_RESOURCE_DIMENSION_BUFFER: return E_INVALIDARG; } @@ -1043,7 +1043,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st if (!desc) { - hr = set_dsdesc_from_resource(&view->desc, resource); + hr = set_dsv_desc_from_resource(&view->desc, resource); } else { @@ -1466,7 +1466,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st if (!desc) { - hr = set_rtdesc_from_resource(&view->desc, resource); + hr = set_rtv_desc_from_resource(&view->desc, resource); } else { @@ -1935,7 +1935,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi if (!desc) { - hr = set_srdesc_from_resource(&view->desc, resource); + hr = set_srv_desc_from_resource(&view->desc, resource); } else {

1 0

Józef Kucia : d3d10core/tests: Add test for invalid DSV descriptions.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 348507522d0bc1527a5387c0a8b02c4a85dab040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348507522d0bc1527a5387c0a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:45 2016 +0200 d3d10core/tests: Add test for invalid DSV descriptions. 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/d3d10core/tests/device.c | 145 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 118 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=348507522d0bc1527a538…

1 0

Józef Kucia : d3d10core/tests: Add test for invalid RTV descriptions.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 8929be2c2378d7075c05e7518647989fdfe82f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8929be2c2378d7075c05e7518… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:44 2016 +0200 d3d10core/tests: Add test for invalid RTV descriptions. 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/d3d10core/tests/device.c | 163 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 147 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8929be2c2378d7075c05e…

1 0

Józef Kucia : d3d10core/tests: Add test for invalid SRV descriptions.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 09dbd7bef831929bd81bcabc00b584d44761ad66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dbd7bef831929bd81bcabc0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:43 2016 +0200 d3d10core/tests: Add test for invalid SRV descriptions. 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/d3d10core/tests/device.c | 279 +++++++++++++++++++++++++++++++++++------- 1 file changed, 232 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09dbd7bef831929bd81bc…

1 0

Józef Kucia : wined3d: Avoid calling wined3d_rendertarget_view_create() with WINED3DFMT_UNKNOWN.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: f36eea56e40d76925137c461652f462efa68dc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36eea56e40d76925137c4616… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:42 2016 +0200 wined3d: Avoid calling wined3d_rendertarget_view_create() with WINED3DFMT_UNKNOWN. 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/device.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e515916..5ba128d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1041,13 +1041,14 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (swapchain_desc->backbuffer_count) { + struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; struct wined3d_rendertarget_view_desc view_desc; - view_desc.format_id = swapchain_desc->backbuffer_format; + view_desc.format_id = back_buffer->format->id; view_desc.u.texture.level_idx = 0; view_desc.u.texture.layer_idx = 0; view_desc.u.texture.layer_count = 1; - if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, &swapchain->back_buffers[0]->resource, + if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, back_buffer, NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); @@ -4865,11 +4866,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } if (swapchain->desc.backbuffer_count) { - view_desc.format_id = swapchain_desc->backbuffer_format; + struct wined3d_resource *back_buffer = &swapchain->back_buffers[0]->resource; + + view_desc.format_id = back_buffer->format->id; view_desc.u.texture.level_idx = 0; view_desc.u.texture.layer_idx = 0; view_desc.u.texture.layer_count = 1; - if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, &swapchain->back_buffers[0]->resource, + if (FAILED(hr = wined3d_rendertarget_view_create(&view_desc, back_buffer, NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr);

1 0

Alex Henrie : ucrtbase: Implement _realloc_base.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 8a69c5d81f8deb472df18a8e16e57efef2eb9a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a69c5d81f8deb472df18a8e1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 16 18:02:26 2016 -0600 ucrtbase: Implement _realloc_base. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 418926e..0a99e87 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -18,7 +18,7 @@ @ cdecl _msize(ptr) ucrtbase._msize @ stub _query_new_handler @ stub _query_new_mode -@ stub _realloc_base +@ cdecl _realloc_base(ptr long) ucrtbase._realloc_base @ cdecl _recalloc(ptr long long) ucrtbase._recalloc @ cdecl _set_new_mode(long) ucrtbase._set_new_mode @ cdecl calloc(long long) ucrtbase.calloc diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 8a84802..3ae2599 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -460,6 +460,14 @@ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) } /********************************************************************* + * _realloc_base (UCRTBASE.@) + */ +void* CDECL _realloc_base(void* ptr, MSVCRT_size_t size) +{ + return MSVCRT_realloc(ptr, size); +} + +/********************************************************************* * _recalloc (MSVCR100.@) */ void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ff21fb3..64f6276 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1859,7 +1859,7 @@ @ stub _query_new_handler @ stub _query_new_mode @ cdecl _read(long ptr long) MSVCRT__read -@ stub _realloc_base +@ cdecl _realloc_base(ptr long) @ cdecl _recalloc(ptr long long) @ cdecl _register_onexit_function(ptr ptr) MSVCRT__register_onexit_function @ stub _register_thread_local_exe_atexit_callback

1 0

Alex Henrie : ucrtbase: Implement _free_base.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: e4b8bc0edc640b36f2a2a26c53e18edea04fa74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b8bc0edc640b36f2a2a26c5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 16 18:02:25 2016 -0600 ucrtbase: Implement _free_base. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 6dbd207..418926e 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -9,7 +9,7 @@ @ cdecl _callnewh(long) ucrtbase._callnewh @ cdecl _calloc_base(long long) ucrtbase._calloc_base @ cdecl _expand(ptr long) ucrtbase._expand -@ stub _free_base +@ cdecl _free_base(ptr) ucrtbase._free_base @ cdecl _get_heap_handle() ucrtbase._get_heap_handle @ cdecl _heapchk() ucrtbase._heapchk @ cdecl _heapmin() ucrtbase._heapmin diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 5803f4a..8a84802 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -422,6 +422,14 @@ void CDECL MSVCRT_free(void* ptr) } /********************************************************************* + * _free_base (UCRTBASE.@) + */ +void CDECL _free_base(void* ptr) +{ + msvcrt_heap_free(ptr); +} + +/********************************************************************* * malloc (MSVCRT.@) */ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 551fcd7..ff21fb3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -333,7 +333,7 @@ @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s -@ stub _free_base +@ cdecl _free_base(ptr) @ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64

1 0

Alex Henrie : ucrtbase: Implement _malloc_base.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 5325b8c95112be75f4fa0e2e2e45bcc88434fb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5325b8c95112be75f4fa0e2e2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 16 18:02:24 2016 -0600 ucrtbase: Implement _malloc_base. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 85b2b83..6dbd207 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl _heapchk() ucrtbase._heapchk @ cdecl _heapmin() ucrtbase._heapmin @ cdecl _heapwalk(ptr) ucrtbase._heapwalk -@ stub _malloc_base +@ cdecl _malloc_base(long) ucrtbase._malloc_base @ cdecl _msize(ptr) ucrtbase._msize @ stub _query_new_handler @ stub _query_new_mode diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ae663de..5803f4a 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -433,6 +433,14 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) } /********************************************************************* + * _malloc_base (UCRTBASE.@) + */ +void* CDECL _malloc_base(MSVCRT_size_t size) +{ + return MSVCRT_malloc(size); +} + +/********************************************************************* * realloc (MSVCRT.@) */ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4ebf2c6..551fcd7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -580,7 +580,7 @@ @ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s @ cdecl _makepath(ptr str str str str) MSVCRT__makepath @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s -@ stub _malloc_base +@ cdecl _malloc_base(long) @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long)

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016