fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 03:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

asahi: clang-format

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38955>
This commit is contained in:
Alyssa Rosenzweig 2025-12-16 09:59:02 -05:00 • committed by Marge Bot
parent 079e9ae606
commit 09d493fc54
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/asahi/vulkan/hk_cmd_draw.c
View file

@ -1045,7 +1045,7 @@ hk_upload_vertex_params(struct hk_cmd_buffer *cmd, struct agx_draw draw)
struct hk_graphics_state *gfx = &cmd->state.gfx;
struct hk_descriptor_state *desc = &cmd->state.gfx.descriptors;
const uint32_t wg_size[3] = { 64, 1, 1 };
const uint32_t wg_size[3] = {64, 1, 1};
struct poly_vertex_params params;
poly_vertex_params_init(&params, 0, wg_size);
@ -1148,7 +1148,7 @@ hk_upload_geometry_params(struct hk_cmd_buffer *cmd, struct agx_draw draw)
mode = u_decomposed_prim(mode);
}
const uint32_t wg_size[3] = { 64, 1, 1 };
const uint32_t wg_size[3] = {64, 1, 1};
struct poly_geometry_params params;
poly_geometry_params_init(&params, mode, wg_size);
@ -1212,8 +1212,7 @@ hk_upload_geometry_params(struct hk_cmd_buffer *cmd, struct agx_draw draw)
poly_gs_rast_vertices(gsi->shape, gsi->max_indices, 1, 0);
}
} else {
poly_geometry_params_set_draw(&params, mode,
gsi->shape, gsi->max_indices,
poly_geometry_params_set_draw(&params, mode, gsi->shape, gsi->max_indices,
draw.b.count[0], draw.b.count[1]);
unsigned size = params.input_primitives * params.count_buffer_stride;
@ -1573,8 +1572,8 @@ hk_launch_gs_prerast(struct hk_cmd_buffer *cmd, struct hk_cs *cs,
}
} else {
if (agx_is_indirect(draw.b)) {
return agx_draw_indirect(
geometry_params + offsetof(struct poly_geometry_params, draw));
return agx_draw_indirect(geometry_params +
offsetof(struct poly_geometry_params, draw));
} else {
return (struct agx_draw){
.b = agx_3d(cmd->geom_index_count, cmd->geom_instance_count, 1),

3
src/asahi/vulkan/hk_image.c
View file

@ -985,7 +985,8 @@ hk_CreateImage(VkDevice _device, const VkImageCreateInfo *pCreateInfo,
VkResult result;
if (wsi_common_is_swapchain_image(pCreateInfo))
return wsi_common_create_swapchain_image(&pdev->wsi_device, pCreateInfo, pImage);
return wsi_common_create_swapchain_image(&pdev->wsi_device, pCreateInfo,
pImage);
image = vk_zalloc2(&dev->vk.alloc, pAllocator, sizeof(*image), 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);

4
src/asahi/vulkan/hk_shader.h
View file

@ -342,8 +342,8 @@ hk_buffer_addr_format(VkPipelineRobustnessBufferBehaviorEXT robustness)
}
}
bool
hk_lower_uvs_index(nir_shader *s, mesa_shader_stage sw_stage, unsigned nr_vbos);
bool hk_lower_uvs_index(nir_shader *s, mesa_shader_stage sw_stage,
unsigned nr_vbos);
bool
hk_nir_lower_descriptors(nir_shader *nir,

24
src/gallium/drivers/asahi/agx_state.c
View file

@ -3925,7 +3925,7 @@ agx_batch_geometry_params(struct agx_batch *batch, uint64_t input_index_buffer,
const struct pipe_draw_start_count_bias *draw,
const struct pipe_draw_indirect_info *indirect)
{
const uint32_t wg_size[3] = { 64, 1, 1 };
const uint32_t wg_size[3] = {64, 1, 1};
struct poly_vertex_params vp;
poly_vertex_params_init(&vp, batch->ctx->vs->b.info.outputs, wg_size);
@ -4006,9 +4006,9 @@ agx_batch_geometry_params(struct agx_batch *batch, uint64_t input_index_buffer,
poly_vertex_params_set_draw(&vp, draw->count, info->instance_count);
struct poly_gs_info *gsi = &batch->ctx->gs->gs;
poly_geometry_params_set_draw(&params, info->mode,
gsi->shape, gsi->max_indices,
draw->count, info->instance_count);
poly_geometry_params_set_draw(&params, info->mode, gsi->shape,
gsi->max_indices, draw->count,
info->instance_count);
unsigned vb_size = poly_tcs_in_size(draw->count * info->instance_count,
batch->uniforms.vertex_outputs);
@ -4556,7 +4556,7 @@ agx_draw_patches(struct agx_context *ctx, const struct pipe_draw_info *info,
batch->uniforms.vertex_outputs = ctx->vs->b.info.outputs;
const uint32_t wg_size[3] = { 64, 1, 1 };
const uint32_t wg_size[3] = {64, 1, 1};
struct poly_vertex_params vp;
poly_vertex_params_init(&vp, batch->ctx->vs->b.info.outputs, wg_size);
@ -4672,10 +4672,10 @@ agx_draw_patches(struct agx_context *ctx, const struct pipe_draw_info *info,
uint64_t grids =
agx_pool_alloc_aligned(&batch->pool, grid_stride * 3, 4).gpu;
libagx_tess_setup_indirect(
batch, agx_1d(1), AGX_BARRIER_ALL, state, grids, vertex_state,
indirect_ptr, 0, 0, 0 /* XXX: Index buffer */,
ctx->vs->b.info.outputs, tcs_statistic);
libagx_tess_setup_indirect(batch, agx_1d(1), AGX_BARRIER_ALL, state,
grids, vertex_state, indirect_ptr, 0, 0,
0 /* XXX: Index buffer */,
ctx->vs->b.info.outputs, tcs_statistic);
vs_grid = agx_grid_indirect_local(grids + 0 * grid_stride);
tcs_grid = agx_grid_indirect_local(grids + 1 * grid_stride);
@ -5138,9 +5138,9 @@ agx_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info,
indirect_gs = (struct pipe_draw_indirect_info){
.draw_count = 1,
.buffer = &indirect_rsrc.base,
.offset = batch->uniforms.geometry_params
- indirect_rsrc.bo->va->addr
+ offsetof(struct poly_geometry_params, draw),
.offset = batch->uniforms.geometry_params -
indirect_rsrc.bo->va->addr +
offsetof(struct poly_geometry_params, draw),
};
indirect = &indirect_gs;