wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Józef Kucia : d3d11/tests: Add test for conservative depth output.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 9058fc0acc9d8ab89e8695f62cae9351b6ccd499 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9058fc0acc9d8ab89e8695f62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 10 14:25:41 2017 +0200 d3d11/tests: Add test for conservative depth output. 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 | 260 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 230 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9058fc0acc9d8ab89e869…

1 0

Michael Müller : wined3d: Add conservative depth output information to GLSL pixel shaders.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 76783293cf5b91e38e16eb21cc6c13141c648873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76783293cf5b91e38e16eb21c… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Sep 10 14:25:40 2017 +0200 wined3d: Add conservative depth output information to GLSL pixel shaders. 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 | 10 ++++++++++ dlls/wined3d/shader.c | 13 +++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 27 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0cd784c..3da751e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -115,6 +115,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, {"GL_ARB_compute_shader", ARB_COMPUTE_SHADER }, + {"GL_ARB_conservative_depth", ARB_CONSERVATIVE_DEPTH }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, @@ -3874,6 +3875,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, + {ARB_CONSERVATIVE_DEPTH, MAKEDWORD_VERSION(4, 2)}, {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADER_ATOMIC_COUNTERS, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index efcd383..39d2276 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7244,6 +7244,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_glsl_add_version_declaration(buffer, gl_info); shader_glsl_enable_extensions(buffer, gl_info); + if (gl_info->supported[ARB_CONSERVATIVE_DEPTH]) + shader_addline(buffer, "#extension GL_ARB_conservative_depth : enable\n"); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); if (shader_glsl_use_explicit_attrib_location(gl_info)) @@ -7262,6 +7264,14 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context /* Base Declarations */ shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + if (gl_info->supported[ARB_CONSERVATIVE_DEPTH]) + { + if (shader->u.ps.depth_output == WINED3DSPR_DEPTHOUTGE) + shader_addline(buffer, "layout (depth_greater) out float gl_FragDepth;\n"); + else if (shader->u.ps.depth_output == WINED3DSPR_DEPTHOUTLE) + shader_addline(buffer, "layout (depth_less) out float gl_FragDepth;\n"); + } + /* Declare uniforms for NP2 texcoord fixup: * This is NOT done inside the loop that declares the texture samplers * since the NP2 fixup code is currently only used for the GeforceFX diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 70c6de9..02880b0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1148,6 +1148,19 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); } + else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT) + { + if (ins.declaration.dst.reg.type == WINED3DSPR_DEPTHOUT + || ins.declaration.dst.reg.type == WINED3DSPR_DEPTHOUTGE + || ins.declaration.dst.reg.type == WINED3DSPR_DEPTHOUTLE) + { + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + shader->u.ps.depth_output = ins.declaration.dst.reg.type; + else + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT) { if (shader_version.type == WINED3D_SHADER_TYPE_HULL) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8b25220..2a51a7e 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -49,6 +49,7 @@ enum wined3d_gl_extension ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT, ARB_COMPUTE_SHADER, + ARB_CONSERVATIVE_DEPTH, ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f23dfec..4fca08d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3907,6 +3907,7 @@ struct wined3d_pixel_shader DWORD color0_reg; BOOL force_early_depth_stencil; + enum wined3d_shader_register_type depth_output; }; struct wined3d_compute_shader

1 0

Michael Müller : wined3d: Recognize conservative depth output registers.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: c95e0ef092e24bada6b7de0a9369011ac7176546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95e0ef092e24bada6b7de0a9… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Sep 10 14:25:39 2017 +0200 wined3d: Recognize conservative depth output registers. 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/shader.c | 8 ++++++++ dlls/wined3d/shader_sm4.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7290fc7..efcd383 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2904,6 +2904,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_DEPTHOUT: + case WINED3DSPR_DEPTHOUTGE: + case WINED3DSPR_DEPTHOUTLE: sprintf(register_name, "gl_FragDepth"); break; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8ed2cb9..70c6de9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2143,6 +2143,14 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "oDepth"); break; + case WINED3DSPR_DEPTHOUTGE: + shader_addline(buffer, "oDepthGE"); + break; + + case WINED3DSPR_DEPTHOUTLE: + shader_addline(buffer, "oDepthLE"); + break; + case WINED3DSPR_ATTROUT: shader_addline(buffer, "oD"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 123ecbc..e3d74e2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -333,6 +333,8 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_COVERAGE = 0x23, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, WINED3D_SM5_RT_GS_INSTANCE_ID = 0x25, + WINED3D_SM5_RT_DEPTHOUT_GREATER_EQUAL = 0x26, + WINED3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, }; enum wined3d_sm4_output_primitive_type @@ -1148,6 +1150,8 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_COVERAGE */ WINED3DSPR_COVERAGE, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, /* WINED3D_SM5_RT_GS_INSTANCE_ID */ WINED3DSPR_GSINSTID, + /* WINED3D_SM5_RT_DEPTHOUT_GREATER_EQUAL */ WINED3DSPR_DEPTHOUTGE, + /* WINED3D_SM5_RT_DEPTHOUT_LESS_EQUAL */ WINED3DSPR_DEPTHOUTLE, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04f2955..f23dfec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -490,6 +490,8 @@ enum wined3d_shader_register_type WINED3DSPR_COVERAGE, WINED3DSPR_SAMPLEMASK, WINED3DSPR_GSINSTID, + WINED3DSPR_DEPTHOUTGE, + WINED3DSPR_DEPTHOUTLE, }; enum wined3d_data_type @@ -3995,6 +3997,8 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) return FALSE; case WINED3DSPR_DEPTHOUT: /* oDepth */ + case WINED3DSPR_DEPTHOUTGE: + case WINED3DSPR_DEPTHOUTLE: case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */

1 0

Matteo Bruni : wined3d: Copy the module handle to a local variable in wined3d_cs_run().
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 6ee7f9074619265d7e3af99ba62fd7e9104ebb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee7f9074619265d7e3af99ba… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 8 18:44:11 2017 +0200 wined3d: Copy the module handle to a local variable in wined3d_cs_run(). 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/cs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0ff0c61..b3b6588 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2569,11 +2569,16 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) unsigned int spin_count = 0; struct wined3d_cs *cs = ctx; enum wined3d_cs_op opcode; + HMODULE wined3d_module; unsigned int poll = 0; LONG tail; TRACE("Started.\n"); + /* Copy the module handle to a local variable to avoid racing with the + * thread freeing "cs" before the FreeLibraryAndExitThread() call. */ + wined3d_module = cs->wined3d_module; + list_init(&cs->query_poll_list); cs->thread_id = GetCurrentThreadId(); for (;;) @@ -2621,7 +2626,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) cs->queue[WINED3D_CS_QUEUE_MAP].tail = cs->queue[WINED3D_CS_QUEUE_MAP].head; cs->queue[WINED3D_CS_QUEUE_DEFAULT].tail = cs->queue[WINED3D_CS_QUEUE_DEFAULT].head; TRACE("Stopped.\n"); - FreeLibraryAndExitThread(cs->wined3d_module, 0); + FreeLibraryAndExitThread(wined3d_module, 0); } struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device)

1 0

Matteo Bruni : d3d8/tests: Trace the current test in test_signed_formats() .
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 210ce803a0cee28098cf29adf8d83df925d7962e URL: http://source.winehq.org/git/wine.git/?a=commit;h=210ce803a0cee28098cf29adf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 8 18:44:10 2017 +0200 d3d8/tests: Trace the current test in test_signed_formats(). 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/d3d8/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 5ff96d4..588a629 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6442,8 +6442,8 @@ static void test_signed_formats(void) color = getPixelColor(device, 80 + 160 * x, 60 + 120 * y); ok(color_match(color, expected_color, 1) || broken(r200_broken), - "Expected color 0x%08x, got 0x%08x, format %s, location %ux%u.\n", - expected_color, color, formats[i].name, x, y); + "Expected color 0x%08x, got 0x%08x, format %s, test %u, location %ux%u.\n", + expected_color, color, formats[i].name, j, x, y); } } hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); @@ -6472,8 +6472,8 @@ static void test_signed_formats(void) color = getPixelColor(device, 80 + 160 * x, 60 + 120 * y); ok(color_match(color, expected_color, formats[i].slop) || broken(color_match(color, expected_color, formats[i].slop_broken)), - "Expected color 0x%08x, got 0x%08x, format %s, location %ux%u.\n", - expected_color, color, formats[i].name, x, y); + "Expected color 0x%08x, got 0x%08x, format %s, test %u, location %ux%u.\n", + expected_color, color, formats[i].name, j, x, y); } } hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Matteo Bruni : d3d9/tests: Trace the current test in test_signed_formats() .
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 22b9403d00d2ca34eea410b95ccf013a09d91da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b9403d00d2ca34eea410b95… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 8 18:44:09 2017 +0200 d3d9/tests: Trace the current test in test_signed_formats(). 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/d3d9/tests/visual.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 822e6e4..55047d0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -18958,8 +18958,8 @@ static void test_signed_formats(void) color = getPixelColor(device, 80 + 160 * x, 60 + 120 * y); ok(color_match(color, expected_color, 1) || broken(r200_broken), - "Expected color 0x%08x, got 0x%08x, format %s, location %ux%u.\n", - expected_color, color, formats[i].name, x, y); + "Expected color 0x%08x, got 0x%08x, format %s, test %u, location %ux%u.\n", + expected_color, color, formats[i].name, j, x, y); } } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); @@ -18988,8 +18988,8 @@ static void test_signed_formats(void) color = getPixelColor(device, 80 + 160 * x, 60 + 120 * y); ok(color_match(color, expected_color, formats[i].slop) || broken(color_match(color, expected_color, formats[i].slop_broken)), - "Expected color 0x%08x, got 0x%08x, format %s, location %ux%u.\n", - expected_color, color, formats[i].name, x, y); + "Expected color 0x%08x, got 0x%08x, format %s, test %u, location %ux%u.\n", + expected_color, color, formats[i].name, j, x, y); } } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); @@ -19037,8 +19037,8 @@ static void test_signed_formats(void) color = getPixelColor(device, 80 + 160 * x, 60 + 120 * y); ok(color_match(color, expected_color, formats[i].slop) || broken(color_match(color, expected_color, formats[i].slop_broken)), - "Expected color 0x%08x, got 0x%08x, format %s, location %ux%u.\n", - expected_color, color, formats[i].name, x, y); + "Expected color 0x%08x, got 0x%08x, format %s, test %u, location %ux%u.\n", + expected_color, color, formats[i].name, j, x, y); } } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Matteo Bruni : wined3d: Get rid of most of the redundant query flushes.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: cc8e87372036504f1b25036125072d1d5a84e18c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8e87372036504f1b2503612… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 8 18:44:08 2017 +0200 wined3d: Get rid of most of the redundant query flushes. This way we avoid queueing up CS packets on each wined3d_query_get_data() call, which has been seen in some degenerate cases to starve other client threads that are trying to submit actual work into the CS (sort-of a livelock). 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/cs.c | 2 ++ dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6ea2fd2..0ff0c61 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -877,6 +877,7 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) op->opcode = WINED3D_CS_OP_FLUSH; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->queries_flushed = TRUE; } static void wined3d_cs_exec_set_predication(struct wined3d_cs *cs, const void *data) @@ -1863,6 +1864,7 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu op->flags = flags; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->queries_flushed = FALSE; } static void wined3d_cs_exec_preload_resource(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 88f64bd..1bdaaf0 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -389,7 +389,7 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, } else if (query->counter_main != query->counter_retrieved) { - if (flags & WINED3DGETDATA_FLUSH) + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) wined3d_cs_emit_flush(query->device->cs); return S_FALSE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70120e8..04f2955 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3427,6 +3427,7 @@ struct wined3d_cs size_t data_size, start, end; void *data; struct list query_poll_list; + BOOL queries_flushed; HANDLE event; BOOL waiting_for_event;

1 0

Matteo Bruni : wined3d: Restore support for d3d9 extension formats.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 6b98d3ebf1af1f55d00b66008bd9b37de5880def URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b98d3ebf1af1f55d00b66008… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 8 18:44:07 2017 +0200 wined3d: Restore support for d3d9 extension formats. 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/directx.c | 7 +++++++ dlls/wined3d/utils.c | 4 ++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e30430a..0cd784c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5220,6 +5220,13 @@ static BOOL wined3d_check_surface_capability(const struct wined3d_format *format return TRUE; } + if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) + == (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) + { + TRACE("[OK]\n"); + return TRUE; + } + /* Reject other formats */ TRACE("[FAILED]\n"); return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1c64606..4c878b6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -333,6 +333,10 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_D32_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_FLAG_FLOAT}, + {WINED3DFMT_INST, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_NULL, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_NVDB, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, }; struct wined3d_format_block_info diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e12f2a6..70120e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4114,6 +4114,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_DEPTH 0x00000004 #define WINED3DFMT_FLAG_STENCIL 0x00000008 #define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 +#define WINED3DFMT_FLAG_EXTENSION 0x00000020 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 #define WINED3DFMT_FLAG_FLOAT 0x00000200

1 0

Alexandre Julliard : kernel32/tests: Also run mapping tests against an executable image.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: d6b523e69f7650bac94ba825cb335945cacb7186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6b523e69f7650bac94ba825c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 15:48:54 2017 +0200 kernel32/tests: Also run mapping tests against an executable image. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 72 +++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a1c67d8..46b019c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3772,16 +3772,11 @@ static void *map_view_of_file(HANDLE handle, DWORD access) addr = NULL; status = pNtMapViewOfSection(handle, GetCurrentProcess(), &addr, 0, 0, &offset, &count, 1 /* ViewShare */, 0, protect); - if (status) - { - /* for simplicity */ - SetLastError(ERROR_ACCESS_DENIED); - addr = NULL; - } + if ((int)status < 0) addr = NULL; return addr; } -static void test_mapping( HANDLE hfile ) +static void test_mapping( HANDLE hfile, DWORD sec_flags ) { static const DWORD page_prot[] = { @@ -3827,16 +3822,16 @@ static void test_mapping( HANDLE hfile ) { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE | FILE_MAP_COPY, PAGE_EXECUTE_READWRITE } /* 0x2f */ }; void *base, *nt_base, *ptr; - DWORD i, j, k, ret, old_prot, prev_prot; + DWORD i, j, k, ret, old_prot, prev_prot, alloc_prot; HANDLE hmap; MEMORY_BASIC_INFORMATION info, nt_info; BOOL anon_mapping = (hfile == INVALID_HANDLE_VALUE); - trace( "testing %s mapping\n", anon_mapping ? "anonymous" : "file" ); + trace( "testing %s mapping flags %08x\n", anon_mapping ? "anonymous" : "file", sec_flags ); for (i = 0; i < sizeof(page_prot)/sizeof(page_prot[0]); i++) { SetLastError(0xdeadbeef); - hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | SEC_COMMIT, 0, si.dwPageSize, NULL); + hmap = CreateFileMappingW(hfile, NULL, page_prot[i] | sec_flags, 0, si.dwPageSize, NULL); if (page_prot[i] == PAGE_NOACCESS) { @@ -3847,7 +3842,10 @@ static void test_mapping( HANDLE hfile ) /* A trick to create a not accessible mapping */ SetLastError(0xdeadbeef); - hmap = CreateFileMappingW(hfile, NULL, PAGE_READWRITE | SEC_COMMIT, 0, si.dwPageSize, NULL); + if (sec_flags & SEC_IMAGE) + hmap = CreateFileMappingW(hfile, NULL, PAGE_WRITECOPY | sec_flags, 0, si.dwPageSize, NULL); + else + hmap = CreateFileMappingW(hfile, NULL, PAGE_READWRITE | sec_flags, 0, si.dwPageSize, NULL); ok(hmap != 0, "CreateFileMapping(PAGE_READWRITE) error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = DuplicateHandle(GetCurrentProcess(), hmap, GetCurrentProcess(), &hmap2, 0, FALSE, 0); @@ -3867,6 +3865,10 @@ static void test_mapping( HANDLE hfile ) { trace("%d: CreateFileMapping(%04x) failed: %d\n", i, page_prot[i], GetLastError()); + if ((sec_flags & SEC_IMAGE) && + (page_prot[i] == PAGE_READWRITE || page_prot[i] == PAGE_EXECUTE_READWRITE)) + continue; /* SEC_IMAGE doesn't support write access */ + /* NT4 and win2k don't support EXEC on file mappings */ if (page_prot[i] == PAGE_EXECUTE_READ || page_prot[i] == PAGE_EXECUTE_READWRITE) { @@ -3940,15 +3942,25 @@ static void test_mapping( HANDLE hfile ) ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); ok(info.BaseAddress == base, "%d: (%04x) got %p, expected %p\n", j, view[j].access, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: (%04x) got %#lx != expected %#x\n", j, view[j].access, info.RegionSize, si.dwPageSize); - ok(info.Protect == view[j].prot || - broken(view[j].prot == PAGE_EXECUTE_READ && info.Protect == PAGE_READONLY) || /* win2k */ - broken(view[j].prot == PAGE_EXECUTE_READWRITE && info.Protect == PAGE_READWRITE) || /* win2k */ - broken(view[j].prot == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ - "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); + if (sec_flags & SEC_IMAGE) + ok(info.Protect == PAGE_READONLY, + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); + else + ok(info.Protect == view[j].prot || + broken(view[j].prot == PAGE_EXECUTE_READ && info.Protect == PAGE_READONLY) || /* win2k */ + broken(view[j].prot == PAGE_EXECUTE_READWRITE && info.Protect == PAGE_READWRITE) || /* win2k */ + broken(view[j].prot == PAGE_EXECUTE_WRITECOPY && info.Protect == PAGE_NOACCESS), /* XP */ + "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.Protect, view[j].prot); ok(info.AllocationBase == base, "%d: (%04x) got %p, expected %p\n", j, view[j].access, info.AllocationBase, base); - ok(info.AllocationProtect == info.Protect, "%d: (%04x) got %#x, expected %#x\n", j, view[j].access, info.AllocationProtect, info.Protect); + if (sec_flags & SEC_IMAGE) + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: (%04x) got %#x, expected %#x\n", + j, view[j].access, info.AllocationProtect, info.Protect); + else + ok(info.AllocationProtect == info.Protect, "%d: (%04x) got %#x, expected %#x\n", + j, view[j].access, info.AllocationProtect, info.Protect); ok(info.State == MEM_COMMIT, "%d: (%04x) got %#x, expected MEM_COMMIT\n", j, view[j].access, info.State); - ok(info.Type == MEM_MAPPED, "%d: (%04x) got %#x, expected MEM_MAPPED\n", j, view[j].access, info.Type); + ok(info.Type == (sec_flags & SEC_IMAGE) ? SEC_IMAGE : MEM_MAPPED, + "%d: (%04x) got %#x, expected MEM_MAPPED\n", j, view[j].access, info.Type); if (nt_base && base) { @@ -3964,14 +3976,16 @@ static void test_mapping( HANDLE hfile ) } prev_prot = info.Protect; + alloc_prot = info.AllocationProtect; for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) { /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ + DWORD actual_prot = (sec_flags & SEC_IMAGE) ? map_prot_no_write(page_prot[k]) : page_prot[k]; SetLastError(0xdeadbeef); old_prot = 0xdeadbeef; ret = VirtualProtect(base, si.dwPageSize, page_prot[k], &old_prot); - if (is_compatible_protection(view[j].prot, page_prot[k])) + if (is_compatible_protection(alloc_prot, actual_prot)) { /* win2k and XP don't support EXEC on file mappings */ if (!ret && page_prot[k] == PAGE_EXECUTE) @@ -3983,6 +3997,7 @@ static void test_mapping( HANDLE hfile ) /* NT4 and win2k don't support EXEC on file mappings */ if (!ret && (page_prot[k] == PAGE_EXECUTE_READ || page_prot[k] == PAGE_EXECUTE_READWRITE)) { + todo_wine ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); continue; } @@ -4002,11 +4017,11 @@ static void test_mapping( HANDLE hfile ) ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); - prev_prot = page_prot[k]; + prev_prot = actual_prot; ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); - ok(info.Protect == page_prot[k], + ok(info.Protect == actual_prot, "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", page_prot[i], view[j].prot, page_prot[k], info.Protect ); } @@ -4082,13 +4097,24 @@ static void test_mappings(void) SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); SetEndOfFile(hfile); - test_mapping( hfile ); + test_mapping( hfile, SEC_COMMIT ); CloseHandle( hfile ); DeleteFileA( file_name ); + /* SEC_IMAGE mapping */ + GetSystemDirectoryA( file_name, MAX_PATH ); + strcat( file_name, "\\kernel32.dll" ); + + hfile = CreateFileA( file_name, GENERIC_READ|GENERIC_EXECUTE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + + test_mapping( hfile, SEC_IMAGE ); + + CloseHandle( hfile ); + /* now anonymous mappings */ - test_mapping( INVALID_HANDLE_VALUE ); + test_mapping( INVALID_HANDLE_VALUE, SEC_COMMIT ); } static void test_shared_memory(BOOL is_child)

1 0

Alexandre Julliard : kernel32/tests: Also run mapping tests against an anonymous mapping.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: c88a858ecae783a8efe8422aa1341e55061615b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88a858ecae783a8efe8422aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 11:50:11 2017 +0200 kernel32/tests: Also run mapping tests against an anonymous mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 92 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 054d335..a1c67d8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3725,6 +3725,16 @@ static DWORD map_prot_to_access(DWORD prot) } } +static DWORD map_prot_no_write(DWORD prot) +{ + switch (prot) + { + case PAGE_READWRITE: return PAGE_WRITECOPY; + case PAGE_EXECUTE_READWRITE: return PAGE_EXECUTE_WRITECOPY; + default: return prot; + } +} + static DWORD file_access_to_prot( DWORD access ) { BOOL exec = access & FILE_MAP_EXECUTE; @@ -3771,7 +3781,7 @@ static void *map_view_of_file(HANDLE handle, DWORD access) return addr; } -static void test_mapping(void) +static void test_mapping( HANDLE hfile ) { static const DWORD page_prot[] = { @@ -3818,20 +3828,11 @@ static void test_mapping(void) }; void *base, *nt_base, *ptr; DWORD i, j, k, ret, old_prot, prev_prot; - char temp_path[MAX_PATH]; - char file_name[MAX_PATH]; - HANDLE hfile, hmap; + HANDLE hmap; MEMORY_BASIC_INFORMATION info, nt_info; + BOOL anon_mapping = (hfile == INVALID_HANDLE_VALUE); - GetTempPathA(MAX_PATH, temp_path); - GetTempFileNameA(temp_path, "map", 0, file_name); - - SetLastError(0xdeadbeef); - hfile = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); - SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); - SetEndOfFile(hfile); - + trace( "testing %s mapping\n", anon_mapping ? "anonymous" : "file" ); for (i = 0; i < sizeof(page_prot)/sizeof(page_prot[0]); i++) { SetLastError(0xdeadbeef); @@ -4021,10 +4022,43 @@ static void test_mapping(void) /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ SetLastError(0xdeadbeef); ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); - ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); - /* FIXME: remove once Wine is fixed */ - todo_wine_if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) + if (anon_mapping) + { + if (is_compatible_protection(view[j].prot, page_prot[k])) + { + todo_wine_if (!ptr) + ok(ptr != NULL, "VirtualAlloc error %u, map %#x, view %#x, requested prot %#x\n", + GetLastError(), page_prot[i], view[j].prot, page_prot[k]); + } + else + { + /* versions <= Vista accept all protections without checking */ + todo_wine_if (ptr) + ok(!ptr || broken(ptr != NULL), + "VirtualAlloc should fail, map %#x, view %#x, requested prot %#x\n", + page_prot[i], view[j].prot, page_prot[k]); + if (!ptr) ok( GetLastError() == ERROR_INVALID_PARAMETER, + "wrong error %u\n", GetLastError()); + } + if (ptr) + { + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + ok(info.Protect == page_prot[k] || + /* if the mapping doesn't have write access, + * broken versions silently switch to WRITECOPY */ + broken( info.Protect == map_prot_no_write(page_prot[k]) ), + "VirtualAlloc wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", + page_prot[i], view[j].prot, page_prot[k], info.Protect ); + } + } + else + { + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); + /* FIXME: remove once Wine is fixed */ + todo_wine_if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } } UnmapViewOfFile(base); @@ -4032,9 +4066,29 @@ static void test_mapping(void) CloseHandle(hmap); } +} - CloseHandle(hfile); - DeleteFileA(file_name); +static void test_mappings(void) +{ + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + HANDLE hfile; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "map", 0, file_name); + + hfile = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); + SetEndOfFile(hfile); + + test_mapping( hfile ); + + CloseHandle( hfile ); + DeleteFileA( file_name ); + + /* now anonymous mappings */ + test_mapping( INVALID_HANDLE_VALUE ); } static void test_shared_memory(BOOL is_child) @@ -4189,7 +4243,7 @@ START_TEST(virtual) test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); test_shared_memory_ro(FALSE, FILE_MAP_COPY); test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); - test_mapping(); + test_mappings(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection(); test_VirtualProtect();

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
45
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 September 2017