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

vkd3d-shader/msl: Implement VSIR_OP_STORE_UAV_TYPED.

Browse Source
This commit is contained in:
Henri Verbeet
2025-05-28 22:52:18 +02:00
parent 955fff7570
commit 1a20395e6f
Notes: Henri Verbeet 2025-07-14 18:53:23 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1609
3 changed files with 178 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/hlsl/uav-rwbuffer.shader_test
View File

@@ -184,7 +184,7 @@ float4 main() : sv_target
}
[test]
todo(msl) draw quad
draw quad
probe uav 1 (0) i32(11, -12, 13, -14)
probe uav 1 (1) i32(-15, 16, -17, 18)
@@ -203,7 +203,7 @@ float4 main() : sv_target1
}
[test]
todo(msl) draw quad
draw quad
probe uav 2 (0) f32(11.1, 12.2, 13.3, 14.4)
[require]

45
tests/shader_runner_metal.m
View File

@@ -293,6 +293,9 @@ static void init_resource_texture(struct metal_runner *runner,
break;
case RESOURCE_TYPE_UAV:
desc.usage = MTLTextureUsageShaderRead | MTLTextureUsageShaderWrite;
break;
case RESOURCE_TYPE_VERTEX_BUFFER:
break;
}
@@ -357,15 +360,13 @@ static struct resource *metal_runner_create_resource(struct shader_runner *r, co
case RESOURCE_TYPE_RENDER_TARGET:
case RESOURCE_TYPE_DEPTH_STENCIL:
case RESOURCE_TYPE_TEXTURE:
case RESOURCE_TYPE_UAV:
init_resource_texture(runner, resource, params);
break;
case RESOURCE_TYPE_VERTEX_BUFFER:
init_resource_buffer(runner, resource, params);
break;
case RESOURCE_TYPE_UAV:
break;
}
return &resource->r;
@@ -444,9 +445,24 @@ static bool compile_shader(struct metal_runner *runner, enum shader_type type, s
++interface_info.binding_count;
break;
case RESOURCE_TYPE_UAV:
binding = &bindings[interface_info.binding_count];
binding->type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV;
binding->register_space = 0;
binding->register_index = resource->r.desc.slot;
binding->shader_visibility = VKD3D_SHADER_VISIBILITY_ALL;
if (resource->r.desc.dimension == RESOURCE_DIMENSION_BUFFER)
binding->flags = VKD3D_SHADER_BINDING_FLAG_BUFFER;
else
binding->flags = VKD3D_SHADER_BINDING_FLAG_IMAGE;
binding->binding.set = 0;
binding->binding.binding = interface_info.binding_count;
binding->binding.count = 1;
++interface_info.binding_count;
break;
case RESOURCE_TYPE_RENDER_TARGET:
case RESOURCE_TYPE_DEPTH_STENCIL:
case RESOURCE_TYPE_UAV:
case RESOURCE_TYPE_VERTEX_BUFFER:
break;
@@ -538,9 +554,17 @@ static bool encode_argument_buffer(struct metal_runner *runner,
[argument_descriptors addObject:arg_desc];
break;
case RESOURCE_TYPE_UAV:
arg_desc = [MTLArgumentDescriptor argumentDescriptor];
arg_desc.dataType = MTLDataTypeTexture;
arg_desc.index = [argument_descriptors count];
arg_desc.access = MTLBindingAccessReadWrite;
arg_desc.textureType = [resource->texture textureType];
[argument_descriptors addObject:arg_desc];
break;
case RESOURCE_TYPE_RENDER_TARGET:
case RESOURCE_TYPE_DEPTH_STENCIL:
case RESOURCE_TYPE_UAV:
case RESOURCE_TYPE_VERTEX_BUFFER:
break;
}
@@ -589,9 +613,15 @@ static bool encode_argument_buffer(struct metal_runner *runner,
stages:MTLRenderStageVertex | MTLRenderStageFragment];
break;
case RESOURCE_TYPE_UAV:
[encoder setTexture:resource->texture atIndex:index++];
[command_encoder useResource:resource->texture
usage:MTLResourceUsageRead | MTLResourceUsageWrite
stages:MTLRenderStageVertex | MTLRenderStageFragment];
break;
case RESOURCE_TYPE_RENDER_TARGET:
case RESOURCE_TYPE_DEPTH_STENCIL:
case RESOURCE_TYPE_UAV:
case RESOURCE_TYPE_VERTEX_BUFFER:
break;
}
@@ -908,7 +938,8 @@ static struct resource_readback *metal_runner_get_resource_readback(struct shade
id<MTLTexture> src_texture;
unsigned int layer, level;
if (resource->r.desc.dimension != RESOURCE_DIMENSION_2D)
if (resource->r.desc.dimension != RESOURCE_DIMENSION_BUFFER
&& resource->r.desc.dimension != RESOURCE_DIMENSION_2D)
fatal_error("Unhandled resource dimension %#x.\n", resource->r.desc.dimension);
rb = malloc(sizeof(*rb));