June 2018 - Wine-commits - list.winehq.org

Hua Meng : msvcp120: Add test for Concurrent_vector_copy.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: b6c7b2d322e0cd61eaeaac0d936dfc78c850f61b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c7b2d322e0cd61eaeaac0d… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Sat Jun 16 00:07:04 2018 +0800 msvcp120: Add test for Concurrent_vector_copy. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 50 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 1247222..c34bd65 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -26,6 +26,7 @@ DWORD expect_idx; static int vector_alloc_count; +static int vector_elem_count; #define DEFINE_EXPECT(func) \ BOOL expect_ ## func, called_ ## func @@ -38,6 +39,7 @@ struct expect_struct { DEFINE_EXPECT(queue_char__Assign_and_destroy_item); DEFINE_EXPECT(concurrent_vector_int_alloc); DEFINE_EXPECT(concurrent_vector_int_destroy); + DEFINE_EXPECT(concurrent_vector_int_copy); }; #define SET_EXPECT(func) \ @@ -110,6 +112,8 @@ static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); +static void * (WINAPI *call_thiscall_func4)( void *func, void *this, const void *a, + const void *b, const void *c ); static void init_thiscall_thunk(void) { @@ -123,18 +127,22 @@ static void init_thiscall_thunk(void) call_thiscall_func1 = (void *)thunk; call_thiscall_func2 = (void *)thunk; call_thiscall_func3 = (void *)thunk; + call_thiscall_func4 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ (const void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c)) #else #define init_thiscall_thunk() #define call_func1(func,_this) func(_this) #define call_func2(func,_this,a) func(_this,a) #define call_func3(func,_this,a,b) func(_this,a,b) +#define call_func4(func,_this,a,b,c) func(_this,a,b,c) #endif /* __i386__ */ static inline float __port_infinity(void) @@ -382,6 +390,8 @@ static void* (__thiscall *p_vector_base_v4__Internal_push_back)( vector_base_v4*, size_t, size_t*); static size_t (__thiscall *p_vector_base_v4__Internal_clear)( vector_base_v4*, void (__cdecl*)(void*, size_t)); +static void (__thiscall *p_vector_base_v4__Internal_copy)( + vector_base_v4*, vector_base_v4*, size_t, void (__cdecl*)(void*, const void*, size_t)); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -524,6 +534,8 @@ static BOOL init(void) "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KAEA_K(a)Z"); SET(p_vector_base_v4__Internal_clear, "?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_KP6AXPEAX_K(a)Z@Z"); + SET(p_vector_base_v4__Internal_copy, + "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEBV123(a)_KP6AXPEAXPEBX1@Z(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -635,6 +647,8 @@ static BOOL init(void) "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIAAI(a)Z"); SET(p_vector_base_v4__Internal_clear, "?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIP6AXPAXI(a)Z@Z"); + SET(p_vector_base_v4__Internal_copy, + "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXPBXI@Z(a)Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -674,6 +688,8 @@ static BOOL init(void) "?_Internal_push_back(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIAAI(a)Z"); SET(p_vector_base_v4__Internal_clear, "?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIP6AXPAXI(a)Z@Z"); + SET(p_vector_base_v4__Internal_copy, + "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXABV123(a)IP6AXPAXPBXI@Z(a)Z"); #endif } SET(p__Thrd_equal, @@ -2459,6 +2475,8 @@ static void* __cdecl concurrent_vector_int_alloc(vector_base_v4 *this, size_t n) static void __cdecl concurrent_vector_int_destroy(void *ptr, size_t n) { CHECK_EXPECT2(concurrent_vector_int_destroy); + ok(vector_elem_count >= n, "invalid destroy\n"); + vector_elem_count -= n; memset(ptr, 0xff, sizeof(int)*n); } @@ -2484,6 +2502,13 @@ static void concurrent_vector_int_dtor(vector_base_v4 *this) call_func1(p_vector_base_v4_dtor, this); } +static void __cdecl concurrent_vector_int_copy(void *dst, const void *src, size_t n) +{ + CHECK_EXPECT2(concurrent_vector_int_copy); + vector_elem_count += n; + memcpy(dst, src, n*sizeof(int)); +} + static void test_queue_base_v4(void) { queue_base_v4 queue; @@ -2677,7 +2702,7 @@ static void test_queue_base_v4(void) static void test_vector_base_v4(void) { - vector_base_v4 vector; + vector_base_v4 vector, v2; size_t idx, size; int *data; @@ -2695,6 +2720,7 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_alloc); ok(data != NULL, "_Internal_push_back returned NULL\n"); ok(idx == 0, "idx got %ld expected %d\n", (long)idx, 0); + vector_elem_count++; *data = 1; ok(data == vector.storage[0], "vector.storage[0] got %p expected %p\n", vector.storage[0], data); @@ -2709,6 +2735,7 @@ static void test_vector_base_v4(void) data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); ok(data != NULL, "_Internal_push_back returned NULL\n"); ok(idx == 1, "idx got %ld expected 1\n", (long)idx); + vector_elem_count++; *data = 2; ok(vector.first_block == 1, "vector.first_block got %ld expected 1\n", (long)vector.first_block); @@ -2723,6 +2750,7 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_alloc); ok(data != NULL, "_Internal_push_back returned NULL\n"); ok(idx == 2, "idx got %ld expected 2\n", (long)idx); + vector_elem_count++; *data = 3; ok(vector.first_block == 1, "vector.first_block got %ld expected 1\n", (long)vector.first_block); @@ -2735,6 +2763,7 @@ static void test_vector_base_v4(void) data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); ok(data != NULL, "_Internal_push_back returned NULL\n"); ok(idx == 3, "idx got %ld expected 3\n", (long)idx); + vector_elem_count++; *data = 4; size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 4, "size of vector got %ld expected 4\n", (long)size); @@ -2744,10 +2773,28 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_alloc); ok(data != NULL, "_Internal_push_back returned NULL\n"); ok(idx == 4, "idx got %ld expected 2\n", (long)idx); + vector_elem_count++; *data = 5; size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 8, "size of vector got %ld expected 8\n", (long)size); + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + call_func4(p_vector_base_v4__Internal_copy, &v2, &vector, + sizeof(int), concurrent_vector_int_copy); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(v2.first_block == 3, "v2.first_block got %ld expected 3\n", + (long)v2.first_block); + ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", + (long)v2.early_size); + + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy); @@ -2759,6 +2806,7 @@ static void test_vector_base_v4(void) (long)vector.early_size); concurrent_vector_int_dtor(&vector); + ok(!vector_elem_count, "vector_elem_count = %d, expected 0\n", vector_elem_count); ok(!vector_alloc_count, "vector_alloc_count = %d, expected 0\n", vector_alloc_count); }

1 0

Matteo Bruni : wined3d: Generate shader epilogue before conditional returns.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: 346e8cf8ee0b14b896e1dd39ad71aa8a9bffceee URL: https://source.winehq.org/git/wine.git/?a=commit;h=346e8cf8ee0b14b896e1dd39… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 12 18:41:11 2018 +0200 wined3d: Generate shader epilogue before conditional returns. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a99762b..86259ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5131,20 +5131,20 @@ static void shader_glsl_default(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "default:\n"); } -static void shader_glsl_generate_conditional_op(const struct wined3d_shader_instruction *ins, - const char *op) +static void shader_glsl_generate_condition(const struct wined3d_shader_instruction *ins) { struct glsl_src_param src_param; const char *condition; condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) %s\n", condition, src_param.param_str, op); + shader_addline(ins->ctx->buffer, "if (%s(%s))\n", condition, src_param.param_str); } static void shader_glsl_if(const struct wined3d_shader_instruction *ins) { - shader_glsl_generate_conditional_op(ins, "{"); + shader_glsl_generate_condition(ins); + shader_addline(ins->ctx->buffer, "{\n"); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins) @@ -5203,15 +5203,29 @@ static void shader_glsl_conditional_op(const struct wined3d_shader_instruction * switch (ins->handler_idx) { - case WINED3DSIH_BREAKP: op = "break;"; break; - case WINED3DSIH_CONTINUEP: op = "continue;"; break; - case WINED3DSIH_RETP: op = "return;"; break; + case WINED3DSIH_BREAKP: + op = "break;"; + break; + case WINED3DSIH_CONTINUEP: + op = "continue;"; + break; + case WINED3DSIH_RETP: + op = "return;"; + break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; } - shader_glsl_generate_conditional_op(ins, op); + shader_glsl_generate_condition(ins); + if (ins->handler_idx == WINED3DSIH_RETP) + { + shader_addline(ins->ctx->buffer, "{\n"); + shader_glsl_generate_shader_epilogue(ins->ctx); + } + shader_addline(ins->ctx->buffer, " %s\n", op); + if (ins->handler_idx == WINED3DSIH_RETP) + shader_addline(ins->ctx->buffer, "}\n"); } static void shader_glsl_continue(const struct wined3d_shader_instruction *ins) @@ -6764,7 +6778,8 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { if (ins->ctx->reg_maps->shader_version.major >= 4) { - shader_glsl_generate_conditional_op(ins, "discard;"); + shader_glsl_generate_condition(ins); + shader_addline(ins->ctx->buffer, " discard;\n"); } else {

1 0

Matteo Bruni : wined3d: Set stream stride and offset even when buffer is NULL.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: 11f9cac435468e6b2320330077a8c4591e47ea48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f9cac435468e6b23203300… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 12 18:41:15 2018 +0200 wined3d: Set stream stride and offset even when buffer is NULL. Signed-off-by: Matteo Bruni <mbruni(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 | 4 ++-- dlls/d3d11/tests/d3d11.c | 3 --- dlls/d3d8/device.c | 8 ++++++++ dlls/d3d9/device.c | 8 ++++++++ dlls/d3d9/tests/device.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 4 ++-- dlls/wined3d/device.c | 6 ++---- 8 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 2687ec5..8fba7a3 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5493,8 +5493,8 @@ float4 main(float4 color : COLOR) : SV_TARGET for (i = 0; i < D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) { ok(!tmp_buffer[i], "Got unexpected vertex buffer %p in slot %u.\n", tmp_buffer[i], i); - todo_wine ok(!stride[i], "Got unexpected stride %u in slot %u.\n", stride[i], i); - todo_wine ok(!offset[i], "Got unexpected offset %u in slot %u.\n", offset[i], i); + ok(!stride[i], "Got unexpected stride %u in slot %u.\n", stride[i], i); + ok(!offset[i], "Got unexpected offset %u in slot %u.\n", offset[i], i); } ID3D10Device_IAGetIndexBuffer(device, tmp_buffer, &format, offset); ok(!tmp_buffer[0], "Got unexpected index buffer %p.\n", tmp_buffer[0]); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c641372..ee8d465 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10647,11 +10647,8 @@ static void test_clear_state(void) for (i = 0; i < D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) { ok(!tmp_buffer[i], "Got unexpected vertex buffer %p in slot %u.\n", tmp_buffer[i], i); - todo_wine_if(i < D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT) - { ok(!stride[i], "Got unexpected stride %u in slot %u.\n", stride[i], i); ok(!offset[i], "Got unexpected offset %u in slot %u.\n", offset[i], i); - } } ID3D11DeviceContext_IAGetIndexBuffer(context, tmp_buffer, &format, offset); ok(!tmp_buffer[0], "Got unexpected index buffer %p.\n", tmp_buffer[0]); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 616886b..e4869c2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3102,6 +3102,14 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *iface, iface, stream_idx, buffer, stride); wined3d_mutex_lock(); + if (!stride) + { + struct wined3d_buffer *wined3d_buffer; + unsigned int cur_offset; + + hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, + &cur_offset, &stride); + } hr = wined3d_device_set_stream_source(device->wined3d_device, stream_idx, buffer_impl ? buffer_impl->wined3d_buffer : NULL, 0, stride); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5d0f507..e32bc14 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3348,6 +3348,14 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, iface, stream_idx, buffer, offset, stride); wined3d_mutex_lock(); + if (!stride) + { + struct wined3d_buffer *wined3d_buffer; + unsigned int cur_offset; + + hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, + &cur_offset, &stride); + } hr = wined3d_device_set_stream_source(device->wined3d_device, stream_idx, buffer_impl ? buffer_impl->wined3d_buffer : NULL, offset, stride); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b71058d..66bf5b0 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2973,7 +2973,7 @@ static void test_draw_primitive(void) ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); ok(!current_vb, "Unexpected vb %p.\n", current_vb); ok(!offset, "Unexpected offset %u.\n", offset); - todo_wine ok(!stride, "Unexpected stride %u.\n", stride); + ok(!stride, "Unexpected stride %u.\n", stride); /* NULL index buffer, valid vertex declaration, NULL stream source. */ hr = IDirect3DDevice9_SetIndices(device, NULL); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1e213ab..95982e0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -23132,7 +23132,7 @@ static void test_drawindexedprimitiveup(void) ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); ok(!vb, "Unexpected vb %p.\n", vb); ok(!offset, "Unexpected offset %u.\n", offset); - todo_wine ok(!stride, "Unexpected stride %u.\n", stride); + ok(!stride, "Unexpected stride %u.\n", stride); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 2bf92cd..cd61d76 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -480,8 +480,8 @@ float4 main(float4 color : COLOR) : SV_TARGET for (i = 0; i < D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) { ok(!tmp_buffer[i], "Got unexpected vertex buffer %p in slot %u.\n", tmp_buffer[i], i); - todo_wine ok(!stride[i], "Got unexpected stride %u in slot %u.\n", stride[i], i); - todo_wine ok(!offset[i], "Got unexpected offset %u in slot %u.\n", offset[i], i); + ok(!stride[i], "Got unexpected stride %u in slot %u.\n", stride[i], i); + ok(!offset[i], "Got unexpected offset %u in slot %u.\n", offset[i], i); } ID3D10Device_IAGetIndexBuffer(device, tmp_buffer, &format, offset); ok(!tmp_buffer[0], "Got unexpected index buffer %p.\n", tmp_buffer[0]); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8ef74b6..6776c5c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1389,12 +1389,10 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI } stream->buffer = buffer; + stream->stride = stride; + stream->offset = offset; if (buffer) - { - stream->stride = stride; - stream->offset = offset; wined3d_buffer_incref(buffer); - } if (!device->recording) wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride);

1 0

Józef Kucia : d3d11: Normalize 1D texture view descriptions.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: f9a66eb40d4cba2db73d91efcf7259038e53f27a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9a66eb40d4cba2db73d91ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 13 12:23:58 2018 +0200 d3d11: Normalize 1D texture view 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/d3d11/view.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 80c4888..164a183 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -132,6 +132,8 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res { case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { + const struct d3d_texture1d *texture; + if (desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE1DARRAY) { @@ -139,8 +141,15 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res return E_INVALIDARG; } - FIXME("Unhandled 1D texture resource.\n"); - return S_OK; + if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture1D.\n"); + return E_FAIL; + } + + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; + break; } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: @@ -344,6 +353,8 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { + const struct d3d_texture1d *texture; + if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1DARRAY) { @@ -351,8 +362,15 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res return E_INVALIDARG; } - FIXME("Unhandled 1D texture resource.\n"); - return S_OK; + if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture1D.\n"); + return E_FAIL; + } + + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; + break; } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: @@ -626,6 +644,8 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { + const struct d3d_texture1d *texture; + if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1DARRAY) { @@ -633,8 +653,16 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R return E_INVALIDARG; } - FIXME("Unhandled 1D texture resource.\n"); - return S_OK; + if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture1D.\n"); + return E_FAIL; + } + + format = texture->desc.Format; + miplevel_count = texture->desc.MipLevels; + layer_count = texture->desc.ArraySize; + break; } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: @@ -871,6 +899,8 @@ static HRESULT normalize_uav_desc(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11 case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { + const struct d3d_texture1d *texture; + if (desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE1DARRAY) { @@ -878,8 +908,15 @@ static HRESULT normalize_uav_desc(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11 return E_INVALIDARG; } - FIXME("Unhandled 1D texture resource.\n"); - return S_OK; + if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture1D.\n"); + return E_FAIL; + } + + format = texture->desc.Format; + layer_count = texture->desc.ArraySize; + break; } case D3D11_RESOURCE_DIMENSION_TEXTURE2D:

1 0

Józef Kucia : wined3d: Get rid of WINED3DCAPS typedef.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: ec42ed4e1815d96a92a66197b872c97a7182a233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec42ed4e1815d96a92a66197… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 13 12:23:59 2018 +0200 wined3d: Get rid of WINED3DCAPS typedef. 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 | 2 +- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/directx.c | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 8 ++++---- dlls/dxgi/utils.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- include/wine/wined3d.h | 8 ++++---- 12 files changed, 21 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec42ed4e1815d96a92a6…

1 0

Józef Kucia : wined3d: Remove "Reserved" fields from wined3d_caps.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: e825ec4a13a99cf7eb5003266939d72b6987de1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e825ec4a13a99cf7eb500326… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 13 12:24:00 2018 +0200 wined3d: Remove "Reserved" fields from wined3d_caps. 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> --- include/wine/wined3d.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d1282d7..0f388ab 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1944,7 +1944,6 @@ struct wined3d_caps DWORD DevCaps2; float MaxNpatchTessellationLevel; - DWORD Reserved5; /* undocumented */ UINT MasterAdapterOrdinal; UINT AdapterOrdinalInGroup; @@ -1959,8 +1958,6 @@ struct wined3d_caps DWORD MaxPShaderInstructionsExecuted; DWORD MaxVertexShader30InstructionSlots; DWORD MaxPixelShader30InstructionSlots; - DWORD Reserved2; /* Not in the microsoft headers but documented */ - DWORD Reserved3; struct wined3d_ddraw_caps ddraw_caps;

1 0

Józef Kucia : wined3d: Store feature level in d3d_info.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: 7b58d1a0077c226ffd191f15ee2fe77790f7deea URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b58d1a0077c226ffd191f15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 13 12:24:01 2018 +0200 wined3d: Store feature level in d3d_info. 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/directx.c | 107 ++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 14 ++++++ 2 files changed, 62 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b58d1a0077c226ffd19…

1 0

Józef Kucia : wined3d: Expose feature level in wined3d caps.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: 98ef3c88606953ac9ddd84dfcefccbc43a5fdbb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98ef3c88606953ac9ddd84df… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 13 12:24:02 2018 +0200 wined3d: Expose feature level in wined3d caps. 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/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 13 ------------- include/wine/wined3d.h | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7046060..9ecc4ed 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6190,6 +6190,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->shader_double_precision = d3d_info->shader_double_precision; + caps->max_feature_level = d3d_info->feature_level; + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0188846..9aa7081 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -184,19 +184,6 @@ struct wined3d_ffp_attrib_ops wined3d_generic_attrib_func generic[WINED3D_FFP_EMIT_COUNT]; }; -enum wined3d_feature_level -{ - WINED3D_FEATURE_LEVEL_5, - WINED3D_FEATURE_LEVEL_6, - WINED3D_FEATURE_LEVEL_7, - WINED3D_FEATURE_LEVEL_8, - WINED3D_FEATURE_LEVEL_9_SM2, - WINED3D_FEATURE_LEVEL_9_SM3, - WINED3D_FEATURE_LEVEL_10, - WINED3D_FEATURE_LEVEL_11, - WINED3D_FEATURE_LEVEL_COUNT -}; - struct wined3d_d3d_info { struct wined3d_d3d_limits limits; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0f388ab..239ccd8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -88,6 +88,19 @@ enum wined3d_device_type WINED3D_DEVICE_TYPE_NULLREF = 4, }; +enum wined3d_feature_level +{ + WINED3D_FEATURE_LEVEL_5, + WINED3D_FEATURE_LEVEL_6, + WINED3D_FEATURE_LEVEL_7, + WINED3D_FEATURE_LEVEL_8, + WINED3D_FEATURE_LEVEL_9_SM2, + WINED3D_FEATURE_LEVEL_9_SM3, + WINED3D_FEATURE_LEVEL_10, + WINED3D_FEATURE_LEVEL_11, + WINED3D_FEATURE_LEVEL_COUNT +}; + enum wined3d_degree_type { WINED3D_DEGREE_LINEAR = 1, @@ -1962,6 +1975,8 @@ struct wined3d_caps struct wined3d_ddraw_caps ddraw_caps; BOOL shader_double_precision; + + enum wined3d_feature_level max_feature_level; }; struct wined3d_color_key

1 0

Józef Kucia : dxgi: Get supported feature levels from wined3d caps.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: 25d4a110cb0bb7eb8d386c7ab2b7b52e057768a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25d4a110cb0bb7eb8d386c7a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 13 12:24:03 2018 +0200 dxgi: Get supported feature levels from wined3d caps. 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/dxgi/utils.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index a305281..aed62a4 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -626,21 +626,20 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, { static const struct { - D3D_FEATURE_LEVEL feature_level; - unsigned int sm; + D3D_FEATURE_LEVEL d3d; + enum wined3d_feature_level wined3d; } - feature_levels_sm[] = + wined3d_feature_levels[] = { - {D3D_FEATURE_LEVEL_11_1, 5}, - {D3D_FEATURE_LEVEL_11_0, 5}, - {D3D_FEATURE_LEVEL_10_1, 4}, - {D3D_FEATURE_LEVEL_10_0, 4}, - {D3D_FEATURE_LEVEL_9_3, 3}, - {D3D_FEATURE_LEVEL_9_2, 2}, - {D3D_FEATURE_LEVEL_9_1, 2}, + {D3D_FEATURE_LEVEL_11_1, WINED3D_FEATURE_LEVEL_11}, + {D3D_FEATURE_LEVEL_11_0, WINED3D_FEATURE_LEVEL_11}, + {D3D_FEATURE_LEVEL_10_1, WINED3D_FEATURE_LEVEL_10}, + {D3D_FEATURE_LEVEL_10_0, WINED3D_FEATURE_LEVEL_10}, + {D3D_FEATURE_LEVEL_9_3, WINED3D_FEATURE_LEVEL_9_SM3}, + {D3D_FEATURE_LEVEL_9_2, WINED3D_FEATURE_LEVEL_9_SM2}, + {D3D_FEATURE_LEVEL_9_1, WINED3D_FEATURE_LEVEL_9_SM2}, }; D3D_FEATURE_LEVEL selected_feature_level = 0; - unsigned int shader_model; struct wined3d_caps caps; unsigned int i, j; HRESULT hr; @@ -652,18 +651,17 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, if (FAILED(hr)) level_count = 0; - shader_model = min(caps.VertexShaderVersion, caps.PixelShaderVersion); for (i = 0; i < level_count; ++i) { - for (j = 0; j < ARRAY_SIZE(feature_levels_sm); ++j) + for (j = 0; j < ARRAY_SIZE(wined3d_feature_levels); ++j) { - if (feature_levels[i] == feature_levels_sm[j].feature_level) + if (feature_levels[i] == wined3d_feature_levels[j].d3d) { - if (shader_model >= feature_levels_sm[j].sm) + if (caps.max_feature_level >= wined3d_feature_levels[j].wined3d) { selected_feature_level = feature_levels[i]; - TRACE("Choosing supported feature level %s (SM%u).\n", - debug_feature_level(selected_feature_level), feature_levels_sm[j].sm); + TRACE("Choosing supported feature level %s.\n", + debug_feature_level(selected_feature_level)); } break; } @@ -671,7 +669,7 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, if (selected_feature_level) break; - if (j == ARRAY_SIZE(feature_levels_sm)) + if (j == ARRAY_SIZE(wined3d_feature_levels)) FIXME("Unexpected feature level %#x.\n", feature_levels[i]); else TRACE("Feature level %s not supported, trying next fallback if available.\n",

1 0

Zebediah Figura : dbghelp: Determine the target Mach-O architecture from the process's architecture.
by Alexandre Julliard 15 Jun '18

15 Jun '18

Module: wine Branch: master Commit: f0ee3471f369bc3d3911647c7efa63fc503e6ce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0ee3471f369bc3d3911647c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 14 16:58:13 2018 -0500 dbghelp: Determine the target Mach-O architecture from the process's architecture. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/macho_module.c | 66 +++++++++++++++++++++--------------------- dlls/dbghelp/module.c | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0ee3471f369bc3d3911…

1 0