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

Józef Kucia : d3d11/tests: Add basic test for texturing on feature level 9.
by Alexandre Julliard 15 Mar '17

15 Mar '17

Module: wine Branch: master Commit: 3f10995ecb362526a1428bcf44864e3744e5537c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f10995ecb362526a1428bcf4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 15 12:00:06 2017 +0100 d3d11/tests: Add basic test for texturing on feature level 9. 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 | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2bcbec8..8523265 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11826,7 +11826,11 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) { struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11ShaderResourceView *srv; ID3D11DeviceContext *context; + ID3D11Texture2D *texture; ID3D11PixelShader *ps; ID3D11Device *device; HRESULT hr; @@ -11853,6 +11857,34 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, }; + static const DWORD ps_texture_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main() : SV_TARGET + { + return t.Sample(s, (float2)0); + } +#endif + 0x43425844, 0xf876c2db, 0x13725f1f, 0xcb6d3d65, 0x9994473f, 0x00000001, 0x000001d4, 0x00000005, + 0x00000034, 0x000000a0, 0x00000124, 0x00000190, 0x000001a0, 0x53414e58, 0x00000064, 0x00000064, + 0xffff0200, 0x0000003c, 0x00000028, 0x00280000, 0x00280000, 0x00280000, 0x00240001, 0x00280000, + 0x00000000, 0xffff0200, 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0200001f, 0x90000000, 0xa00f0800, 0x03000042, 0x800f0800, 0xa0000000, 0xa0e40800, 0x0000ffff, + 0x396e6f41, 0x0000007c, 0x0000007c, 0xffff0200, 0x00000054, 0x00000028, 0x00280000, 0x00280000, + 0x00280000, 0x00240001, 0x00280000, 0x00000000, 0xffff0200, 0x05000051, 0xa00f0000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x0200001f, 0x90000000, 0xa00f0800, 0x02000001, 0x80030000, + 0xa0000000, 0x03000042, 0x800f0000, 0x80e40000, 0xa0e40800, 0x02000001, 0x800f0800, 0x80e40000, + 0x0000ffff, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x0c000045, + 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46, + 0x00000000, 0x00106000, 0x00000000, 0x0100003e, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, + }; + static const DWORD texture_data[] = {0xffffff00}; if (!init_test_context(&test_context, &feature_level)) return; @@ -11860,9 +11892,27 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) device = test_context.device; context = test_context.immediate_context; + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x, feature level %#x.\n", - hr, feature_level); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x, feature level %#x.\n", hr, feature_level); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); draw_quad(&test_context); check_texture_color(test_context.backbuffer, 0x7f0000ff, 1); @@ -11871,6 +11921,16 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) draw_color_quad(&test_context, &color); todo_wine check_texture_color(test_context.backbuffer, 0xff004c33, 1); + hr = ID3D11Device_CreatePixelShader(device, ps_texture_code, sizeof(ps_texture_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x, feature level %#x.\n", hr, feature_level); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffff00, 1); + ID3D11PixelShader_Release(ps); + + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture2D_Release(texture); release_test_context(&test_context); }

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 : 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: 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: 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

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

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: 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: Allow using more than MAX_COMBINED_SAMPLERS texture image units.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 1865352e3f33db85bf533be5694133095fdd964f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1865352e3f33db85bf533be56… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:15:57 2017 +0100 wined3d: Allow using more than MAX_COMBINED_SAMPLERS texture image units. 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/context.c | 48 ++++++++++++++++++++++++++++++------------ dlls/wined3d/directx.c | 26 +++++++++++++++++------ dlls/wined3d/glsl_shader.c | 26 +++++++++++++++++++++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 44 ++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 6 ++++-- 6 files changed, 99 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1865352e3f33db85bf533…

1 0

Józef Kucia : wined3d: Introduce context_get_tex_unit_mapping() helper function.
by Alexandre Julliard 14 Mar '17

14 Mar '17

Module: wine Branch: master Commit: 12edaf9ad01db5f759616488267aa36a732f1314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12edaf9ad01db5f7596164882… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 14 13:15:58 2017 +0100 wined3d: Introduce context_get_tex_unit_mapping() helper function. 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/context.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 35 ++++++----------------------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 42b1245..e1ecbbb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2081,6 +2081,43 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont if (destroy) HeapFree(GetProcessHeap(), 0, context); } +const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, + const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!shader_version) + { + *base = 0; + *count = MAX_TEXTURES; + return context->tex_unit_map; + } + + if (shader_version->major >= 4) + { + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, shader_version->type, base, count); + return NULL; + } + + switch (shader_version->type) + { + case WINED3D_SHADER_TYPE_PIXEL: + *base = 0; + *count = MAX_FRAGMENT_SAMPLERS; + break; + case WINED3D_SHADER_TYPE_VERTEX: + *base = MAX_FRAGMENT_SAMPLERS; + *count = MAX_VERTEX_SAMPLERS; + break; + default: + ERR("Unhandled shader type %#x.\n", shader_version->type); + *base = 0; + *count = 0; + } + + return context->tex_unit_map; +} + /* Context activation is done by the caller. */ static void set_blit_dimension(const struct wined3d_gl_info *gl_info, UINT width, UINT height) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 572d2ef..34427ea 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -624,36 +624,15 @@ static void shader_glsl_load_samplers_range(const struct wined3d_gl_info *gl_inf static void shader_glsl_load_samplers(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) { - const struct wined3d_shader_version *version = &reg_maps->shader_version; - const char *prefix = shader_glsl_get_prefix(version->type); const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_shader_version *shader_version; const DWORD *tex_unit_map; unsigned int base, count; + const char *prefix; - if (reg_maps->shader_version.major >= 4) - { - tex_unit_map = NULL; - wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, version->type, &base, &count); - } - else - { - tex_unit_map = context->tex_unit_map; - switch (reg_maps->shader_version.type) - { - case WINED3D_SHADER_TYPE_PIXEL: - base = 0; - count = MAX_FRAGMENT_SAMPLERS; - break; - case WINED3D_SHADER_TYPE_VERTEX: - base = MAX_FRAGMENT_SAMPLERS; - count = MAX_VERTEX_SAMPLERS; - break; - default: - ERR("Unhandled shader type %#x.\n", reg_maps->shader_version.type); - return; - } - } - + shader_version = reg_maps ? &reg_maps->shader_version : NULL; + prefix = shader_glsl_get_prefix(shader_version ? shader_version->type : WINED3D_SHADER_TYPE_PIXEL); + tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); shader_glsl_load_samplers_range(gl_info, priv, program_id, prefix, base, count, tex_unit_map); } @@ -9096,9 +9075,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; - shader_glsl_load_samplers_range(gl_info, priv, program_id, - shader_glsl_get_prefix(WINED3D_SHADER_TYPE_PIXEL), - 0, MAX_TEXTURES, context->tex_unit_map); + shader_glsl_load_samplers(context, priv, program_id, NULL); } for (i = 0; i < MAX_TEXTURES; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80b7236..8637dd3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1926,6 +1926,8 @@ void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DECLSPEC_HIDDEN; +const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, + const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN;

1 0