From 4a407e0ad8801cc822666f41591094b2cbb2e826 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 15 Apr 2021 08:59:16 -0400 Subject: [PATCH] zink: mark some functions inline Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_context.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 7621b44..7183dbe 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -373,7 +373,7 @@ zink_create_sampler_state(struct pipe_context *pctx, return sampler; } -static VkImageLayout +ALWAYS_INLINE static VkImageLayout get_layout_for_binding(struct zink_resource *res, enum zink_descriptor_type type) { if (res->obj->is_buffer) @@ -392,7 +392,7 @@ get_layout_for_binding(struct zink_resource *res, enum zink_descriptor_type type return 0; } -static struct zink_surface * +ALWAYS_INLINE static struct zink_surface * get_imageview_for_binding(struct zink_context *ctx, enum pipe_shader_type stage, enum zink_descriptor_type type, unsigned idx) { switch (type) { @@ -411,7 +411,7 @@ get_imageview_for_binding(struct zink_context *ctx, enum pipe_shader_type stage, return VK_NULL_HANDLE; } -static struct zink_buffer_view * +ALWAYS_INLINE static struct zink_buffer_view * get_bufferview_for_binding(struct zink_context *ctx, enum pipe_shader_type stage, enum zink_descriptor_type type, unsigned idx) { switch (type) { @@ -430,7 +430,7 @@ get_bufferview_for_binding(struct zink_context *ctx, enum pipe_shader_type stage return VK_NULL_HANDLE; } -static void +ALWAYS_INLINE static void update_descriptor_state(struct zink_context *ctx, enum pipe_shader_type shader, enum zink_descriptor_type type, unsigned slot) { struct zink_screen *screen = zink_screen(ctx->base.screen); @@ -859,7 +859,7 @@ zink_set_polygon_stipple(struct pipe_context *pctx, { } -static inline void +ALWAYS_INLINE static void update_res_bind_count(struct zink_context *ctx, struct zink_resource *res, bool is_compute, bool decrement) { if (decrement) { @@ -870,7 +870,7 @@ update_res_bind_count(struct zink_context *ctx, struct zink_resource *res, bool res->bind_count[is_compute]++; } -static void +ALWAYS_INLINE static void update_existing_vbo(struct zink_context *ctx, unsigned slot) { if (!ctx->vertex_buffers[slot].buffer.resource) @@ -978,7 +978,7 @@ zink_set_inlinable_constants(struct pipe_context *pctx, ctx->inlinable_uniforms_valid_mask |= 1 << shader; } -static inline void +ALWAYS_INLINE static void unbind_ubo(struct zink_context *ctx, struct zink_resource *res, bool is_compute) { if (!res) @@ -1061,7 +1061,7 @@ zink_set_constant_buffer(struct pipe_context *pctx, zink_screen(pctx->screen)->context_invalidate_descriptor_state(ctx, shader, ZINK_DESCRIPTOR_TYPE_UBO, index, 1); } -static inline void +ALWAYS_INLINE static void unbind_ssbo(struct zink_context *ctx, struct zink_resource *res, bool is_compute, bool writable) { if (!res) @@ -1280,7 +1280,7 @@ zink_set_shader_images(struct pipe_context *pctx, zink_screen(pctx->screen)->context_invalidate_descriptor_state(ctx, p_stage, ZINK_DESCRIPTOR_TYPE_IMAGE, start_slot, count); } -static void +ALWAYS_INLINE static void unbind_samplerview(struct zink_context *ctx, enum pipe_shader_type stage, unsigned slot) { struct zink_sampler_view *sv = zink_sampler_view(ctx->sampler_views[stage][slot]); -- 2.7.4