February 2017 - Wine-commits

Józef Kucia : d3d11/tests: Add test for ld_structured instruction.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 33c65ed0c57aa50608644911d601df59bf1bc446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c65ed0c57aa50608644911d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 26 18:47:59 2017 +0100 d3d11/tests: Add test for ld_structured instruction. 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/tests/d3d11.c | 132 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 106 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33c65ed0c57aa50608644…

1 0

Józef Kucia : wined3d: Allow swizzle on vThreadIDInGroupFlattened register.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: c07bfeb2b8d9573dbc7009ee80403053c93d5556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07bfeb2b8d9573dbc7009ee8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 26 18:48:00 2017 +0100 wined3d: Allow swizzle on vThreadIDInGroupFlattened register. 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/glsl_shader.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 28d1c15..26a6a06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2860,7 +2860,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_LOCALTHREADINDEX: - sprintf(register_name, "int(gl_LocalInvocationIndex)"); + sprintf(register_name, "ivec2(gl_LocalInvocationIndex, 0)"); break; case WINED3DSPR_THREADID: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ccef50..ec0fcbf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3672,7 +3672,6 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */ case WINED3DSPR_PRIMID: /* primID */ - case WINED3DSPR_LOCALTHREADINDEX: /* vThreadIDInGroupFlattened */ return TRUE; case WINED3DSPR_MISCTYPE:

1 0

Józef Kucia : wined3d: Use GL_ARB_shading_language_420pack for swizzle operations on scalars.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: a9fdb4a0990557cb590013a40a9bf9fec37fb177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fdb4a0990557cb590013a40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 26 18:48:01 2017 +0100 wined3d: Use GL_ARB_shading_language_420pack for swizzle operations on scalars. 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/glsl_shader.c | 7 ++++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2b4fa10..fd3e8bf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -152,6 +152,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, + {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, {"GL_ARB_shading_language_packing", ARB_SHADING_LANGUAGE_PACKING }, {"GL_ARB_shadow", ARB_SHADOW }, {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, @@ -3717,6 +3718,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADER_IMAGE_LOAD_STORE, MAKEDWORD_VERSION(4, 2)}, + {ARB_SHADING_LANGUAGE_420PACK, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADING_LANGUAGE_PACKING, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 26a6a06..7d7a7c6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2860,7 +2860,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_LOCALTHREADINDEX: - sprintf(register_name, "ivec2(gl_LocalInvocationIndex, 0)"); + if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) + sprintf(register_name, "int(gl_LocalInvocationIndex)"); + else + sprintf(register_name, "ivec2(gl_LocalInvocationIndex, 0)"); break; case WINED3DSPR_THREADID: @@ -6459,6 +6462,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_SIZE]) shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); + if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) + shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) shader_addline(buffer, "#extension GL_ARB_shading_language_packing : enable\n"); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index e500df6..396f93f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -85,6 +85,7 @@ enum wined3d_gl_extension ARB_SHADER_IMAGE_SIZE, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, + ARB_SHADING_LANGUAGE_420PACK, ARB_SHADING_LANGUAGE_PACKING, ARB_SHADOW, ARB_STENCIL_TEXTURING,

1 0

Józef Kucia : wined3d: Implement [imm_]atomic_{umax, umin} instructions for unsigned integers.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 0496c8c55904a593d460f1d9376be74a86e6f6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0496c8c55904a593d460f1d93… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 26 18:48:02 2017 +0100 wined3d: Implement [imm_]atomic_{umax, umin} instructions for unsigned integers. 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/tests/d3d11.c | 8 ++------ dlls/wined3d/glsl_shader.c | 26 ++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 329acd4..e7ac5a0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -13120,9 +13120,7 @@ static void test_atomic_instructions(void) todo_wine_if(expected != test->input[j] && (!strcmp(instructions[j], "atomic_imax") - || !strcmp(instructions[j], "atomic_imin") - || !strcmp(instructions[j], "atomic_umax") - || !strcmp(instructions[j], "atomic_umin"))) + || !strcmp(instructions[j], "atomic_imin"))) ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " "with inputs (%u, %u), (%d), %#x (%d).\n", i, value, value, expected, expected, instructions[j], @@ -13143,9 +13141,7 @@ static void test_atomic_instructions(void) for (j = 0; j < sizeof(instructions) / sizeof(*instructions); ++j) { BOOL todo_instruction = !strcmp(imm_instructions[j], "imm_atomic_imax") - || !strcmp(imm_instructions[j], "imm_atomic_imin") - || !strcmp(imm_instructions[j], "imm_atomic_umax") - || !strcmp(imm_instructions[j], "imm_atomic_umin"); + || !strcmp(imm_instructions[j], "imm_atomic_imin"); unsigned int out_value = get_readback_color(&out_rb, j, 0); unsigned int value = get_readback_color(&rb, j, 0); unsigned int expected = test->expected_result[j]; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d7a7c6..a2fcda3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5000,6 +5000,24 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IMM_ATOMIC_OR: op = "imageAtomicOr"; break; + case WINED3DSIH_ATOMIC_UMAX: + case WINED3DSIH_IMM_ATOMIC_UMAX: + op = "imageAtomicMax"; + if (data_type != WINED3D_DATA_UINT) + { + FIXME("Unhandled opcode %#x for signed integers.\n", ins->handler_idx); + return; + } + break; + case WINED3DSIH_ATOMIC_UMIN: + case WINED3DSIH_IMM_ATOMIC_UMIN: + op = "imageAtomicMin"; + if (data_type != WINED3D_DATA_UINT) + { + FIXME("Unhandled opcode %#x for signed integers.\n", ins->handler_idx); + return; + } + break; case WINED3DSIH_ATOMIC_XOR: case WINED3DSIH_IMM_ATOMIC_XOR: op = "imageAtomicXor"; @@ -9353,8 +9371,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_IMIN */ NULL, /* WINED3DSIH_ATOMIC_OR */ shader_glsl_atomic, - /* WINED3DSIH_ATOMIC_UMAX */ NULL, - /* WINED3DSIH_ATOMIC_UMIN */ NULL, + /* WINED3DSIH_ATOMIC_UMAX */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_UMIN */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_XOR */ shader_glsl_atomic, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ shader_glsl_bitwise_op, @@ -9470,8 +9488,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic, - /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, - /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMAX */ shader_glsl_atomic, + /* WINED3DSIH_IMM_ATOMIC_UMIN */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_XOR */ shader_glsl_atomic, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop,

1 0

Józef Kucia : wined3d: Implement [imm_]atomic_{imax, imin} instructions for signed integers.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: fedabd7dd77881750438a41b9aa58e248c507bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fedabd7dd77881750438a41b9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 26 18:48:03 2017 +0100 wined3d: Implement [imm_]atomic_{imax, imin} instructions for signed integers. 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/glsl_shader.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a2fcda3..025ba1d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4996,6 +4996,24 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IMM_ATOMIC_IADD: op = "imageAtomicAdd"; break; + case WINED3DSIH_ATOMIC_IMAX: + case WINED3DSIH_IMM_ATOMIC_IMAX: + op = "imageAtomicMax"; + if (data_type != WINED3D_DATA_INT) + { + FIXME("Unhandled opcode %#x for unsigned integers.\n", ins->handler_idx); + return; + } + break; + case WINED3DSIH_ATOMIC_IMIN: + case WINED3DSIH_IMM_ATOMIC_IMIN: + op = "imageAtomicMin"; + if (data_type != WINED3D_DATA_INT) + { + FIXME("Unhandled opcode %#x for unsigned integers.\n", ins->handler_idx); + return; + } + break; case WINED3DSIH_ATOMIC_OR: case WINED3DSIH_IMM_ATOMIC_OR: op = "imageAtomicOr"; @@ -9368,8 +9386,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_AND */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_CMP_STORE */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, - /* WINED3DSIH_ATOMIC_IMAX */ NULL, - /* WINED3DSIH_ATOMIC_IMIN */ NULL, + /* WINED3DSIH_ATOMIC_IMAX */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_IMIN */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_UMAX */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_UMIN */ shader_glsl_atomic, @@ -9485,8 +9503,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, - /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, - /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMAX */ shader_glsl_atomic, + /* WINED3DSIH_IMM_ATOMIC_IMIN */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMAX */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMIN */ shader_glsl_atomic,

1 0

Józef Kucia : wined3d: Do not crash when attempting to issue draw call with no attachments.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: f4f2d4052b12ba15428cd9477b414b95e664857f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f2d4052b12ba15428cd9477… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Feb 26 18:48:04 2017 +0100 wined3d: Do not crash when attempting to issue draw call with no attachments. The is broken since by 2641c5c28f407fb157028c8e7dda5e306b6b313c. 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/drawprim.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 48421ef..4cb19e1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -427,7 +427,10 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!(rtv = fb->render_targets[0])) rtv = fb->depth_stencil; - context = context_acquire(device, wined3d_texture_from_resource(rtv->resource), rtv->sub_resource_idx); + if (rtv) + context = context_acquire(device, wined3d_texture_from_resource(rtv->resource), rtv->sub_resource_idx); + else + context = context_acquire(device, NULL, 0); if (!context->valid) { context_release(context);

1 0

Henri Verbeet : wined3d: Get rid of some redundant "texture" accesses in texture_resource_sub_resource_map().
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 7b18ff5abb76fd3b5570c6a634fc314d7e27606c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b18ff5abb76fd3b5570c6a63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 07:46:31 2017 +0100 wined3d: Get rid of some redundant "texture" accesses in texture_resource_sub_resource_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 20a6c0e..b3e5659 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1832,16 +1832,15 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", - wined3d_debug_location(texture->resource.map_binding)); - if ((ret = wined3d_texture_prepare_location(texture, sub_resource_idx, - context, texture->resource.map_binding))) - wined3d_texture_validate_location(texture, sub_resource_idx, texture->resource.map_binding); + wined3d_debug_location(resource->map_binding)); + if ((ret = wined3d_texture_prepare_location(texture, sub_resource_idx, context, resource->map_binding))) + wined3d_texture_validate_location(texture, sub_resource_idx, resource->map_binding); } else { if (resource->usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic texture without WINED3D_MAP_DISCARD.\n"); - ret = wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); + ret = wined3d_texture_load_location(texture, sub_resource_idx, context, resource->map_binding); } if (!ret) @@ -1852,10 +1851,10 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour } if (!(flags & WINED3D_MAP_READONLY) - && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); + && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + wined3d_texture_get_memory(texture, sub_resource_idx, &data, resource->map_binding); base_memory = wined3d_texture_map_bo_address(&data, sub_resource->size, gl_info, GL_PIXEL_UNPACK_BUFFER, flags); TRACE("Base memory pointer %p.\n", base_memory);

1 0

Henri Verbeet : wined3d: Do not record the GL primitive type in stateblocks.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: e8e4fac959d0da602356fbab172c1bcc31d15b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e4fac959d0da602356fbab1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 07:46:32 2017 +0100 wined3d: Do not record the GL primitive type in stateblocks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 +++----- dlls/wined3d/stateblock.c | 17 ----------------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a4eb25..dff741f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3449,11 +3449,9 @@ void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, TRACE("device %p, primitive_type %s\n", device, debug_d3dprimitivetype(primitive_type)); gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); - prev = device->update_state->gl_primitive_type; - device->update_state->gl_primitive_type = gl_primitive_type; - if (device->recording) - device->recording->changed.primitive_type = TRUE; - else if (gl_primitive_type != prev && (gl_primitive_type == GL_POINTS || prev == GL_POINTS)) + prev = device->state.gl_primitive_type; + device->state.gl_primitive_type = gl_primitive_type; + if (gl_primitive_type != prev && (gl_primitive_type == GL_POINTS || prev == GL_POINTS)) device_invalidate_state(device, STATE_POINT_ENABLE); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 22e511f..8b91353 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -202,7 +202,6 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, unsigned int i; /* Single values */ - states->primitive_type = 1; states->indices = 1; states->material = 1; states->viewport = 1; @@ -772,9 +771,6 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->state.transforms[transform] = src_state->transforms[transform]; } - if (stateblock->changed.primitive_type) - stateblock->state.gl_primitive_type = src_state->gl_primitive_type; - if (stateblock->changed.indices && ((stateblock->state.index_buffer != src_state->index_buffer) || (stateblock->state.base_vertex_index != src_state->base_vertex_index) @@ -1045,19 +1041,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) &stateblock->state.transforms[stateblock->contained_transform_states[i]]); } - if (stateblock->changed.primitive_type) - { - GLenum gl_primitive_type, prev; - - if (device->recording) - device->recording->changed.primitive_type = TRUE; - gl_primitive_type = stateblock->state.gl_primitive_type; - prev = device->update_state->gl_primitive_type; - device->update_state->gl_primitive_type = gl_primitive_type; - if (gl_primitive_type != prev && (gl_primitive_type == GL_POINTS || prev == GL_POINTS)) - device_invalidate_state(device, STATE_POINT_ENABLE); - } - if (stateblock->changed.indices) { wined3d_device_set_index_buffer(device, stateblock->state.index_buffer, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec0fcbf..3210e3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3101,7 +3101,6 @@ struct wined3d_saved_states WORD vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ BOOL vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; DWORD textures : 20; /* MAX_COMBINED_SAMPLERS, 20 */ - DWORD primitive_type : 1; DWORD indices : 1; DWORD material : 1; DWORD viewport : 1; @@ -3109,7 +3108,7 @@ struct wined3d_saved_states DWORD pixelShader : 1; DWORD vertexShader : 1; DWORD scissorRect : 1; - DWORD padding : 4; + DWORD padding : 5; }; struct StageState {

1 0

Henri Verbeet : wined3d: Pass the primitive type to wined3d_cs_emit_draw() .
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 4aec7f0cc4b3ea3b80d34841edf42d7a5130036e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aec7f0cc4b3ea3b80d34841e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 07:46:33 2017 +0100 wined3d: Pass the primitive type to wined3d_cs_emit_draw(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 11 ++++++++++- dlls/wined3d/device.c | 19 ++++++++----------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 763fda7..682b1d8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -97,6 +97,7 @@ struct wined3d_cs_dispatch struct wined3d_cs_draw { enum wined3d_cs_op opcode; + GLenum primitive_type; int base_vertex_idx; unsigned int start_idx; unsigned int index_count; @@ -592,6 +593,13 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); } + if (cs->state.gl_primitive_type != op->primitive_type) + { + if (cs->state.gl_primitive_type == GL_POINTS || op->primitive_type == GL_POINTS) + device_invalidate_state(cs->device, STATE_POINT_ENABLE); + cs->state.gl_primitive_type = op->primitive_type; + } + draw_primitive(cs->device, state, op->base_vertex_idx, op->start_idx, op->index_count, op->start_instance, op->instance_count, op->indexed); @@ -619,7 +627,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } -void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, +void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { const struct wined3d_state *state = &cs->device->state; @@ -628,6 +636,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_DRAW; + op->primitive_type = primitive_type; op->base_vertex_idx = base_vertex_idx; op->start_idx = start_idx; op->index_count = index_count; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dff741f..2b95f50 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3444,15 +3444,9 @@ void CDECL wined3d_device_dispatch_compute(struct wined3d_device *device, void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_type) { - GLenum gl_primitive_type, prev; - TRACE("device %p, primitive_type %s\n", device, debug_d3dprimitivetype(primitive_type)); - gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); - prev = device->state.gl_primitive_type; - device->state.gl_primitive_type = gl_primitive_type; - if (gl_primitive_type != prev && (gl_primitive_type == GL_POINTS || prev == GL_POINTS)) - device_invalidate_state(device, STATE_POINT_ENABLE); + device->state.gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); } void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device, @@ -3469,7 +3463,8 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT { TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - wined3d_cs_emit_draw(device->cs, 0, start_vertex, vertex_count, 0, 0, FALSE); + wined3d_cs_emit_draw(device->cs, device->state.gl_primitive_type, 0, + start_vertex, vertex_count, 0, 0, FALSE); return WINED3D_OK; } @@ -3480,7 +3475,8 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, 0, start_vertex, vertex_count, start_instance, instance_count, FALSE); + wined3d_cs_emit_draw(device->cs, device->state.gl_primitive_type, 0, + start_vertex, vertex_count, start_instance, instance_count, FALSE); } HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) @@ -3497,7 +3493,8 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_draw(device->cs, device->state.base_vertex_index, start_idx, index_count, 0, 0, TRUE); + wined3d_cs_emit_draw(device->cs, device->state.gl_primitive_type, + device->state.base_vertex_index, start_idx, index_count, 0, 0, TRUE); return WINED3D_OK; } @@ -3508,7 +3505,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, device->state.base_vertex_index, + wined3d_cs_emit_draw(device->cs, device->state.gl_primitive_type, device->state.base_vertex_index, start_idx, index_count, start_instance, instance_count, TRUE); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3210e3f..611b3b6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3197,8 +3197,9 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; -void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, - unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; +void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, int base_vertex_idx, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, + unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use the command stream state in device_clear_render_targets().
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 29326406c34c0dce4baab08e544e70ce0001c70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29326406c34c0dce4baab08e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 07:46:34 2017 +0100 wined3d: Use the command stream state in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 682b1d8..fa7c6dd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -397,7 +397,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) state = &device->state; wined3d_get_draw_rect(state, &draw_rect); device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - &device->fb, op->rect_count, op->rects, &draw_rect, op->flags, + cs->state.fb, op->rect_count, op->rects, &draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2b95f50..c3703a5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -223,7 +223,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_surface *target = rtv ? wined3d_rendertarget_view_get_surface(rtv) : NULL; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; struct wined3d_surface *depth_stencil = dsv ? wined3d_rendertarget_view_get_surface(dsv) : NULL; - const struct wined3d_state *state = &device->state; + const struct wined3d_state *state = &device->cs->state; const struct wined3d_gl_info *gl_info; UINT drawable_width, drawable_height; struct wined3d_color corrected_color;

1 0