wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 799230c78ab102fa0034cb4477ce1be78c456a87.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-05-26 04:26:33 +02:00
parent 0a60add605
commit 857e9c1cd4
7 changed files with 79 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/d3d11-ID3D11Texture1D/0019-d3d11-tests-Prepare-test_texture-for-non-2d-textures.patch
View File

@@ -1,17 +1,17 @@
From a30b83149208635d5e114f553c98ea8af569cbeb Mon Sep 17 00:00:00 2001
From 40d6f33a858061a8449c6b90a795efe926a119bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 25 Aug 2016 20:06:28 +0200
Subject: d3d11/tests: Prepare test_texture for non 2d textures.
---
dlls/d3d11/tests/d3d11.c | 137 +++++++++++++++++++++++++++++------------------
1 file changed, 85 insertions(+), 52 deletions(-)
dlls/d3d11/tests/d3d11.c | 140 +++++++++++++++++++++++++++++------------------
1 file changed, 87 insertions(+), 53 deletions(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 21c5627b862..1a3adee346f 100644
index 6013ae94323..d5d41721bce 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -5955,6 +5955,7 @@ static void test_texture(void)
@@ -6213,6 +6213,7 @@ static void test_texture(void)
};
struct texture
{
@@ -19,7 +19,7 @@ index 21c5627b862..1a3adee346f 100644
UINT width;
UINT height;
UINT miplevel_count;
@@ -5966,7 +5967,7 @@ static void test_texture(void)
@@ -6224,7 +6225,7 @@ static void test_texture(void)
D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc;
struct d3d11_test_context test_context;
const struct texture *current_texture;
@@ -28,7 +28,7 @@ index 21c5627b862..1a3adee346f 100644
D3D11_SAMPLER_DESC sampler_desc;
const struct shader *current_ps;
D3D_FEATURE_LEVEL feature_level;
@@ -5974,7 +5975,7 @@ static void test_texture(void)
@@ -6232,7 +6233,7 @@ static void test_texture(void)
ID3D11DeviceContext *context;
ID3D11SamplerState *sampler;
struct resource_readback rb;
@@ -37,7 +37,7 @@ index 21c5627b862..1a3adee346f 100644
struct vec4 ps_constant;
ID3D11PixelShader *ps;
ID3D11Device *device;
@@ -6328,6 +6329,7 @@ static void test_texture(void)
@@ -6593,6 +6594,7 @@ static void test_texture(void)
};
static const struct texture rgba_texture =
{
@@ -45,7 +45,7 @@ index 21c5627b862..1a3adee346f 100644
4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM,
{
{rgba_level_0, 4 * sizeof(*rgba_level_0), 0},
@@ -6335,33 +6337,51 @@ static void test_texture(void)
@@ -6600,33 +6602,51 @@ static void test_texture(void)
{rgba_level_2, sizeof(*rgba_level_2), 0},
}
};
@@ -120,7 +120,7 @@ index 21c5627b862..1a3adee346f 100644
4, 4, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM,
{
{red_data, 6 * sizeof(*red_data)},
@@ -6369,9 +6389,11 @@ static void test_texture(void)
@@ -6634,11 +6654,14 @@ static void test_texture(void)
{blue_data, 5 * sizeof(*blue_data)},
}
};
@@ -132,9 +132,13 @@ index 21c5627b862..1a3adee346f 100644
+ static const struct texture r32u_typeless = {D3D11_RESOURCE_DIMENSION_TEXTURE2D,
+ 4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS,
{{r32_uint, 4 * sizeof(*r32_uint)}}};
- static const struct texture r9g9b9e5_texture = {4, 4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
+ static const struct texture r9g9b9e5_texture = {D3D11_RESOURCE_DIMENSION_TEXTURE2D,
+ 4, 4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
{{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}};
static const DWORD red_colors[] =
{
@@ -6660,12 +6682,12 @@ static void test_texture(void)
@@ -6936,12 +6959,12 @@ static void test_texture(void)
ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb);
@@ -153,7 +157,7 @@ index 21c5627b862..1a3adee346f 100644
sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
@@ -6723,7 +6745,7 @@ static void test_texture(void)
@@ -6999,7 +7022,7 @@ static void test_texture(void)
if (current_texture != test->texture)
{
if (texture)
@@ -162,7 +166,7 @@ index 21c5627b862..1a3adee346f 100644
if (srv)
ID3D11ShaderResourceView_Release(srv);
@@ -6731,16 +6753,23 @@ static void test_texture(void)
@@ -7007,16 +7030,23 @@ static void test_texture(void)
if (current_texture)
{
@@ -194,7 +198,7 @@ index 21c5627b862..1a3adee346f 100644
ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr);
}
else
@@ -6794,7 +6823,7 @@ static void test_texture(void)
@@ -7070,7 +7100,7 @@ static void test_texture(void)
ID3D11ShaderResourceView_Release(srv);
ID3D11SamplerState_Release(sampler);
if (texture)
@@ -203,7 +207,7 @@ index 21c5627b862..1a3adee346f 100644
ID3D11PixelShader_Release(ps);
if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_10_1)
@@ -6839,26 +6868,30 @@ static void test_texture(void)
@@ -7115,26 +7145,30 @@ static void test_texture(void)
if (current_texture != test->texture)
{
@@ -242,7 +246,7 @@ index 21c5627b862..1a3adee346f 100644
ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr);
ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv);
@@ -6883,7 +6916,7 @@ static void test_texture(void)
@@ -7159,7 +7193,7 @@ static void test_texture(void)
release_resource_readback(&rb);
}
ID3D11PixelShader_Release(ps);
@@ -252,5 +256,5 @@ index 21c5627b862..1a3adee346f 100644
ID3D11SamplerState_Release(sampler);
--
2.11.0
2.12.2