mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 09:17:14 +00:00
d3d11/tests: Introduce a clear_uav() helper.
This fixes warnings with gcc 12.2.
(Copycat of 5fa25d00
about clear_rtv())
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
parent
798d659f04
commit
623bc9fa54
|
@ -16349,6 +16349,13 @@ static void check_rgba_sint8_(unsigned int line, DWORD data, const struct uvec4
|
||||||
data, expected[0], expected[1], x, v->x, v->y, v->z, v->w);
|
data, expected[0], expected[1], x, v->x, v->y, v->z, v->w);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void clear_uav(ID3D11DeviceContext *context, ID3D11UnorderedAccessView *uav, const struct uvec4 *uv4)
|
||||||
|
{
|
||||||
|
/* Cast to (const unsigned int *) instead of passing &uv4->x, since gcc warns about
|
||||||
|
* overreading an unsigned int[4] from an unsigned int otherwise. */
|
||||||
|
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, (const unsigned int *)uv4);
|
||||||
|
}
|
||||||
|
|
||||||
static void test_clear_buffer_unordered_access_view(void)
|
static void test_clear_buffer_unordered_access_view(void)
|
||||||
{
|
{
|
||||||
D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc;
|
D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc;
|
||||||
|
@ -16464,13 +16471,13 @@ static void test_clear_buffer_unordered_access_view(void)
|
||||||
for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
|
for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
|
||||||
{
|
{
|
||||||
uvec4 = uvec4_data[i];
|
uvec4 = uvec4_data[i];
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
|
clear_uav(context, uav, &uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
|
SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
|
||||||
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
||||||
release_resource_readback(&rb);
|
release_resource_readback(&rb);
|
||||||
|
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
|
clear_uav(context, uav2, &fe_uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
SetRect(&rect, 0, 0, U(uav_desc).Buffer.NumElements * buffer_desc.StructureByteStride / sizeof(uvec4.x), 1);
|
SetRect(&rect, 0, 0, U(uav_desc).Buffer.NumElements * buffer_desc.StructureByteStride / sizeof(uvec4.x), 1);
|
||||||
check_readback_data_color(&rb, &rect, fe_uvec4.x, 0);
|
check_readback_data_color(&rb, &rect, fe_uvec4.x, 0);
|
||||||
|
@ -16504,13 +16511,13 @@ static void test_clear_buffer_unordered_access_view(void)
|
||||||
for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
|
for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
|
||||||
{
|
{
|
||||||
uvec4 = uvec4_data[i];
|
uvec4 = uvec4_data[i];
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
|
clear_uav(context, uav, &uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
|
SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
|
||||||
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
||||||
release_resource_readback(&rb);
|
release_resource_readback(&rb);
|
||||||
|
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
|
clear_uav(context, uav2, &fe_uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1);
|
SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1);
|
||||||
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
||||||
|
@ -16543,13 +16550,13 @@ static void test_clear_buffer_unordered_access_view(void)
|
||||||
for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
|
for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
|
||||||
{
|
{
|
||||||
uvec4 = uvec4_data[i];
|
uvec4 = uvec4_data[i];
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
|
clear_uav(context, uav, &uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
|
SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
|
||||||
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
||||||
release_resource_readback(&rb);
|
release_resource_readback(&rb);
|
||||||
|
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
|
clear_uav(context, uav2, &fe_uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1);
|
SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1);
|
||||||
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
check_readback_data_color(&rb, &rect, uvec4.x, 0);
|
||||||
|
@ -16579,7 +16586,7 @@ static void test_clear_buffer_unordered_access_view(void)
|
||||||
BOOL all_match;
|
BOOL all_match;
|
||||||
|
|
||||||
uvec4 = uvec4_data[i];
|
uvec4 = uvec4_data[i];
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
|
clear_uav(context, uav, &uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x)
|
for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x)
|
||||||
{
|
{
|
||||||
|
@ -16595,7 +16602,7 @@ static void test_clear_buffer_unordered_access_view(void)
|
||||||
data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x);
|
data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x);
|
||||||
release_resource_readback(&rb);
|
release_resource_readback(&rb);
|
||||||
|
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
|
clear_uav(context, uav2, &fe_uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x)
|
for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x)
|
||||||
{
|
{
|
||||||
|
@ -16615,7 +16622,7 @@ static void test_clear_buffer_unordered_access_view(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
uvec4.x = uvec4.y = uvec4.z = uvec4.w = 0xdeadbeef;
|
uvec4.x = uvec4.y = uvec4.z = uvec4.w = 0xdeadbeef;
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
|
clear_uav(context, uav, &uvec4);
|
||||||
ID3D11UnorderedAccessView_Release(uav);
|
ID3D11UnorderedAccessView_Release(uav);
|
||||||
ID3D11UnorderedAccessView_Release(uav2);
|
ID3D11UnorderedAccessView_Release(uav2);
|
||||||
|
|
||||||
|
@ -16634,14 +16641,14 @@ static void test_clear_buffer_unordered_access_view(void)
|
||||||
for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
|
for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
|
||||||
{
|
{
|
||||||
uvec4 = uvec4_data[i];
|
uvec4 = uvec4_data[i];
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
|
clear_uav(context, uav, &uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4);
|
todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4);
|
||||||
todo_wine check_rgba_sint8(get_readback_color(&rb, 7, 0, 0), &uvec4);
|
todo_wine check_rgba_sint8(get_readback_color(&rb, 7, 0, 0), &uvec4);
|
||||||
todo_wine check_rgba_sint8(get_readback_color(&rb, 15, 0, 0), &uvec4);
|
todo_wine check_rgba_sint8(get_readback_color(&rb, 15, 0, 0), &uvec4);
|
||||||
release_resource_readback(&rb);
|
release_resource_readback(&rb);
|
||||||
|
|
||||||
ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
|
clear_uav(context, uav2, &fe_uvec4);
|
||||||
get_buffer_readback(buffer, &rb);
|
get_buffer_readback(buffer, &rb);
|
||||||
todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4);
|
todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4);
|
||||||
todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement - 1, 0, 0), &uvec4);
|
todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement - 1, 0, 0), &uvec4);
|
||||||
|
|
Loading…
Reference in a new issue