wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Józef Kucia : wined3d: Do not use texture unit mapping for SM4+ shaders.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: ea6c61a5342c703b2194fa334f508d377980132e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6c61a5342c703b2194fa334… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:15:56 2017 +0100 wined3d: Do not use texture unit mapping for SM4+ 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/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ecaa667..f7f6ca5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -631,7 +631,7 @@ static void shader_glsl_load_samplers(const struct wined3d_context *context, unsigned int base, count; wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, version->type, &base, &count); - tex_unit_map = version->type == WINED3D_SHADER_TYPE_COMPUTE ? NULL : context->tex_unit_map; + tex_unit_map = version->major >= 4 ? NULL : context->tex_unit_map; shader_glsl_load_samplers_range(gl_info, priv, program_id, prefix, base, count, tex_unit_map); }

1 0

Józef Kucia : wined3d: Use layout qualifiers to bind GLSL uniform blocks.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 9d3b2958caf20039d9f2b01c6836b9175d3e58a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3b2958caf20039d9f2b01c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:15:55 2017 +0100 wined3d: Use layout qualifiers to bind GLSL uniform blocks. 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 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 543acda..ecaa667 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -567,11 +567,15 @@ static void shader_glsl_init_uniform_block_bindings(const struct wined3d_gl_info struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) { - struct wined3d_string_buffer *name = string_buffer_get(&priv->string_buffers); const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + struct wined3d_string_buffer *name; unsigned int i, base, count; GLuint block_idx; + if (shader_glsl_use_layout_binding_qualifier(gl_info)) + return; + + name = string_buffer_get(&priv->string_buffers); wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, reg_maps->shader_version.type, &base, &count); for (i = 0; i < count; ++i) { @@ -1982,6 +1986,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_indexable_temp *idx_temp_reg; + unsigned int uniform_block_base, uniform_block_count; unsigned int i, extra_constants_needed = 0; const struct wined3d_shader_lconst *lconst; const char *prefix; @@ -2082,11 +2087,17 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform vec4 %s_icb[%u];\n", prefix, reg_maps->icb->vec4_count); /* Declare constant buffers */ - for (i = 0; i < WINED3D_MAX_CBS; ++i) + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, version->type, + &uniform_block_base, &uniform_block_count); + for (i = 0; i < min(uniform_block_count, WINED3D_MAX_CBS); ++i) { if (reg_maps->cb_sizes[i]) + { + if (shader_glsl_use_layout_binding_qualifier(gl_info)) + shader_addline(buffer, "layout(binding = %u)\n", uniform_block_base + i); shader_addline(buffer, "layout(std140) uniform block_%s_cb%u { vec4 %s_cb%u[%u]; };\n", prefix, i, prefix, i, reg_maps->cb_sizes[i]); + } } /* Declare texture samplers */

1 0

Józef Kucia : wined3d: Use layout qualifiers to bind GLSL images.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 3567544ade21946ae8fdf408bae321a938244870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3567544ade21946ae8fdf408b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:15:54 2017 +0100 wined3d: Use layout qualifiers to bind GLSL images. 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 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5d738b8..543acda 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -558,6 +558,11 @@ void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint pro print_glsl_info_log(gl_info, program, TRUE); } +static BOOL shader_glsl_use_layout_binding_qualifier(const struct wined3d_gl_info *gl_info) +{ + return !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]; +} + static void shader_glsl_init_uniform_block_bindings(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) @@ -650,11 +655,15 @@ static void shader_glsl_load_icb(const struct wined3d_gl_info *gl_info, struct s static void shader_glsl_load_images(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) { - struct wined3d_string_buffer *name = string_buffer_get(&priv->string_buffers); const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + struct wined3d_string_buffer *name; GLint location; unsigned int i; + if (shader_glsl_use_layout_binding_qualifier(gl_info)) + return; + + name = string_buffer_get(&priv->string_buffers); for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) { if (!reg_maps->uav_resource_info[i].type) @@ -2243,6 +2252,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont break; } + if (shader_glsl_use_layout_binding_qualifier(gl_info)) + shader_addline(buffer, "layout(binding = %u)\n", i); if (reg_maps->uav_read_mask & (1u << i)) shader_addline(buffer, "layout(%s) uniform %s%s %s_image%u;\n", read_format, image_type_prefix, image_type, prefix, i);

1 0

Matteo Bruni : ddraw/tests: Port test_compute_sphere_visibility() to ddraw4.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: b772dfd502f6de01885d2589951551ffba4210f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b772dfd502f6de01885d25899… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:58 2017 +0100 ddraw/tests: Port test_compute_sphere_visibility() to ddraw4. 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/ddraw/tests/ddraw4.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e6248f0..2f92a70 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -13450,6 +13450,107 @@ static void test_vb_refcount(void) DestroyWindow(window); } +static void test_compute_sphere_visibility(void) +{ + static D3DMATRIX proj_1 = + { + 1.810660f, 0.000000f, 0.000000f, 0.000000f, + 0.000000f, 2.414213f, 0.000000f, 0.000000f, + 0.000000f, 0.000000f, 1.020408f, 1.000000f, + 0.000000f, 0.000000f, -0.102041f, 0.000000f, + }; + static D3DMATRIX proj_2 = + { + 10.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 10.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 10.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; + static D3DMATRIX view_1 = + { + 1.000000f, 0.000000f, 0.000000f, 0.000000f, + 0.000000f, 0.768221f, -0.640185f, 0.000000f, + -0.000000f, 0.640185f, 0.768221f, 0.000000f, + -14.852037f, 9.857489f, 11.600972f, 1.000000f, + }; + 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, + }; + static struct + { + D3DMATRIX *view, *proj; + unsigned int sphere_count; + D3DVECTOR center[3]; + D3DVALUE radius[3]; + const DWORD expected[3]; + BOOL todo; + } + tests[] = + { + {&view_1, &proj_1, 1, {{{11.461533f}, {-4.761727f}, {-1.171646f}}}, {38.252632f}, {0x1555}}, + {&view_1, &proj_1, 3, {{{-3.515620f}, {-1.560661f}, {-12.464638f}}, + {{14.290396f}, {-2.981143f}, {-24.311312f}}, + {{1.461626f}, {-6.093709f}, {-13.901010f}}}, + {4.354097f, 12.500704f, 17.251318f}, {0x154a, 0x1555, 0x1555}}, + {&identity, &proj_2, 1, {{{0.0f}, {0.0f}, {0.05f}}}, {0.04f}, {0x1555}, TRUE}, + {&identity, &identity, 1, {{{0.0f}, {0.0f}, {0.5f}}}, {0.5f}, {0x1401}}, + {&identity, &identity, 1, {{{0.0f}, {0.0f}, {0.0f}}}, {0.0f}, {0x401}}, + {&identity, &identity, 1, {{{-1.0f}, {-1.0f}, {0.5f}}}, {0.25f}, {0x1505}, TRUE}, /* 5 */ + {&identity, &identity, 1, {{{-20.0f}, {0.0f}, {0.5f}}}, {3.0f}, {0x154a}}, + {&identity, &identity, 1, {{{20.0f}, {0.0f}, {0.5f}}}, {3.0f}, {0x1562}}, + {&identity, &identity, 1, {{{0.0f}, {-20.0f}, {0.5f}}}, {3.0f}, {0x1616}}, + {&identity, &identity, 1, {{{0.0f}, {20.0f}, {0.5f}}}, {3.0f}, {0x1496}}, + {&identity, &identity, 1, {{{0.0f}, {0.0f}, {-20.0f}}}, {3.0f}, {0x956}}, /* 10 */ + {&identity, &identity, 1, {{{0.0f}, {0.0f}, {20.0f}}}, {3.0f}, {0x2156}}, + }; + IDirect3DViewport3 *viewport; + IDirect3DDevice3 *device; + unsigned int i, j; + DWORD result[3]; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d_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; + } + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr); + + IDirect3DDevice3_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &identity); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + IDirect3DDevice3_SetTransform(device, D3DTRANSFORMSTATE_VIEW, tests[i].view); + IDirect3DDevice3_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, tests[i].proj); + + hr = IDirect3DDevice3_ComputeSphereVisibility(device, tests[i].center, tests[i].radius, + tests[i].sphere_count, 0, result); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < tests[i].sphere_count; ++j) + todo_wine_if(tests[i].todo) + ok(result[j] == tests[i].expected[j], "Test %u sphere %u: expected %#x, got %#x.\n", + i, j, tests[i].expected[j], result[j]); + } + + destroy_viewport(device, viewport); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { IDirectDraw4 *ddraw; @@ -13555,4 +13656,5 @@ START_TEST(ddraw4) test_get_surface_from_dc(); test_ck_operation(); test_vb_refcount(); + test_compute_sphere_visibility(); }

1 0

Matteo Bruni : ddraw: Fix d3d6 version of ComputeSphereVisibility().
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 8bfc9e66143e8cb079432ba94187f4e9baeb08d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc9e66143e8cb079432ba94… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:57 2017 +0100 ddraw: Fix d3d6 version of ComputeSphereVisibility(). 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/ddraw/device.c | 122 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 88 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6e212c9..772ce3e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4494,46 +4494,48 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface * *****************************************************************************/ -static DWORD in_plane(UINT idx, struct wined3d_vec4 p, D3DVECTOR center, D3DVALUE radius) +static DWORD in_plane(UINT idx, struct wined3d_vec4 p, D3DVECTOR center, D3DVALUE radius, BOOL equality) { float distance, norm; norm = sqrtf(p.x * p.x + p.y * p.y + p.z * p.z); distance = (p.x * center.u1.x + p.y * center.u2.y + p.z * center.u3.z + p.w) / norm; - if (fabs(distance) < radius) - return D3DSTATUS_CLIPUNIONLEFT << idx; - if (distance < -radius) - return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << idx; + if (equality) + { + if (fabs(distance) <= radius) + return D3DSTATUS_CLIPUNIONLEFT << idx; + if (distance <= -radius) + return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << idx; + } + else + { + if (fabs(distance) < radius) + return D3DSTATUS_CLIPUNIONLEFT << idx; + if (distance < -radius) + return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << idx; + } return 0; } -static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *iface, - D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values) +static void prepare_clip_space_planes(struct d3d_device *device, struct wined3d_vec4 *plane) { - struct wined3d_vec4 plane[12]; - DWORD enabled_planes; D3DMATRIX m, temp; - HRESULT hr; - UINT i, j; - TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n", - iface, centers, radii, sphere_count, flags, return_values); + /* We want the wined3d matrices since those include the legacy viewport + * transformation. */ + wined3d_mutex_lock(); + wined3d_device_get_transform(device->wined3d_device, + WINED3D_TS_WORLD, (struct wined3d_matrix *)&m); - hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_WORLD, &m); - if (hr != DD_OK) - return DDERR_INVALIDPARAMS; - hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_VIEW, &temp); - if (hr != DD_OK) - return DDERR_INVALIDPARAMS; + wined3d_device_get_transform(device->wined3d_device, + WINED3D_TS_VIEW, (struct wined3d_matrix *)&temp); multiply_matrix(&m, &temp, &m); - hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_PROJECTION, &temp); - if (hr != DD_OK) - return DDERR_INVALIDPARAMS; + wined3d_device_get_transform(device->wined3d_device, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&temp); multiply_matrix(&m, &temp, &m); - - IDirect3DDevice7_GetRenderState(iface, D3DRENDERSTATE_CLIPPLANEENABLE, &enabled_planes); + wined3d_mutex_unlock(); /* Left plane. */ plane[0].x = m._14 + m._11; @@ -4570,33 +4572,85 @@ static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *ifac plane[5].y = m._24 - m._23; plane[5].z = m._34 - m._33; plane[5].w = m._44 - m._43; +} - for (j = 6; j < 12; ++j) - IDirect3DDevice7_GetClipPlane(iface, j - 6, (D3DVALUE *)&plane[j]); +static void compute_sphere_visibility(struct wined3d_vec4 plane[12], DWORD enabled_planes, BOOL equality, + D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD *return_values) +{ + UINT i, j; for (i = 0; i < sphere_count; ++i) { return_values[i] = 0; - for (j = 0; j < 6; ++j) - return_values[i] |= in_plane(j, plane[j], centers[i], radii[i]); - for (; j < 12; ++j) - if (enabled_planes & 1u << (j - 6)) - return_values[i] |= in_plane(j, plane[j], centers[i], radii[i]); + for (j = 0; j < 12; ++j) + if (enabled_planes & 1u << j) + return_values[i] |= in_plane(j, plane[j], centers[i], radii[i], equality); } +} + +static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *iface, + D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values) +{ + struct wined3d_vec4 plane[12]; + DWORD enabled_planes = 0x3f; + DWORD user_clip_planes; + UINT j; + + TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n", + iface, centers, radii, sphere_count, flags, return_values); + + prepare_clip_space_planes(impl_from_IDirect3DDevice7(iface), plane); + IDirect3DDevice7_GetRenderState(iface, D3DRENDERSTATE_CLIPPLANEENABLE, &user_clip_planes); + enabled_planes |= user_clip_planes << 6; + for (j = 6; j < 12; ++j) + IDirect3DDevice7_GetClipPlane(iface, j - 6, (D3DVALUE *)&plane[j]); + + compute_sphere_visibility(plane, enabled_planes, FALSE, centers, radii, sphere_count, return_values); return D3D_OK; } static HRESULT WINAPI d3d_device3_ComputeSphereVisibility(IDirect3DDevice3 *iface, D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values) { - struct d3d_device *device = impl_from_IDirect3DDevice3(iface); + static const DWORD enabled_planes = 0x3f; + struct wined3d_vec4 plane[6]; + unsigned int i, j; TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n", iface, centers, radii, sphere_count, flags, return_values); - return IDirect3DDevice7_ComputeSphereVisibility(&device->IDirect3DDevice7_iface, - centers, radii, sphere_count, flags, return_values); + prepare_clip_space_planes(impl_from_IDirect3DDevice3(iface), plane); + + compute_sphere_visibility(plane, enabled_planes, TRUE, centers, radii, sphere_count, return_values); + for (i = 0; i < sphere_count; ++i) + { + BOOL intersect_frustum = FALSE, outside_frustum = FALSE; + DWORD d3d7_result = return_values[i]; + + return_values[i] = 0; + + for (j = 0; j < 6; ++j) + { + DWORD clip = (d3d7_result >> j) & (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT); + + if (clip == D3DSTATUS_CLIPUNIONLEFT) + { + return_values[i] |= D3DVIS_INTERSECT_LEFT << j * 2; + intersect_frustum = TRUE; + } + else if (clip) + { + return_values[i] |= D3DVIS_OUTSIDE_LEFT << j * 2; + outside_frustum = TRUE; + } + } + if (outside_frustum) + return_values[i] |= D3DVIS_OUTSIDE_FRUSTUM; + else if (intersect_frustum) + return_values[i] |= D3DVIS_INTERSECT_FRUSTUM; + } + return D3D_OK; } /*****************************************************************************

1 0

Matteo Bruni : ddraw/tests: Cleanup and extend d3d7 ComputeSphereVisibility() tests.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 52512b3d012ccef4e5eeba3263e7d7cf3366fa4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52512b3d012ccef4e5eeba326… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:56 2017 +0100 ddraw/tests: Cleanup and extend d3d7 ComputeSphereVisibility() tests. 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/ddraw/tests/d3d.c | 189 ---------------------------------------------- dlls/ddraw/tests/ddraw7.c | 107 ++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52512b3d012ccef4e5eeb…

1 0

Matteo Bruni : ddraw: Take user clip planes into account in d3d7 ComputeSphereVisibility().
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 5f5e83977b8a184b28ced55210978d22ac56a607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5e83977b8a184b28ced5521… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:55 2017 +0100 ddraw: Take user clip planes into account in d3d7 ComputeSphereVisibility(). 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/ddraw/device.c | 105 +++++++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 56a4a6b..6e212c9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4494,24 +4494,26 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface * *****************************************************************************/ -static DWORD in_plane(UINT plane, D3DVECTOR normal, D3DVALUE origin_plane, D3DVECTOR center, D3DVALUE radius) +static DWORD in_plane(UINT idx, struct wined3d_vec4 p, D3DVECTOR center, D3DVALUE radius) { float distance, norm; - norm = sqrtf(normal.u1.x * normal.u1.x + normal.u2.y * normal.u2.y + normal.u3.z * normal.u3.z); - distance = ( origin_plane + normal.u1.x * center.u1.x + normal.u2.y * center.u2.y + normal.u3.z * center.u3.z ) / norm; + norm = sqrtf(p.x * p.x + p.y * p.y + p.z * p.z); + distance = (p.x * center.u1.x + p.y * center.u2.y + p.z * center.u3.z + p.w) / norm; - if ( fabs( distance ) < radius ) return D3DSTATUS_CLIPUNIONLEFT << plane; - if ( distance < -radius ) return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << plane; + if (fabs(distance) < radius) + return D3DSTATUS_CLIPUNIONLEFT << idx; + if (distance < -radius) + return (D3DSTATUS_CLIPUNIONLEFT | D3DSTATUS_CLIPINTERSECTIONLEFT) << idx; return 0; } static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *iface, D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values) { + struct wined3d_vec4 plane[12]; + DWORD enabled_planes; D3DMATRIX m, temp; - D3DVALUE origin_plane[6]; - D3DVECTOR vec[6]; HRESULT hr; UINT i, j; @@ -4519,56 +4521,67 @@ static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *ifac iface, centers, radii, sphere_count, flags, return_values); hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_WORLD, &m); - if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; + if (hr != DD_OK) + return DDERR_INVALIDPARAMS; hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_VIEW, &temp); - if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; + if (hr != DD_OK) + return DDERR_INVALIDPARAMS; multiply_matrix(&m, &temp, &m); hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_PROJECTION, &temp); - if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; + if (hr != DD_OK) + return DDERR_INVALIDPARAMS; multiply_matrix(&m, &temp, &m); -/* Left plane */ - vec[0].u1.x = m._14 + m._11; - vec[0].u2.y = m._24 + m._21; - vec[0].u3.z = m._34 + m._31; - origin_plane[0] = m._44 + m._41; - -/* Right plane */ - vec[1].u1.x = m._14 - m._11; - vec[1].u2.y = m._24 - m._21; - vec[1].u3.z = m._34 - m._31; - origin_plane[1] = m._44 - m._41; - -/* Top plane */ - vec[2].u1.x = m._14 - m._12; - vec[2].u2.y = m._24 - m._22; - vec[2].u3.z = m._34 - m._32; - origin_plane[2] = m._44 - m._42; - -/* Bottom plane */ - vec[3].u1.x = m._14 + m._12; - vec[3].u2.y = m._24 + m._22; - vec[3].u3.z = m._34 + m._32; - origin_plane[3] = m._44 + m._42; - -/* Front plane */ - vec[4].u1.x = m._13; - vec[4].u2.y = m._23; - vec[4].u3.z = m._33; - origin_plane[4] = m._43; - -/* Back plane*/ - vec[5].u1.x = m._14 - m._13; - vec[5].u2.y = m._24 - m._23; - vec[5].u3.z = m._34 - m._33; - origin_plane[5] = m._44 - m._43; + IDirect3DDevice7_GetRenderState(iface, D3DRENDERSTATE_CLIPPLANEENABLE, &enabled_planes); + + /* Left plane. */ + plane[0].x = m._14 + m._11; + plane[0].y = m._24 + m._21; + plane[0].z = m._34 + m._31; + plane[0].w = m._44 + m._41; + + /* Right plane. */ + plane[1].x = m._14 - m._11; + plane[1].y = m._24 - m._21; + plane[1].z = m._34 - m._31; + plane[1].w = m._44 - m._41; + + /* Top plane. */ + plane[2].x = m._14 - m._12; + plane[2].y = m._24 - m._22; + plane[2].z = m._34 - m._32; + plane[2].w = m._44 - m._42; + + /* Bottom plane. */ + plane[3].x = m._14 + m._12; + plane[3].y = m._24 + m._22; + plane[3].z = m._34 + m._32; + plane[3].w = m._44 + m._42; + + /* Front plane. */ + plane[4].x = m._13; + plane[4].y = m._23; + plane[4].z = m._33; + plane[4].w = m._43; + + /* Back plane. */ + plane[5].x = m._14 - m._13; + plane[5].y = m._24 - m._23; + plane[5].z = m._34 - m._33; + plane[5].w = m._44 - m._43; + + for (j = 6; j < 12; ++j) + IDirect3DDevice7_GetClipPlane(iface, j - 6, (D3DVALUE *)&plane[j]); for (i = 0; i < sphere_count; ++i) { return_values[i] = 0; for (j = 0; j < 6; ++j) - return_values[i] |= in_plane(j, vec[j], origin_plane[j], centers[i], radii[i]); + return_values[i] |= in_plane(j, plane[j], centers[i], radii[i]); + for (; j < 12; ++j) + if (enabled_planes & 1u << (j - 6)) + return_values[i] |= in_plane(j, plane[j], centers[i], radii[i]); } return D3D_OK;

1 0

Matteo Bruni : d3d9/tests: Fix test_updatetexture() on GPUs not supporting WINED3DFMT_R32_FLOAT.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 7bcd6ed4c4341ff766bf6dedba76dc494c9b2104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcd6ed4c4341ff766bf6dedb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:54 2017 +0100 d3d9/tests: Fix test_updatetexture() on GPUs not supporting WINED3DFMT_R32_FLOAT. 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 | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 227b7c2..2fa3032 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19631,18 +19631,18 @@ done: static void test_updatetexture(void) { - IDirect3DDevice9 *device; - IDirect3D9 *d3d9; - HWND window; - HRESULT hr; + BOOL r32f_supported, ati2n_supported, do_visual_test; IDirect3DBaseTexture9 *src, *dst; unsigned int t, i, f, l, x, y, z; D3DLOCKED_RECT locked_rect; D3DLOCKED_BOX locked_box; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; ULONG refcount; - D3DCAPS9 caps; D3DCOLOR color; - BOOL ati2n_supported, do_visual_test; + D3DCAPS9 caps; + HWND window; + HRESULT hr; static const struct { struct vec3 pos; @@ -19776,23 +19776,29 @@ static void test_updatetexture(void) texture_types[t].name); continue; } + r32f_supported = TRUE; + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_FILTER, texture_types[t].type, D3DFMT_R32F))) + { + skip("%s R32F textures are not supported, skipping some tests.\n", texture_types[t].name); + r32f_supported = FALSE; + } + ati2n_supported = TRUE; if (FAILED(IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_FILTER, texture_types[t].type, MAKEFOURCC('A','T','I','2')))) { skip("%s ATI2N textures are not supported, skipping some tests.\n", texture_types[t].name); ati2n_supported = FALSE; } - else - { - ati2n_supported = TRUE; - } hr = IDirect3DDevice9_SetFVF(device, texture_types[t].fvf); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { - if (tests[i].src_format == MAKEFOURCC('A','T','I','2') && !ati2n_supported) + if (tests[i].dst_format == D3DFMT_R32F && !r32f_supported) + continue; + if (tests[i].dst_format == MAKEFOURCC('A','T','I','2') && !ati2n_supported) continue; switch (texture_types[t].type)

1 0

Matteo Bruni : wined3d: Fix the TRACE in wined3d_texture_remove_buffer_object().
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 630ba97900c350cae1a6f1c52630e88a0b81f548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630ba97900c350cae1a6f1c52… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:53 2017 +0100 wined3d: Fix the TRACE in wined3d_texture_remove_buffer_object(). 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/texture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2688735..5279af8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -435,16 +435,16 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) { - GLuint *buffer_object; + GLuint *buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; - buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; GL_EXTCALL(glDeleteBuffers(1, buffer_object)); checkGLcall("glDeleteBuffers"); - wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); - *buffer_object = 0; TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", *buffer_object, texture, sub_resource_idx); + + wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); + *buffer_object = 0; } static void wined3d_texture_update_map_binding(struct wined3d_texture *texture)

1 0

Matteo Bruni : d3d9/tests: Ignore test_vshader_input() "no color attribute " test result on WARP.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 1a37a9fa8dc6e7d8fbd16a35b2f17721e63db9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a37a9fa8dc6e7d8fbd16a35b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 14 00:09:52 2017 +0100 d3d9/tests: Ignore test_vshader_input() "no color attribute" test result on WARP. 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 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a615596..227b7c2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8093,11 +8093,8 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - /* WARP ends up using the color attribute from the previous draw. Let's mark - * that behavior as broken. */ color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00000000, 1) - || broken(color_match(color, 0x00ffff00, 1)), + ok(color_match(color, 0x00000000, 1) || broken(warp), "Got unexpected color 0x%08x for no color attribute test.\n", color); IDirect3DDevice9_SetVertexShader(device, NULL);

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
72
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 March 2017