Skip to content

Commit f2c8689

Browse files
Kode-RobbotKode-Robbot
committed
Format C
1 parent 11437bb commit f2c8689

3 files changed

Lines changed: 49 additions & 47 deletions

File tree

‎backends/gpu/webgpu/sources/commandlist.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ void kore_webgpu_command_list_begin_render_pass(kore_gpu_command_list *list, con
7070

7171
for (uint32_t attachment_index = 0; attachment_index < parameters->color_attachments_count; ++attachment_index) {
7272
WGPUTextureViewDescriptor texture_view_descriptor = {
73-
.format = kore_webgpu_convert_texture_format(parameters->color_attachments[attachment_index].texture.texture->webgpu.format),
74-
.dimension = convert_dimension(parameters->color_attachments[attachment_index].texture.dimension),
75-
.baseMipLevel = parameters->color_attachments[attachment_index].texture.base_mip_level,
76-
.mipLevelCount = parameters->color_attachments[attachment_index].texture.mip_level_count,
77-
.baseArrayLayer = parameters->color_attachments[attachment_index].texture.base_array_layer,
78-
.arrayLayerCount = parameters->color_attachments[attachment_index].texture.array_layer_count,
73+
.format = kore_webgpu_convert_texture_format(parameters->color_attachments[attachment_index].texture.texture->webgpu.format),
74+
.dimension = convert_dimension(parameters->color_attachments[attachment_index].texture.dimension),
75+
.baseMipLevel = parameters->color_attachments[attachment_index].texture.base_mip_level,
76+
.mipLevelCount = parameters->color_attachments[attachment_index].texture.mip_level_count,
77+
.baseArrayLayer = parameters->color_attachments[attachment_index].texture.base_array_layer,
78+
.arrayLayerCount = parameters->color_attachments[attachment_index].texture.array_layer_count,
7979
};
8080
texture_views[attachment_index] =
8181
wgpuTextureCreateView(parameters->color_attachments[attachment_index].texture.texture->webgpu.texture, &texture_view_descriptor);

‎backends/gpu/webgpu/sources/device.c‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -388,49 +388,50 @@ void adapter_callback(WGPURequestAdapterStatus status, WGPUAdapter adapter, char
388388

389389
// default values via https://gpuweb.github.io/gpuweb/#limits
390390
WGPURequiredLimits required_limits = {
391-
.limits = {
392-
.maxTextureDimension1D = 8192,
393-
.maxTextureDimension2D = 8192,
394-
.maxTextureDimension3D = 2048,
395-
.maxTextureArrayLayers = 256,
396-
.maxBindGroups = 4,
397-
.maxBindGroupsPlusVertexBuffers = 24,
398-
.maxBindingsPerBindGroup = 1000,
399-
.maxDynamicUniformBuffersPerPipelineLayout = 8,
400-
.maxDynamicStorageBuffersPerPipelineLayout = 4,
401-
.maxSampledTexturesPerShaderStage = 16,
402-
.maxSamplersPerShaderStage = 16,
403-
.maxStorageBuffersPerShaderStage = 8,
404-
.maxStorageTexturesPerShaderStage = 4,
405-
.maxUniformBuffersPerShaderStage = 12,
406-
.maxUniformBufferBindingSize = 65536,
407-
.maxStorageBufferBindingSize = 134217728,
408-
.minUniformBufferOffsetAlignment = 256,
409-
.minStorageBufferOffsetAlignment = 256,
410-
.maxVertexBuffers = 8,
411-
.maxBufferSize = 268435456,
412-
.maxVertexAttributes = 16,
413-
.maxVertexBufferArrayStride = 2048,
414-
.maxInterStageShaderVariables = 16,
415-
.maxColorAttachments = 8,
416-
.maxColorAttachmentBytesPerSample = 32,
417-
.maxComputeWorkgroupStorageSize = 16384,
418-
.maxComputeInvocationsPerWorkgroup = 256,
419-
.maxComputeWorkgroupSizeX = 256,
420-
.maxComputeWorkgroupSizeY = 256,
421-
.maxComputeWorkgroupSizeZ = 64,
422-
.maxComputeWorkgroupsPerDimension = 65535,
423-
424-
.maxInterStageShaderComponents = WGPU_LIMIT_U32_UNDEFINED, // removed
425-
},
391+
.limits =
392+
{
393+
.maxTextureDimension1D = 8192,
394+
.maxTextureDimension2D = 8192,
395+
.maxTextureDimension3D = 2048,
396+
.maxTextureArrayLayers = 256,
397+
.maxBindGroups = 4,
398+
.maxBindGroupsPlusVertexBuffers = 24,
399+
.maxBindingsPerBindGroup = 1000,
400+
.maxDynamicUniformBuffersPerPipelineLayout = 8,
401+
.maxDynamicStorageBuffersPerPipelineLayout = 4,
402+
.maxSampledTexturesPerShaderStage = 16,
403+
.maxSamplersPerShaderStage = 16,
404+
.maxStorageBuffersPerShaderStage = 8,
405+
.maxStorageTexturesPerShaderStage = 4,
406+
.maxUniformBuffersPerShaderStage = 12,
407+
.maxUniformBufferBindingSize = 65536,
408+
.maxStorageBufferBindingSize = 134217728,
409+
.minUniformBufferOffsetAlignment = 256,
410+
.minStorageBufferOffsetAlignment = 256,
411+
.maxVertexBuffers = 8,
412+
.maxBufferSize = 268435456,
413+
.maxVertexAttributes = 16,
414+
.maxVertexBufferArrayStride = 2048,
415+
.maxInterStageShaderVariables = 16,
416+
.maxColorAttachments = 8,
417+
.maxColorAttachmentBytesPerSample = 32,
418+
.maxComputeWorkgroupStorageSize = 16384,
419+
.maxComputeInvocationsPerWorkgroup = 256,
420+
.maxComputeWorkgroupSizeX = 256,
421+
.maxComputeWorkgroupSizeY = 256,
422+
.maxComputeWorkgroupSizeZ = 64,
423+
.maxComputeWorkgroupsPerDimension = 65535,
424+
425+
.maxInterStageShaderComponents = WGPU_LIMIT_U32_UNDEFINED, // removed
426+
},
426427
};
427428

428429
required_limits.limits.maxColorAttachmentBytesPerSample = 48; // enough to write to a cube map
429430

430431
WGPUDeviceDescriptor device_descriptor = {
431432
.requiredFeatures = required_features,
432433
.requiredFeatureCount = sizeof(required_features) / sizeof(required_features[0]),
433-
.requiredLimits = &required_limits,
434+
.requiredLimits = &required_limits,
434435
};
435436

436437
wgpuAdapterRequestDevice(wgpu_adapter, &device_descriptor, device_callback, NULL);

‎backends/gpu/webgpu/sources/pipeline.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,18 @@ void kore_webgpu_render_pipeline_init(kore_webgpu_device *device, kore_webgpu_re
105105
.bindGroupLayouts = bind_group_layouts,
106106
};
107107

108-
WGPUVertexAttribute attributes[8];
108+
WGPUVertexAttribute attributes[8];
109109
WGPUVertexBufferLayout vertex_buffer_layouts[8];
110110

111111
size_t attribute_offset = 0;
112112

113113
for (size_t buffer_index = 0; buffer_index < parameters->vertex.buffers_count; ++buffer_index) {
114114
WGPUVertexBufferLayout vertex_buffer_layout = {
115-
.arrayStride = parameters->vertex.buffers[buffer_index].array_stride,
116-
.attributeCount = parameters->vertex.buffers[buffer_index].attributes_count,
117-
.attributes = &attributes[attribute_offset],
118-
.stepMode = parameters->vertex.buffers[buffer_index].step_mode == KORE_WEBGPU_VERTEX_STEP_MODE_VERTEX ? WGPUVertexStepMode_Vertex : WGPUVertexStepMode_Instance,
115+
.arrayStride = parameters->vertex.buffers[buffer_index].array_stride,
116+
.attributeCount = parameters->vertex.buffers[buffer_index].attributes_count,
117+
.attributes = &attributes[attribute_offset],
118+
.stepMode = parameters->vertex.buffers[buffer_index].step_mode == KORE_WEBGPU_VERTEX_STEP_MODE_VERTEX ? WGPUVertexStepMode_Vertex
119+
: WGPUVertexStepMode_Instance,
119120
};
120121

121122
for (size_t attribute_index = 0; attribute_index < parameters->vertex.buffers[buffer_index].attributes_count; ++attribute_index) {

0 commit comments

Comments
 (0)