diff --git a/src/kosmickrisp/vulkan/kk_encoder.c b/src/kosmickrisp/vulkan/kk_encoder.c index e65aedc5443..43c0584148a 100644 --- a/src/kosmickrisp/vulkan/kk_encoder.c +++ b/src/kosmickrisp/vulkan/kk_encoder.c @@ -101,7 +101,7 @@ kk_encoder_start_render(struct kk_cmd_buffer *cmd, return encoder->main.encoder; } -mtl_compute_encoder * +static mtl_compute_encoder * kk_encoder_start_compute(struct kk_cmd_buffer *cmd) { struct kk_encoder *encoder = cmd->encoder; @@ -127,7 +127,7 @@ kk_encoder_start_compute(struct kk_cmd_buffer *cmd) return encoder->main.encoder; } -mtl_compute_encoder * +static mtl_compute_encoder * kk_encoder_start_blit(struct kk_cmd_buffer *cmd) { struct kk_encoder *encoder = cmd->encoder; @@ -210,6 +210,28 @@ upload_queue_writes(struct kk_cmd_buffer *cmd) kk_encoder_signal_fence_and_end(cmd); } +static struct kk_encoder_internal * +kk_encoder_get_internal(struct kk_encoder *encoder, enum kk_encoder_type type) +{ + switch (type) { + case KK_ENC_NONE: + assert(encoder->main.last_used == KK_ENC_NONE); + return NULL; + case KK_ENC_RENDER: + assert(encoder->main.last_used == KK_ENC_RENDER); + return &encoder->main; + case KK_ENC_COMPUTE: + assert(encoder->main.last_used == KK_ENC_COMPUTE); + return &encoder->main; + case KK_ENC_BLIT: + assert(encoder->main.last_used == KK_ENC_BLIT); + return &encoder->main; + default: + assert(0); + return NULL; + } +} + void kk_encoder_signal_fence_and_end(struct kk_cmd_buffer *cmd) { @@ -321,28 +343,6 @@ kk_blit_encoder(struct kk_cmd_buffer *cmd) : kk_encoder_start_blit(cmd); } -struct kk_encoder_internal * -kk_encoder_get_internal(struct kk_encoder *encoder, enum kk_encoder_type type) -{ - switch (type) { - case KK_ENC_NONE: - assert(encoder->main.last_used == KK_ENC_NONE); - return NULL; - case KK_ENC_RENDER: - assert(encoder->main.last_used == KK_ENC_RENDER); - return &encoder->main; - case KK_ENC_COMPUTE: - assert(encoder->main.last_used == KK_ENC_COMPUTE); - return &encoder->main; - case KK_ENC_BLIT: - assert(encoder->main.last_used == KK_ENC_BLIT); - return &encoder->main; - default: - assert(0); - return NULL; - } -} - static mtl_compute_encoder * kk_encoder_pre_gfx_encoder(struct kk_cmd_buffer *cmd) { diff --git a/src/kosmickrisp/vulkan/kk_encoder.h b/src/kosmickrisp/vulkan/kk_encoder.h index d216bdbf592..eb820ba604f 100644 --- a/src/kosmickrisp/vulkan/kk_encoder.h +++ b/src/kosmickrisp/vulkan/kk_encoder.h @@ -89,10 +89,6 @@ kk_encoder_start_render(struct kk_cmd_buffer *cmd, mtl_render_pass_descriptor *descriptor, uint32_t view_mask); -mtl_compute_encoder *kk_encoder_start_compute(struct kk_cmd_buffer *cmd); - -mtl_compute_encoder *kk_encoder_start_blit(struct kk_cmd_buffer *cmd); - /* Ends encoding on all command buffers */ void kk_encoder_end(struct kk_cmd_buffer *cmd); @@ -105,9 +101,6 @@ mtl_compute_encoder *kk_compute_encoder(struct kk_cmd_buffer *cmd); mtl_blit_encoder *kk_blit_encoder(struct kk_cmd_buffer *cmd); -struct kk_encoder_internal *kk_encoder_get_internal(struct kk_encoder *encoder, - enum kk_encoder_type type); - void upload_queue_writes(struct kk_cmd_buffer *cmd); void kk_encoder_render_triangle_fan_indirect(struct kk_cmd_buffer *cmd,