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

anv: store a few default instructions

Browse source 
We will use those where no associated shaders is active but we still
need some default values programmed.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34872>
This commit is contained in:
Lionel Landwerlin 2025-06-29 22:13:50 +03:00 • committed by Marge Bot
parent 69b6b4cb28
commit 4d9dd5c3a2
6 changed files with 75 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/intel/vulkan/anv_genX.h
View file

@ -40,6 +40,7 @@ struct intel_sample_positions;
struct intel_urb_config;
struct anv_async_submit;
struct anv_embedded_sampler;
struct anv_physical_device;
struct anv_pipeline_embedded_sampler_binding;
struct anv_trtt_bind;
@ -537,6 +538,8 @@ genX(cmd_dispatch_unaligned)(
uint32_t invocations_y,
uint32_t invocations_z);
void genX(init_instructions)(struct anv_physical_device *device);
void genX(shader_emit)(struct anv_batch *batch,
struct anv_device *device,
struct anv_shader *shader);

1
src/intel/vulkan/anv_physical_device.c
View file

@ -2805,6 +2805,7 @@ anv_physical_device_try_create(struct vk_instance *vk_instance,
anv_measure_device_init(device);
anv_genX(&device->info, init_physical_device_state)(device);
anv_genX(&device->info, init_instructions)(device);
*out = &device->vk;

26
src/intel/vulkan/anv_private.h
View file

@ -1606,11 +1606,27 @@ struct anv_physical_device {
/* Value of PIPELINE_SELECT::PipelineSelection == GPGPU */
uint32_t gpgpu_pipeline_value;
/** A pre packed VERTEX_ELEMENT_STATE feeding 0s to the VS stage
*
* For use when a pipeline has no VS input
*/
uint32_t empty_vs_input[2];
struct {
/** A pre packed VERTEX_ELEMENT_STATE feeding 0s to the VS stage
*
* For use when a pipeline has no VS input
*/
uint32_t empty_vs_input[2];
/** A few default instructions */
uint32_t vs[9];
uint32_t hs[9];
uint32_t ds[11];
uint32_t gs[10];
uint32_t te[5];
uint32_t so[5];
uint32_t wm[2];
uint32_t ps[12];
uint32_t ps_extra[2];
uint32_t ps_extra_dep[2];
uint32_t mesh_control[3];
uint32_t task_control[3];
} gfx_default;
};
VkResult anv_physical_device_try_create(struct vk_instance *vk_instance,

9
src/intel/vulkan/genX_init_state.c
View file

@ -926,15 +926,6 @@ genX(init_physical_device_state)(ASSERTED struct anv_physical_device *pdevice)
pdevice->cmd_capture_data = genX(cmd_capture_data);
pdevice->gpgpu_pipeline_value = GPGPU;
struct GENX(VERTEX_ELEMENT_STATE) empty_ve = {
.Valid = true,
.Component0Control = VFCOMP_STORE_0,
.Component1Control = VFCOMP_STORE_0,
.Component2Control = VFCOMP_STORE_0,
.Component3Control = VFCOMP_STORE_0,
};
GENX(VERTEX_ELEMENT_STATE_pack)(NULL, pdevice->empty_vs_input, &empty_ve);
}
VkResult

4
src/intel/vulkan/genX_pipeline.c
View file

@ -290,8 +290,8 @@ genX(batch_emit_pipeline_vertex_input)(struct anv_batch *batch,
return;
if (ve_count == 0) {
memcpy(p + 1, device->physical->empty_vs_input,
sizeof(device->physical->empty_vs_input));
memcpy(p + 1, device->physical->gfx_default.empty_vs_input,
sizeof(device->physical->gfx_default.empty_vs_input));
} else if (ve_count == pipeline->vertex_input_elems) {
/* MESA_VK_DYNAMIC_VI is not dynamic for this pipeline, so everything is
* in pipeline->vertex_input_data and we can just memcpy

50
src/intel/vulkan/genX_shader.c
View file

@ -16,6 +16,16 @@
#define device_needs_protected(device) \
((device)->vk.enabled_features.protectedMemory)
#define anv_gfx_pack(dest, cmd, name) \
for (struct cmd name = (struct cmd) { __anv_cmd_header(cmd) }, \
*_dst = (struct cmd *)dest; \
__builtin_expect(_dst != NULL, 1); \
({ \
assert(sizeof(dest) >= 4 * __anv_cmd_length(cmd)); \
__anv_cmd_pack(cmd)(NULL, _dst, &name); \
_dst = NULL; \
}))
static uint32_t
get_sampler_count(const struct anv_shader *shader)
{
@ -387,8 +397,8 @@ genX(batch_emit_vertex_input)(struct anv_batch *batch,
return;
if (ve_count == 0) {
memcpy(p + 1, device->physical->empty_vs_input,
sizeof(device->physical->empty_vs_input));
memcpy(p + 1, device->physical->gfx_default.empty_vs_input,
sizeof(device->physical->gfx_default.empty_vs_input));
} else {
/* Use dyn->vi to emit the dynamic VERTEX_ELEMENT_STATE input. */
emit_ves_vf_instancing(batch, p + 1, device, shader, vi);
@ -1296,6 +1306,42 @@ emit_cs_shader(struct anv_batch *batch,
#endif
}
void
genX(init_instructions)(struct anv_physical_device *device)
{
struct GENX(VERTEX_ELEMENT_STATE) empty_ve = {
.Valid = true,
.Component0Control = VFCOMP_STORE_0,
.Component1Control = VFCOMP_STORE_0,
.Component2Control = VFCOMP_STORE_0,
.Component3Control = VFCOMP_STORE_0,
};
GENX(VERTEX_ELEMENT_STATE_pack)(
NULL, device->gfx_default.empty_vs_input, &empty_ve);
anv_gfx_pack(device->gfx_default.vs, GENX(3DSTATE_VS), vs);
anv_gfx_pack(device->gfx_default.hs, GENX(3DSTATE_HS), hs);
anv_gfx_pack(device->gfx_default.ds, GENX(3DSTATE_DS), ds);
anv_gfx_pack(device->gfx_default.gs, GENX(3DSTATE_GS), gs);
anv_gfx_pack(device->gfx_default.te, GENX(3DSTATE_TE), te);
anv_gfx_pack(device->gfx_default.so, GENX(3DSTATE_STREAMOUT), so);
anv_gfx_pack(device->gfx_default.wm, GENX(3DSTATE_WM), wm) {
wm.StatisticsEnable = true;
}
anv_gfx_pack(device->gfx_default.ps, GENX(3DSTATE_PS), ps);
anv_gfx_pack(device->gfx_default.ps_extra, GENX(3DSTATE_PS_EXTRA), pse);
anv_gfx_pack(device->gfx_default.ps_extra_dep, GENX(3DSTATE_PS_EXTRA), pse) {
#if GFX_VERx10 >= 125
pse.EnablePSDependencyOnCPsizeChange = true;
#endif
}
#if GFX_VERx10 >= 125
anv_gfx_pack(device->gfx_default.task_control, GENX(3DSTATE_TASK_CONTROL), ts);
anv_gfx_pack(device->gfx_default.mesh_control, GENX(3DSTATE_MESH_CONTROL), ms);
#endif
}
void
genX(shader_emit)(struct anv_batch *batch,
struct anv_device *device,