From f0a864c8a24a36c901976cfc3747e19b36a796d7 Mon Sep 17 00:00:00 2001 From: Feifan He Date: Mon, 4 Nov 2024 18:54:30 +0800 Subject: [PATCH] tests/shader_runner_metal: Create Metal vertex buffers. --- tests/shader_runner_metal.m | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_metal.m b/tests/shader_runner_metal.m index 559c2371..4f5db7fb 100644 --- a/tests/shader_runner_metal.m +++ b/tests/shader_runner_metal.m @@ -26,10 +26,15 @@ #include "vkd3d_d3dcommon.h" #undef BOOL +static const MTLResourceOptions DEFAULT_BUFFER_RESOURCE_OPTIONS = MTLResourceCPUCacheModeDefaultCache + | MTLResourceStorageModeShared + | MTLResourceHazardTrackingModeDefault; + struct metal_resource { struct resource r; + id buffer; id texture; }; @@ -107,6 +112,19 @@ static struct metal_runner *metal_runner(struct shader_runner *r) return CONTAINING_RECORD(r, struct metal_runner, r); } +static void init_resource_buffer(struct metal_runner *runner, + struct metal_resource *resource, const struct resource_params *params) +{ + id device = runner->device; + + if (params->data) + resource->buffer = [device newBufferWithBytes:params->data + length:params->data_size + options:DEFAULT_BUFFER_RESOURCE_OPTIONS]; + else + resource->buffer = [device newBufferWithLength:params->data_size options:DEFAULT_BUFFER_RESOURCE_OPTIONS]; +} + static void init_resource_texture(struct metal_runner *runner, struct metal_resource *resource, const struct resource_params *params) { @@ -157,7 +175,9 @@ static struct resource *metal_runner_create_resource(struct shader_runner *r, co resource = calloc(1, sizeof(*resource)); init_resource(&resource->r, params); - if (params->desc.dimension != RESOURCE_DIMENSION_BUFFER) + if (params->desc.dimension == RESOURCE_DIMENSION_BUFFER) + init_resource_buffer(runner, resource, params); + else init_resource_texture(runner, resource, params); return &resource->r; @@ -168,6 +188,7 @@ static void metal_runner_destroy_resource(struct shader_runner *r, struct resour struct metal_resource *resource = metal_resource(res); [resource->texture release]; + [resource->buffer release]; free(resource); } @@ -278,6 +299,7 @@ static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY pr struct { + id buffer; unsigned int idx; } vb_info[MAX_RESOURCES]; @@ -303,6 +325,7 @@ static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY pr fb_height = ~0u; /* [[buffer(0)]] is used for the descriptor argument buffer. */ vb_idx = 1; + memset(vb_info, 0, sizeof(vb_info)); for (i = 0; i < runner->r.resource_count; ++i) { resource = metal_resource(runner->r.resources[i]); @@ -332,6 +355,7 @@ static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY pr } if (!stride) break; + vb_info[resource->r.desc.slot].buffer = resource->buffer; vb_info[resource->r.desc.slot].idx = vb_idx; binding = [vertex_desc.layouts objectAtIndexedSubscript:vb_idx]; binding.stepFunction = MTLVertexStepFunctionPerVertex; @@ -368,6 +392,12 @@ static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY pr ok(attribute.format != MTLVertexFormatInvalid, "Unhandled attribute format %#x.\n", element->format); attribute.offset = attribute_offsets[i]; } + for (i = 0; i < ARRAY_SIZE(vb_info); ++i) + { + if (!vb_info[i].buffer) + continue; + [encoder setVertexBuffer:vb_info[i].buffer offset:0 atIndex:vb_info[i].idx]; + } pipeline_desc.vertexDescriptor = vertex_desc;