March 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : scrrun: Support BYREF types for integer keys.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: f70ddf76140fd808996c726d1ce3495081f78467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70ddf76140fd808996c726d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 08:19:12 2015 +0300 scrrun: Support BYREF types for integer keys. --- dlls/scrrun/dictionary.c | 9 ++++++--- dlls/scrrun/tests/dictionary.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 2dc5d2c..cce8a37 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -795,14 +795,17 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_BSTR: V_I4(hash) = get_str_hash(get_key_strptr(key), This->method); break; + case VT_UI1|VT_BYREF: case VT_UI1: - V_I4(hash) = get_num_hash(V_UI1(key)); + V_I4(hash) = get_num_hash(V_VT(key) & VT_BYREF ? *V_UI1REF(key) : V_UI1(key)); break; + case VT_I2|VT_BYREF: case VT_I2: - V_I4(hash) = get_num_hash(V_I2(key)); + V_I4(hash) = get_num_hash(V_VT(key) & VT_BYREF ? *V_I2REF(key) : V_I2(key)); break; + case VT_I4|VT_BYREF: case VT_I4: - V_I4(hash) = get_num_hash(V_I4(key)); + V_I4(hash) = get_num_hash(V_VT(key) & VT_BYREF ? *V_I4REF(key) : V_I4(key)); break; case VT_UNKNOWN|VT_BYREF: case VT_DISPATCH|VT_BYREF: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index f53222f..e1c80f9 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -429,6 +429,10 @@ static void test_hash_value(void) ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); for (i = 0; i < sizeof(int_hash_tests)/sizeof(int_hash_tests[0]); i++) { + SHORT i2; + BYTE ui1; + LONG i4; + expected = get_num_hash(int_hash_tests[i]); V_VT(&key) = VT_I2; @@ -440,6 +444,16 @@ static void test_hash_value(void) ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + i2 = int_hash_tests[i]; + V_VT(&key) = VT_I2|VT_BYREF; + V_I2REF(&key) = &i2; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + V_VT(&key) = VT_I4; V_I4(&key) = int_hash_tests[i]; VariantInit(&hash); @@ -449,6 +463,16 @@ static void test_hash_value(void) ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + i4 = int_hash_tests[i]; + V_VT(&key) = VT_I4|VT_BYREF; + V_I4REF(&key) = &i4; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + expected = get_num_hash((FLOAT)(BYTE)int_hash_tests[i]); V_VT(&key) = VT_UI1; V_UI1(&key) = int_hash_tests[i]; @@ -458,6 +482,16 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + + ui1 = int_hash_tests[i]; + V_VT(&key) = VT_UI1|VT_BYREF; + V_UI1REF(&key) = &ui1; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); } /* nan */

1 0

Bruno Jesus : winmm/tests: Add a basic joystick interactive test.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 47ab17595b3b3fc2058ec1c033ccde9b765a2780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ab17595b3b3fc2058ec1c03… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 22 11:51:12 2015 -0300 winmm/tests: Add a basic joystick interactive test. --- dlls/winmm/tests/joystick.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 21e90e3..2f235fa 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -195,6 +195,35 @@ static void test_api(void) ret = joyGetPosEx(joyid, &infoex.ex); ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); } + + /* the interactive tests spans for 15 seconds, a 500ms polling is used to get + * changes in the joystick. */ + if (winetest_interactive) + { +#define MAX_TIME 15000 + DWORD tick = GetTickCount(), spent; + infoex.ex.dwSize = sizeof(infoex.ex); + infoex.ex.dwFlags = JOY_RETURNALL; + do + { + spent = GetTickCount() - tick; + ret = joyGetPosEx(joyid, &infoex.ex); + if (ret == JOYERR_NOERROR) + { + trace("X: %5d, Y: %5d, Z: %5d, POV: %5d\n", + infoex.ex.dwXpos, infoex.ex.dwYpos, infoex.ex.dwZpos, infoex.ex.dwPOV); + trace("R: %5d, U: %5d, V: %5d\n", + infoex.ex.dwRpos, infoex.ex.dwUpos, infoex.ex.dwVpos); + trace("BUTTONS: 0x%04X, BUTTON_COUNT: %2d, REMAINING: %d ms\n\n", + infoex.ex.dwButtons, infoex.ex.dwButtonNumber, MAX_TIME - spent); + } + Sleep(500); + } + while (spent < MAX_TIME); +#undef MAX_TIME + } + else + skip("Skipping interactive tests for the joystick\n"); } START_TEST(joystick)

1 0

Henri Verbeet : wined3d: Store shader output signatures as a wined3d_shader_signature structure.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 2e5ad1b6e327c5be4d2dc9abe02ebf92dcf2bf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5ad1b6e327c5be4d2dc9abe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:12 2015 +0100 wined3d: Store shader output signatures as a wined3d_shader_signature structure. Instead of a fixed array of wined3d_shader_signature_element structures. Shader model 4 shaders can have different semantics in a single register, e.g. v1.xy TEXCOORD0 and v1.zw TEXCOORD1, so having a single wined3d_shader_signature_element structure per register isn't necessarily sufficient. --- dlls/wined3d/arb_program_shader.c | 98 +++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 72 ++++++++++++++------------ dlls/wined3d/shader.c | 105 ++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 167 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e5ad1b6e327c5be4d2dc…

1 0

Henri Verbeet : wined3d: Store shader input signatures as a wined3d_shader_signature structure.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 002713de6d6afed8f1483316fd32fbfc0956b338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=002713de6d6afed8f1483316f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:13 2015 +0100 wined3d: Store shader input signatures as a wined3d_shader_signature structure. --- dlls/wined3d/arb_program_shader.c | 182 ++++++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 62 ++++++------- dlls/wined3d/shader.c | 144 +++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 226 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=002713de6d6afed8f1483…

1 0

Henri Verbeet : wined3d: Merge some common shader initialization code into shader_init().
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: f3765e9f77af2d3e036255099aa4fbf026709f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3765e9f77af2d3e036255099… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:14 2015 +0100 wined3d: Merge some common shader initialization code into shader_init(). --- dlls/wined3d/shader.c | 206 ++++++++++++++++++++++---------------------------- 1 file changed, 90 insertions(+), 116 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9425ac4..f162fb5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -331,17 +331,6 @@ int shader_addline(struct wined3d_shader_buffer *buffer, const char *format, ... return ret; } -static void shader_init(struct wined3d_shader *shader, struct wined3d_device *device, - void *parent, const struct wined3d_parent_ops *parent_ops) -{ - shader->ref = 1; - shader->device = device; - shader->parent = parent; - shader->parent_ops = parent_ops; - list_init(&shader->linked_programs); - list_add_head(&device->shaders, &shader->shader_list_entry); -} - /* Convert floating point offset relative to a register file to an absolute * offset for float constants. */ static unsigned int shader_get_float_offset(enum wined3d_shader_register_type register_type, UINT register_idx) @@ -2199,74 +2188,121 @@ BOOL vshader_get_input(const struct wined3d_shader *shader, return FALSE; } -static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_device *device, - const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +static HRESULT shader_signature_copy(struct wined3d_shader_signature *dst, + const struct wined3d_shader_signature *src, char **signature_strings) { - struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + struct wined3d_shader_signature_element *e; + unsigned int i; + SIZE_T len; + char *ptr; + + ptr = *signature_strings; + + dst->element_count = src->element_count; + if (!(dst->elements = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst->elements) * dst->element_count))) + return E_OUTOFMEMORY; + + for (i = 0; i < src->element_count; ++i) + { + e = &src->elements[i]; + dst->elements[i] = *e; + + len = strlen(e->semantic_name); + memcpy(ptr, e->semantic_name, len + 1); + dst->elements[i].semantic_name = ptr; + ptr += len + 1; + } + + *signature_strings = ptr; + + return WINED3D_OK; +} + +static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, + const struct wined3d_shader_desc *desc, DWORD float_const_count, enum wined3d_shader_type type, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + struct wined3d_shader_signature_element *e; + SIZE_T total, len; unsigned int i; HRESULT hr; - const DWORD vs_uniform_count = device->adapter->d3d_info.limits.vs_uniform_count; + char *ptr; if (!desc->byte_code) return WINED3DERR_INVALIDCALL; - shader_init(shader, device, parent, parent_ops); + shader->ref = 1; + shader->device = device; + shader->parent = parent; + shader->parent_ops = parent_ops; - if (desc->output_signature) + total = 0; + if (desc->input_signature) { - struct wined3d_shader_signature_element *e; - SIZE_T total, len; - char *ptr; - - total = 0; - for (i = 0; i < desc->output_signature->element_count; ++i) + for (i = 0; i < desc->input_signature->element_count; ++i) { - e = &desc->output_signature->elements[i]; + e = &desc->input_signature->elements[i]; len = strlen(e->semantic_name); if (len >= ~(SIZE_T)0 - total) - { - shader_cleanup(shader); return E_OUTOFMEMORY; - } total += len + 1; } - - if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - ptr = shader->signature_strings; - - shader->output_signature.element_count = desc->output_signature->element_count; - if (!(shader->output_signature.elements = HeapAlloc(GetProcessHeap(), 0, - sizeof(*shader->output_signature.elements) * shader->output_signature.element_count))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - + } + if (desc->output_signature) + { for (i = 0; i < desc->output_signature->element_count; ++i) { e = &desc->output_signature->elements[i]; - shader->output_signature.elements[i] = *e; - len = strlen(e->semantic_name); - memcpy(ptr, e->semantic_name, len + 1); - shader->output_signature.elements[i].semantic_name = ptr; - ptr += len + 1; + if (len >= ~(SIZE_T)0 - total) + return E_OUTOFMEMORY; + + total += len + 1; } } + if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total))) + return E_OUTOFMEMORY; + ptr = shader->signature_strings; + + if (desc->input_signature && FAILED(hr = shader_signature_copy(&shader->input_signature, + desc->input_signature, &ptr))) + { + HeapFree(GetProcessHeap(), 0, shader->signature_strings); + return hr; + } + if (desc->output_signature && FAILED(hr = shader_signature_copy(&shader->output_signature, + desc->output_signature, &ptr))) + { + HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); + HeapFree(GetProcessHeap(), 0, shader->signature_strings); + return hr; + } + + list_init(&shader->linked_programs); + list_add_head(&device->shaders, &shader->shader_list_entry); if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->output_signature, - vs_uniform_count, WINED3D_SHADER_TYPE_VERTEX, desc->max_version))) + float_const_count, type, desc->max_version))) { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); - return hr; } + return hr; +} + +static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_device *device, + const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + unsigned int i; + HRESULT hr; + + if (FAILED(hr = shader_init(shader, device, desc, device->adapter->d3d_info.limits.vs_uniform_count, + WINED3D_SHADER_TYPE_VERTEX, parent, parent_ops))) + return hr; + for (i = 0; i < shader->input_signature.element_count; ++i) { const struct wined3d_shader_signature_element *input = &shader->input_signature.elements[i]; @@ -2290,14 +2326,9 @@ static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d { HRESULT hr; - shader_init(shader, device, parent, parent_ops); - if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->output_signature, - 0, WINED3D_SHADER_TYPE_GEOMETRY, desc->max_version))) - { - WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup(shader); + if (FAILED(hr = shader_init(shader, device, desc, 0, + WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) return hr; - } shader->load_local_constsF = shader->lconst_inf_or_nan; @@ -2486,67 +2517,10 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; unsigned int i, highest_reg_used = 0, num_regs_used = 0; HRESULT hr; - const DWORD ps_uniform_count = device->adapter->d3d_info.limits.ps_uniform_count; - - if (!desc->byte_code) - return WINED3DERR_INVALIDCALL; - - shader_init(shader, device, parent, parent_ops); - - if (desc->input_signature) - { - struct wined3d_shader_signature_element *e; - SIZE_T total, len; - char *ptr; - - total = 0; - for (i = 0; i < desc->input_signature->element_count; ++i) - { - e = &desc->input_signature->elements[i]; - len = strlen(e->semantic_name); - if (len >= ~(SIZE_T)0 - total) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - - total += len + 1; - } - - if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - ptr = shader->signature_strings; - - shader->input_signature.element_count = desc->input_signature->element_count; - if (!(shader->input_signature.elements = HeapAlloc(GetProcessHeap(), 0, - sizeof(*shader->input_signature.elements) * shader->input_signature.element_count))) - { - shader_cleanup(shader); - return E_OUTOFMEMORY; - } - - for (i = 0; i < desc->input_signature->element_count; ++i) - { - e = &desc->input_signature->elements[i]; - shader->input_signature.elements[i] = *e; - - len = strlen(e->semantic_name); - memcpy(ptr, e->semantic_name, len + 1); - shader->input_signature.elements[i].semantic_name = ptr; - ptr += len + 1; - } - } - if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->output_signature, - ps_uniform_count, WINED3D_SHADER_TYPE_PIXEL, desc->max_version))) - { - WARN("Failed to set function, hr %#x.\n", hr); - shader_cleanup(shader); + if (FAILED(hr = shader_init(shader, device, desc, device->adapter->d3d_info.limits.ps_uniform_count, + WINED3D_SHADER_TYPE_PIXEL, parent, parent_ops))) return hr; - } for (i = 0; i < MAX_REG_INPUT; ++i) {

1 0

Henri Verbeet : wined3d: Take the input slot into account when handling WINED3D_APPEND_ALIGNED_ELEMENT.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: cbe717b8f3429a4ca30c1ac6276902cf486f1c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe717b8f3429a4ca30c1ac62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:15 2015 +0100 wined3d: Take the input slot into account when handling WINED3D_APPEND_ALIGNED_ELEMENT. --- dlls/wined3d/vertexdeclaration.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index df3d8ba..97992d6 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -218,14 +218,18 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (e->offset == WINED3D_APPEND_ALIGNED_ELEMENT) { - if (!i) - { - e->offset = 0; - } - else + const struct wined3d_vertex_declaration_element *prev; + unsigned int j; + + e->offset = 0; + for (j = 1; j <= i; ++j) { - struct wined3d_vertex_declaration_element *prev = &declaration->elements[i - 1]; - e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + prev = &declaration->elements[i - j]; + if (prev->input_slot == e->input_slot) + { + e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + break; + } } }

1 0

Henri Verbeet : d3d10core: Also pass unused input layout elements to wined3d.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 88f230b56e13c26e4b7a2040bc103850ef6f0078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f230b56e13c26e4b7a2040b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 23 09:17:16 2015 +0100 d3d10core: Also pass unused input layout elements to wined3d. While these won't be used by the shader, they potentially affect the calculated offset for WINED3D_APPEND_ALIGNED_ELEMENT elements. --- dlls/d3d10core/inputlayout.c | 41 +++++++++++++++++++--------------------- dlls/d3d9/vertexdeclaration.c | 2 +- dlls/wined3d/context.c | 6 +++++- dlls/wined3d/vertexdeclaration.c | 2 +- include/wine/wined3d.h | 3 +++ 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index bb3e4c5..fa08822 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -41,7 +41,7 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, - struct wined3d_vertex_element **wined3d_elements, UINT *wined3d_element_count) + struct wined3d_vertex_element **wined3d_elements) { struct wined3d_shader_signature is; HRESULT hr; @@ -61,33 +61,32 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME HeapFree(GetProcessHeap(), 0, is.elements); return E_OUTOFMEMORY; } - *wined3d_element_count = 0; for (i = 0; i < element_count; ++i) { + struct wined3d_vertex_element *e = &(*wined3d_elements)[i]; + const D3D10_INPUT_ELEMENT_DESC *f = &element_descs[i]; UINT j; + e->format = wined3dformat_from_dxgi_format(f->Format); + e->input_slot = f->InputSlot; + e->offset = f->AlignedByteOffset; + e->output_slot = WINED3D_OUTPUT_SLOT_UNUSED; + e->method = WINED3D_DECL_METHOD_DEFAULT; + e->usage = 0; + e->usage_idx = 0; + + if (f->InputSlotClass != D3D10_INPUT_PER_VERTEX_DATA) + FIXME("Ignoring input slot class (%#x)\n", f->InputSlotClass); + if (f->InstanceDataStepRate) + FIXME("Ignoring instance data step rate (%#x)\n", f->InstanceDataStepRate); + for (j = 0; j < is.element_count; ++j) { if (!strcmp(element_descs[i].SemanticName, is.elements[j].semantic_name) && element_descs[i].SemanticIndex == is.elements[j].semantic_idx) { - struct wined3d_vertex_element *e = &(*wined3d_elements)[(*wined3d_element_count)++]; - const D3D10_INPUT_ELEMENT_DESC *f = &element_descs[i]; - - e->format = wined3dformat_from_dxgi_format(f->Format); - e->input_slot = f->InputSlot; - e->offset = f->AlignedByteOffset; e->output_slot = is.elements[j].register_idx; - e->method = WINED3D_DECL_METHOD_DEFAULT; - e->usage = 0; - e->usage_idx = 0; - - if (f->InputSlotClass != D3D10_INPUT_PER_VERTEX_DATA) - FIXME("Ignoring input slot class (%#x)\n", f->InputSlotClass); - if (f->InstanceDataStepRate) - FIXME("Ignoring instance data step rate (%#x)\n", f->InstanceDataStepRate); - break; } } @@ -225,23 +224,21 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ const void *shader_byte_code, SIZE_T shader_byte_code_length) { struct wined3d_vertex_element *wined3d_elements; - UINT wined3d_element_count; HRESULT hr; layout->ID3D10InputLayout_iface.lpVtbl = &d3d10_input_layout_vtbl; layout->refcount = 1; wined3d_private_store_init(&layout->private_store); - hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, - shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); - if (FAILED(hr)) + if (FAILED(hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, + shader_byte_code, shader_byte_code_length, &wined3d_elements))) { WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); wined3d_private_store_cleanup(&layout->private_store); return hr; } - hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, wined3d_element_count, + hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, element_count, layout, &d3d10_input_layout_wined3d_parent_ops, &layout->wined3d_decl); HeapFree(GetProcessHeap(), 0, wined3d_elements); if (FAILED(hr)) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 502b7d3..086ac70 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -353,7 +353,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem (*wined3d_elements)[i].format = d3d_dtype_lookup[d3d9_elements[i].Type].format; (*wined3d_elements)[i].input_slot = d3d9_elements[i].Stream; (*wined3d_elements)[i].offset = d3d9_elements[i].Offset; - (*wined3d_elements)[i].output_slot = ~0U; + (*wined3d_elements)[i].output_slot = WINED3D_OUTPUT_SLOT_SEMANTIC; (*wined3d_elements)[i].method = d3d9_elements[i].Method; (*wined3d_elements)[i].usage = d3d9_elements[i].Usage; (*wined3d_elements)[i].usage_idx = d3d9_elements[i].UsageIndex; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9cc68ab..894e259 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2771,7 +2771,11 @@ void context_stream_info_from_declaration(struct wined3d_context *context, if (use_vshader) { - if (element->output_slot == ~0U) + if (element->output_slot == WINED3D_OUTPUT_SLOT_UNUSED) + { + stride_used = FALSE; + } + else if (element->output_slot == WINED3D_OUTPUT_SLOT_SEMANTIC) { /* TODO: Assuming vertexdeclarations are usually used with the * same or a similar shader, it might be worth it to store the diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 97992d6..df54bdc 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -296,7 +296,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].format = format_id; elements[idx].input_slot = 0; elements[idx].offset = offset; - elements[idx].output_slot = 0; + elements[idx].output_slot = WINED3D_OUTPUT_SLOT_SEMANTIC; elements[idx].method = WINED3D_DECL_METHOD_DEFAULT; elements[idx].usage = usage; elements[idx].usage_idx = usage_idx; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6905585..b576e1a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1496,6 +1496,9 @@ enum wined3d_display_rotation #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff +#define WINED3D_OUTPUT_SLOT_SEMANTIC 0xffffffff +#define WINED3D_OUTPUT_SLOT_UNUSED 0xfffffffe + struct wined3d_display_mode { UINT width;

1 0

Stefan Dösinger : ddraw: Update the palette before presents to the NULL window.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 02be2e38a8e3ff783132b675dabbfe41173841d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02be2e38a8e3ff783132b675d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 20 12:47:10 2015 +0100 ddraw: Update the palette before presents to the NULL window. --- dlls/ddraw/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b8c9872..0d2d731 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -81,6 +81,8 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE ERR("Failed to get surface DC, hr %#x.\n", hr); return hr; } + if (surface->palette) + wined3d_palette_apply_to_dc(surface->palette->wineD3DPalette, surface_dc); if (!(screen_dc = GetDC(NULL))) {

1 0

Stefan Dösinger : ddraw/tests: The testbot applies color keying without a key.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: daf3e8a0dcde52b33af53db7d540af5e4e913306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf3e8a0dcde52b33af53db7d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 20 12:47:11 2015 +0100 ddraw/tests: The testbot applies color keying without a key. --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index f59355e..ca61f13 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6211,14 +6211,24 @@ static void test_texturemapblend(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* WARP (Win8 testbot) emulates color keying with the alpha channel like Wine does, + * but even applies it when there's no color key assigned. The surface alpha is zero + * here, so nothing gets drawn. + * + * The ddraw2 version of this test draws these quads with color keying off due to + * different defaults in ddraw1 and ddraw2. */ color = get_surface_color(rt, 5, 5); - ok(compare_color(color, 0x00ff0040, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0040, 2) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 5); - ok(compare_color(color, 0x00ff0080, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ff0080, 2) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 5, 245); - ok(compare_color(color, 0x00800080, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00800080, 2) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 245); - ok(compare_color(color, 0x008000ff, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x008000ff, 2) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); IDirect3DTexture_Release(texture); ref = IDirectDrawSurface_Release(surface);

1 0

Stefan Dösinger : ddraw/tests: Correct executebuffer offsets.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 70c6666d1e84d2e602e0c51a89ff6aaea7f1d76a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c6666d1e84d2e602e0c51a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 20 12:47:12 2015 +0100 ddraw/tests: Correct executebuffer offsets. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ca61f13..68821e4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6189,7 +6189,7 @@ static void test_texturemapblend(void) memcpy(exec_desc.lpData, test2_quads, sizeof(test2_quads)); - ptr = ((BYTE *)exec_desc.lpData) + sizeof(test1_quads); + ptr = ((BYTE *)exec_desc.lpData) + sizeof(test2_quads); emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 8); emit_set_rs(&ptr, D3DRENDERSTATE_ALPHABLENDENABLE, FALSE); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); @@ -6202,7 +6202,7 @@ static void test_texturemapblend(void) inst_length -= sizeof(test2_quads); hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); - set_execute_data(execute_buffer, 8, sizeof(test1_quads), inst_length); + set_execute_data(execute_buffer, 8, sizeof(test2_quads), inst_length); hr = IDirect3DDevice_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr);

1 0