diff --git a/Backends/Graphics5/Metal/Sources/kope/metal/commandlist.m b/Backends/Graphics5/Metal/Sources/kope/metal/commandlist.m index 818477702..828c56baa 100644 --- a/Backends/Graphics5/Metal/Sources/kope/metal/commandlist.m +++ b/Backends/Graphics5/Metal/Sources/kope/metal/commandlist.m @@ -17,7 +17,7 @@ void kope_metal_command_list_destroy(kope_g5_command_list *list) {} void kope_metal_command_list_begin_render_pass(kope_g5_command_list *list, const kope_g5_render_pass_parameters *parameters) { id texture = (__bridge id)parameters->color_attachments[0].texture.texture->metal.texture; - + MTLRenderPassDescriptor *render_pass_descriptor = [MTLRenderPassDescriptor renderPassDescriptor]; render_pass_descriptor.colorAttachments[0].texture = texture; render_pass_descriptor.colorAttachments[0].loadAction = MTLLoadActionClear; @@ -44,10 +44,10 @@ void kope_metal_command_list_end_render_pass(kope_g5_command_list *list) { void kope_metal_command_list_present(kope_g5_command_list *list) { id command_buffer = (__bridge id)list->metal.command_buffer; - + CAMetalLayer *metal_layer = getMetalLayer(); id drawable = [metal_layer nextDrawable]; - + [command_buffer presentDrawable:drawable]; } @@ -60,14 +60,14 @@ void kope_metal_command_list_set_index_buffer(kope_g5_command_list *list, kope_g void kope_metal_command_list_set_vertex_buffer(kope_g5_command_list *list, uint32_t slot, kope_metal_buffer *buffer, uint64_t offset, uint64_t size, uint64_t stride) { id metal_buffer = (__bridge id)buffer->buffer; - + id render_command_encoder = (__bridge id)list->metal.render_command_encoder; [render_command_encoder setVertexBuffer:metal_buffer offset:offset atIndex:slot]; } void kope_metal_command_list_set_render_pipeline(kope_g5_command_list *list, kope_metal_render_pipeline *pipeline) { id metal_pipeline = (__bridge id)pipeline->pipeline; - + id render_command_encoder = (__bridge id)list->metal.render_command_encoder; [render_command_encoder setRenderPipelineState:metal_pipeline]; } @@ -77,17 +77,17 @@ void kope_metal_command_list_draw(kope_g5_command_list *list, uint32_t vertex_co void kope_metal_command_list_draw_indexed(kope_g5_command_list *list, uint32_t index_count, uint32_t instance_count, uint32_t first_index, int32_t base_vertex, uint32_t first_instance) { id index_buffer = (__bridge id)list->metal.index_buffer; - + id render_command_encoder = (__bridge id)list->metal.render_command_encoder; - + [render_command_encoder drawIndexedPrimitives:MTLPrimitiveTypeTriangle - indexCount:index_count - indexType:(list->metal.sixteen_bit_indices ? MTLIndexTypeUInt16 : MTLIndexTypeUInt32) - indexBuffer:index_buffer - indexBufferOffset:first_index - instanceCount:instance_count - baseVertex:base_vertex - baseInstance:first_instance]; + indexCount:index_count + indexType:list->metal.sixteen_bit_indices ? MTLIndexTypeUInt16 : MTLIndexTypeUInt32 + indexBuffer:index_buffer + indexBufferOffset:first_index + instanceCount:instance_count + baseVertex:base_vertex + baseInstance:first_instance]; } void kope_metal_command_list_set_descriptor_table(kope_g5_command_list *list, uint32_t table_index, kope_metal_descriptor_set *set, diff --git a/Backends/Graphics5/Metal/Sources/kope/metal/device.m b/Backends/Graphics5/Metal/Sources/kope/metal/device.m index c7795f317..6a6086b98 100644 --- a/Backends/Graphics5/Metal/Sources/kope/metal/device.m +++ b/Backends/Graphics5/Metal/Sources/kope/metal/device.m @@ -63,7 +63,7 @@ kope_g5_texture_format kope_metal_device_framebuffer_format(kope_g5_device *devi void kope_metal_device_execute_command_list(kope_g5_device *device, kope_g5_command_list *list) { id command_buffer = (__bridge id)list->metal.command_buffer; [command_buffer commit]; - + id command_queue = (__bridge id)list->metal.command_queue; command_buffer = [command_queue commandBuffer]; list->metal.command_buffer = (__bridge_retained void *)[command_queue commandBuffer]; diff --git a/Tools/linux_arm b/Tools/linux_arm index 1d970b9c3..bb760d42e 160000 --- a/Tools/linux_arm +++ b/Tools/linux_arm @@ -1 +1 @@ -Subproject commit 1d970b9c348459b0eff4857aa650ba8834ccdab1 +Subproject commit bb760d42e4dd75f030cf6c60999217f2fb363e2e diff --git a/Tools/linux_arm64 b/Tools/linux_arm64 index b2089ac62..5fbe01102 160000 --- a/Tools/linux_arm64 +++ b/Tools/linux_arm64 @@ -1 +1 @@ -Subproject commit b2089ac62e7b5dde84d2145fc74d3ae6031fa205 +Subproject commit 5fbe011028bc7f2a7e83a77e77ac14b9cfc9e203 diff --git a/Tools/linux_x64 b/Tools/linux_x64 index 244b26811..90103fe34 160000 --- a/Tools/linux_x64 +++ b/Tools/linux_x64 @@ -1 +1 @@ -Subproject commit 244b268111021b59e57259df682101efe25a14a8 +Subproject commit 90103fe3443ec994390f3bef2a789c19efb4bce9 diff --git a/Tools/macos b/Tools/macos index a8c3aed89..0d47d242f 160000 --- a/Tools/macos +++ b/Tools/macos @@ -1 +1 @@ -Subproject commit a8c3aed894ad52356a0551bcd7a8b43c5ca8756e +Subproject commit 0d47d242f69674c12f8a0dfe83ed276545f9992c diff --git a/Tools/windows_x64 b/Tools/windows_x64 index 965d056ef..8889a8432 160000 --- a/Tools/windows_x64 +++ b/Tools/windows_x64 @@ -1 +1 @@ -Subproject commit 965d056ef13180281a21ba5cb9a0b018fc3216a3 +Subproject commit 8889a8432cc1db8a0c38cfb0ca4d0feb8706a887