wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Frédéric Delanoy : French translation for release 1.7.36
by Jeremy Newman 12 Feb '15

12 Feb '15

Module: website Branch: master Commit: 0259a929cdf32ff82dbe369318128b5f143fc18d URL: http://source.winehq.org/git/website.git/?a=commit;h=0259a929cdf32ff82dbe36… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 12 14:41:13 2015 +0100 French translation for release 1.7.36 --- news/fr/2015020701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015020701.xml b/news/fr/2015020701.xml new file mode 100644 index 0000000..7db74a4 --- /dev/null +++ b/news/fr/2015020701.xml @@ -0,0 +1,15 @@ +<news> +<date>7 février 2015</date> +<title>Sortie de Wine 1.7.36</title> +<body> + La version de développement 1.7.36 de Wine est disponible. + <a href="{$root}/announce/1.7.36">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge préliminaire du 64 bits sous Mac OS X.</li> + <li>Prise en charge de la configuration des haut-parleurs dans Winecfg.</li> + <li>Meilleure prise en charge du dossier corbeille dans Mac OS X.</li> + <li>Prise en charge des fonctionnalités typographiques dans DirectWrite.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.36.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.35
by Jeremy Newman 12 Feb '15

12 Feb '15

Module: website Branch: master Commit: b459bdb0bb50e6fd11e2df0ef488368b9f40b910 URL: http://source.winehq.org/git/website.git/?a=commit;h=b459bdb0bb50e6fd11e2df… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 12 14:41:12 2015 +0100 French translation for release 1.7.35 --- news/fr/2015012301.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2015012301.xml b/news/fr/2015012301.xml new file mode 100644 index 0000000..8111ba1 --- /dev/null +++ b/news/fr/2015012301.xml @@ -0,0 +1,14 @@ +<news> +<date>23 janvier 2015</date> +<title>Sortie de Wine 1.7.35</title> +<body> + La version de développement 1.7.35 de Wine est disponible. + <a href="{$root}/announce/1.7.35">Nouveautés</a> de cette version : +<ul> + <li>Début de prise en charge des contextes OpenGL core.</li> + <li>Prise en charge initiale du placement des glyphes dans DirectWrite.</li> + <li>Objets WBEM supplémentaires.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.35.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

David Heidelberg : dbghelp: Implement DW_TAG_unspecified_type.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: e6e50f6c474e5b20c44e20c8105f02ff5ecfc2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e50f6c474e5b20c44e20c81… Author: David Heidelberg <david(a)ixit.cz> Date: Tue Feb 10 23:15:56 2015 +0100 dbghelp: Implement DW_TAG_unspecified_type. --- dlls/dbghelp/dwarf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f1bd6cb..c54bfd3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1337,6 +1337,31 @@ static struct symt* dwarf2_parse_volatile_type(dwarf2_parse_context_t* ctx, return ref_type; } +static struct symt* dwarf2_parse_unspecified_type(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di) +{ + struct attribute name; + struct attribute size; + struct symt_basic *basic; + + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + + if (di->symt) return di->symt; + + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) + name.u.string = "void"; + size.u.uvalue = sizeof(void *); + + basic = symt_new_basic(ctx->module, btVoid, name.u.string, size.u.uvalue); + di->symt = &basic->symt; + + if (!ctx->symt_cache[sc_void]) + ctx->symt_cache[sc_void] = di->symt; + + if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); + return di->symt; +} + static struct symt* dwarf2_parse_reference_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di) { @@ -2084,6 +2109,9 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, case DW_TAG_volatile_type: dwarf2_parse_volatile_type(ctx, di); break; + case DW_TAG_unspecified_type: + dwarf2_parse_unspecified_type(ctx, di); + break; case DW_TAG_reference_type: dwarf2_parse_reference_type(ctx, di); break;

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 8fdeb52b3de1c2e0ba6a160e4fcc65f620e003b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdeb52b3de1c2e0ba6a160e4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 12 14:56:27 2015 +0100 po: Update French translation. --- po/fr.po | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2a5fd49..04c9628 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-10-02 10:04+0100\n" +"PO-Revision-Date: 2015-02-12 14:55+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -853,7 +853,7 @@ msgstr "Le fichier n'existe pas" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "La sélection contient un objet non-dossier" #: comdlg32.rc:45 msgid "Up One Level" @@ -13250,20 +13250,16 @@ msgid "&Test Sound" msgstr "&Tester le son" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Configuration de Wine" +msgstr "Configuration des haut-parleurs" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "&Périphérique :" +msgstr "Périphérique :" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "Haut-parleurs :" #: winecfg.rc:286 msgid "Appearance" @@ -13371,21 +13367,19 @@ msgstr "(Valeur par défaut du système)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "Ambiophonique 5.1" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "image" +msgstr "Quadraphonique" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "Stéréo" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid ""

1 0

Stefan Dösinger : wined3d: Set z = 0.0 via the projection matrix instead of depth clamping.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 9b3ab8a6f4dea23b1790d7cebbb6b5964e8899d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3ab8a6f4dea23b1790d7ceb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:47 2015 +0100 wined3d: Set z = 0.0 via the projection matrix instead of depth clamping. This works on cards that don't implement ARB_depth_clamp like r500 cards. Note that texturing is influenced by position.w, not position.z. --- dlls/wined3d/directx.c | 7 ------- dlls/wined3d/state.c | 33 ++++++++++----------------------- dlls/wined3d/wined3d_gl.h | 2 -- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bacddc9..5fa9355 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -112,7 +112,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, - {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, @@ -204,7 +203,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, /* NV */ - {"GL_NV_depth_clamp", NV_DEPTH_CLAMP }, {"GL_NV_fence", NV_FENCE }, {"GL_NV_fog_distance", NV_FOG_DISTANCE }, {"GL_NV_fragment_program", NV_FRAGMENT_PROGRAM }, @@ -3446,11 +3444,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) TRACE(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support.\n"); gl_info->supported[NV_TEXGEN_REFLECTION] = TRUE; } - if (!gl_info->supported[ARB_DEPTH_CLAMP] && gl_info->supported[NV_DEPTH_CLAMP]) - { - TRACE(" IMPLIED: ARB_depth_clamp support (by NV_depth_clamp).\n"); - gl_info->supported[ARB_DEPTH_CLAMP] = TRUE; - } if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) { TRACE(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f333603..961f651 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -103,7 +103,6 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ { enum wined3d_depth_buffer_type zenable = state->render_states[WINED3D_RS_ZENABLE]; const struct wined3d_gl_info *gl_info = context->gl_info; - static UINT once; /* No z test without depth stencil buffers */ if (!state->fb->depth_stencil) @@ -132,21 +131,8 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ break; } - if (context->gl_info->supported[ARB_DEPTH_CLAMP]) - { - if (!zenable && context->stream_info.position_transformed) - { - gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_CLAMP); - checkGLcall("glEnable(GL_DEPTH_CLAMP)"); - } - else - { - gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_CLAMP); - checkGLcall("glDisable(GL_DEPTH_CLAMP)"); - } - } - else if (!zenable && !once++) - FIXME("Z buffer disabled, but ARB_depth_clamp isn't supported.\n"); + if (context->last_was_rhw && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) + transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } static void state_cullmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4105,12 +4091,16 @@ void transform_projection(struct wined3d_context *context, const struct wined3d_ double y_offset = context->render_offscreen ? ((63.0 / 64.0) - (2.0 * y) - h) / h : ((63.0 / 64.0) - (2.0 * y) - h) / -h; + enum wined3d_depth_buffer_type zenable = state->fb->depth_stencil ? + state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; + double z_scale = zenable ? 2.0f : 0.0f; + double z_offset = zenable ? -1.0f : 0.0f; const GLdouble projection[] = { - x_scale, 0.0, 0.0, 0.0, - 0.0, y_scale, 0.0, 0.0, - 0.0, 0.0, 2.0, 0.0, - x_offset, y_offset, -1.0, 1.0, + x_scale, 0.0, 0.0, 0.0, + 0.0, y_scale, 0.0, 0.0, + 0.0, 0.0, z_scale, 0.0, + x_offset, y_offset, z_offset, 1.0, }; gl_info->gl_ops.gl.p_glLoadMatrixd(projection); @@ -4775,9 +4765,6 @@ void vertexdeclaration(struct wined3d_context *context, const struct wined3d_sta && state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.shader_version.minor <= 3) context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_PIXEL; } - - if (transformed != wasrhw && !isStateDirty(context, STATE_RENDER(WINED3D_RS_ZENABLE))) - state_zenable(context, state, STATE_RENDER(WINED3D_RS_ZENABLE)); } static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index cbb99e5..3f06601 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -48,7 +48,6 @@ enum wined3d_gl_extension ARB_COLOR_BUFFER_FLOAT, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, - ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DRAW_BUFFERS, ARB_DRAW_ELEMENTS_BASE_VERTEX, @@ -137,7 +136,6 @@ enum wined3d_gl_extension EXT_TEXTURE_SRGB_DECODE, EXT_VERTEX_ARRAY_BGRA, /* NVIDIA */ - NV_DEPTH_CLAMP, NV_FENCE, NV_FOG_DISTANCE, NV_FRAGMENT_PROGRAM,

1 0

Stefan Dösinger : d3d8/tests: Test rhw depth clip with z enabled but no depth buffer set.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: f460db7c80485efa379d091b18f1294b7e5ce776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f460db7c80485efa379d091b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:46 2015 +0100 d3d8/tests: Test rhw depth clip with z enabled but no depth buffer set. --- dlls/d3d8/tests/visual.c | 80 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7efc90d..40bbc59 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4070,6 +4070,8 @@ static void zenable_test(void) HRESULT hr; UINT x, y; UINT i, j; + UINT test; + IDirect3DSurface8 *ds, *rt; static const struct { @@ -4094,34 +4096,68 @@ static void zenable_test(void) goto done; } - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); - ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &ds); + ok(SUCCEEDED(hr), "Failed to get depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tquad, sizeof(*tquad)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - for (i = 0; i < 4; ++i) + for (test = 0; test < 2; ++test) { - for (j = 0; j < 4; ++j) + /* The Windows 8 testbot (WARP) appears to clip with + * ZENABLE = D3DZB_TRUE and no depth buffer set. */ + static const D3DCOLOR expected_broken[] = { - x = 80 * ((2 * j) + 1); - y = 60 * ((2 * i) + 1); - color = getPixelColor(device, x, y); - ok(color_match(color, 0x0000ff00, 1), - "Expected color 0x0000ff00 at %u, %u, got 0x%08x.\n", x, y, color); + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + }; + + if (!test) + { + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#x.\n", hr); } + else + { + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); + ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + } + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tquad, sizeof(*tquad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, 0x0000ff00, 1) + || broken(color_match(color, expected_broken[i * 4 + j], 1) && !test), + "Expected color 0x0000ff00 at %u, %u, got 0x%08x.\n", x, y, color); + } + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); } - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + IDirect3DSurface8_Release(ds); + IDirect3DSurface8_Release(rt); hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);

1 0

Stefan Dösinger : d3d9/tests: Test rhw depth clip with z enabled but no depth buffer set.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: fd218b93d0dfb4db1f48904bbc29f402ba38f522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd218b93d0dfb4db1f48904bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:45 2015 +0100 d3d9/tests: Test rhw depth clip with z enabled but no depth buffer set. --- dlls/d3d9/tests/visual.c | 78 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1f42f5a..b4df9c4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15449,6 +15449,8 @@ static void zenable_test(void) HRESULT hr; UINT x, y; UINT i, j; + UINT test; + IDirect3DSurface9 *ds; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -15460,34 +15462,66 @@ static void zenable_test(void) goto done; } - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); - ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tquad, sizeof(*tquad)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds); + ok(SUCCEEDED(hr), "Failed to get depth stencil surface, hr %#x.\n", hr); - for (i = 0; i < 4; ++i) + for (test = 0; test < 2; ++test) { - for (j = 0; j < 4; ++j) + /* The Windows 8 testbot (WARP) appears to clip with + * ZENABLE = D3DZB_TRUE and no depth buffer set. */ + static const D3DCOLOR expected_broken[] = { - x = 80 * ((2 * j) + 1); - y = 60 * ((2 * i) + 1); - color = getPixelColor(device, x, y); - ok(color_match(color, 0x0000ff00, 1), - "Expected color 0x0000ff00 at %u, %u, got 0x%08x.\n", x, y, color); + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + 0x00ff0000, 0x0000ff00, 0x0000ff00, 0x00ff0000, + }; + + if (!test) + { + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#x.\n", hr); } + else + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + } + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tquad, sizeof(*tquad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, 0x0000ff00, 1) + || broken(color_match(color, expected_broken[i * 4 + j], 1) && !test), + "Expected color 0x0000ff00 at %u, %u, got 0x%08x, test %u.\n", + x, y, color, test); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); } - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr);

1 0

Stefan Dösinger : ddraw/tests: Test rhw table fog z vs rhw.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 861ade434aa133a8b9e35fba930ea1766e2d1447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861ade434aa133a8b9e35fba9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:44 2015 +0100 ddraw/tests: Test rhw table fog z vs rhw. --- dlls/ddraw/tests/ddraw7.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d8706bd..01d0fcb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8180,6 +8180,123 @@ static void test_negative_fixedfunction_fog(void) DestroyWindow(window); } +static void test_table_fog_zw(void) +{ + HRESULT hr; + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + ULONG refcount; + HWND window; + D3DCOLOR color; + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ 0.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{ 0.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + }; + static D3DMATRIX identity = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + D3DDEVICEDESC7 caps; + static const struct + { + float z, w; + D3DZBUFFERTYPE z_test; + D3DCOLOR color; + } + tests[] = + { + {0.7f, 0.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.0f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_FALSE, 0x004cb200}, + {0.3f, 0.0f, D3DZB_TRUE, 0x00b24c00}, + {0.3f, 0.0f, D3DZB_FALSE, 0x00b24c00}, + }; + unsigned int i; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (!(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE)) + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping POSITIONT table fog test.\n"); + goto done; + } + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, 0x0000ff00); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + /* Work around an AMD Windows driver bug. Needs a proj matrix applied redundantly. */ + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + quad[0].position.z = tests[i].z; + quad[1].position.z = tests[i].z; + quad[2].position.z = tests[i].z; + quad[3].position.z = tests[i].z; + quad[0].position.w = tests[i].w; + quad[1].position.w = tests[i].w; + quad[2].position.w = tests[i].w; + quad[3].position.w = tests[i].w; + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, tests[i].z_test); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZRHW | D3DFVF_DIFFUSE, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 0, 240); + ok(compare_color(color, tests[i].color, 2), + "Got unexpected color 0x%08x, expected 0x%8x, case %u.\n", color, tests[i].color, i); + } + + IDirectDrawSurface7_Release(rt); +done: + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -8268,4 +8385,5 @@ START_TEST(ddraw7) test_surface_desc_lock(); test_fog_interpolation(); test_negative_fixedfunction_fog(); + test_table_fog_zw(); }

1 0

Stefan Dösinger : d3d8/tests: Test rhw table fog z vs rhw.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 77eb58b54e090c2ddb49b317db6eea793ae1002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=77eb58b54e090c2ddb49b317d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:43 2015 +0100 d3d8/tests: Test rhw table fog z vs rhw. --- dlls/d3d8/tests/visual.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e47e6a8..7efc90d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5515,6 +5515,127 @@ static void test_negative_fixedfunction_fog(void) DestroyWindow(window); } +static void test_table_fog_zw(void) +{ + HRESULT hr; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + D3DCOLOR color; + D3DCAPS8 caps; + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ 0.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{ 0.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + }; + static const D3DMATRIX identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + static const struct + { + float z, w; + D3DZBUFFERTYPE z_test; + D3DCOLOR color; + } + tests[] = + { + {0.7f, 0.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.0f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_FALSE, 0x004cb200}, + {0.3f, 0.0f, D3DZB_TRUE, 0x00b24c00}, + {0.3f, 0.0f, D3DZB_FALSE, 0x00b24c00}, + }; + unsigned int i; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE)) + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping POSITIONT table fog test.\n"); + goto done; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + /* Work around an AMD Windows driver bug. Needs a proj matrix applied redundantly. */ + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + quad[0].position.z = tests[i].z; + quad[1].position.z = tests[i].z; + quad[2].position.z = tests[i].z; + quad[3].position.z = tests[i].z; + quad[0].position.w = tests[i].w; + quad[1].position.w = tests[i].w; + quad[2].position.w = tests[i].w; + quad[3].position.w = tests[i].w; + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, tests[i].z_test); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, tests[i].color, 2), + "Got unexpected color 0x%08x, expected 0x%08x, case %u.\n", color, tests[i].color, i); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + } + +done: + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -5567,4 +5688,5 @@ START_TEST(visual) test_3dc_formats(); test_fog_interpolation(); test_negative_fixedfunction_fog(); + test_table_fog_zw(); }

1 0

Stefan Dösinger : d3d9/tests: Test rhw table fog z vs rhw.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 3b2c642163a592c772c89d81e0b272eda5e20f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2c642163a592c772c89d81e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 12 10:58:42 2015 +0100 d3d9/tests: Test rhw table fog z vs rhw. The Z disable part of the test is technically not necessary because the fog coordinate is written before applying the projection matrix. I've nevertheless included it because this is not immediately obvious and fog is the only place where the vertex Z matters if depth test and depth clipping are disabled. --- dlls/d3d9/tests/visual.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e2b7b81..1f42f5a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17327,6 +17327,127 @@ done: DestroyWindow(window); } +static void test_table_fog_zw(void) +{ + HRESULT hr; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + D3DCOLOR color; + D3DCAPS9 caps; + static struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ 0.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 0.0f, 0.0f, 0.0f}, 0xffff0000}, + {{ 0.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + {{640.0f, 480.0f, 0.0f, 0.0f}, 0xffff0000}, + }; + static const D3DMATRIX identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + static const struct + { + float z, w; + D3DZBUFFERTYPE z_test; + D3DCOLOR color; + } + tests[] = + { + {0.7f, 0.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.0f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 0.3f, D3DZB_FALSE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_TRUE, 0x004cb200}, + {0.7f, 3.0f, D3DZB_FALSE, 0x004cb200}, + {0.3f, 0.0f, D3DZB_TRUE, 0x00b24c00}, + {0.3f, 0.0f, D3DZB_FALSE, 0x00b24c00}, + }; + unsigned int i; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE)) + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping POSITIONT table fog test.\n"); + goto done; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + /* Work around an AMD Windows driver bug. Needs a proj matrix applied redundantly. */ + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + quad[0].position.z = tests[i].z; + quad[1].position.z = tests[i].z; + quad[2].position.z = tests[i].z; + quad[3].position.z = tests[i].z; + quad[0].position.w = tests[i].w; + quad[1].position.w = tests[i].w; + quad[2].position.w = tests[i].w; + quad[3].position.w = tests[i].w; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, tests[i].z_test); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, tests[i].color, 2), + "Got unexpected color 0x%08x, expected 0x%08x, case %u.\n", color, tests[i].color, i); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + } + +done: + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -17438,4 +17559,5 @@ START_TEST(visual) test_fog_interpolation(); test_negative_fixedfunction_fog(); test_position_index(); + test_table_fog_zw(); }

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
42
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 February 2015