OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: remove copied information from runtime graphics state

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21026>
This commit is contained in:
Lionel Landwerlin
2023-01-31 20:09:36 +01:00
committed by Marge Bot
parent b1bb44cf65
commit 46ecd56191
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/intel/vulkan/anv_pipeline.c
View File

@@ -2267,13 +2267,6 @@ anv_graphics_pipeline_init(struct anv_graphics_pipeline *pipeline,
pipeline->vb_used |= BITFIELD64_BIT(state->vi->attributes[a].binding); pipeline->vb_used |= BITFIELD64_BIT(state->vi->attributes[a].binding);
} }
u_foreach_bit(b, state->vi->bindings_valid) {
pipeline->vb[b].stride = state->vi->bindings[b].stride;
pipeline->vb[b].instanced = state->vi->bindings[b].input_rate ==
VK_VERTEX_INPUT_RATE_INSTANCE;
pipeline->vb[b].instance_divisor = state->vi->bindings[b].divisor;
}
/* Our implementation of VK_KHR_multiview uses instancing to draw the /* Our implementation of VK_KHR_multiview uses instancing to draw the
* different views when primitive replication cannot be used. If the * different views when primitive replication cannot be used. If the
* client asks for instancing, we need to multiply by the client's * client asks for instancing, we need to multiply by the client's

5
src/intel/vulkan/anv_private.h
View File

@@ -3080,11 +3080,6 @@ struct anv_graphics_pipeline {
bool uses_xfb; bool uses_xfb;
uint32_t vb_used; uint32_t vb_used;
struct anv_pipeline_vertex_binding {
uint32_t stride;
bool instanced;
uint32_t instance_divisor;
} vb[MAX_VBS];
/* Pre computed CS instructions that can directly be copied into /* Pre computed CS instructions that can directly be copied into
* anv_cmd_buffer. * anv_cmd_buffer.

5
src/intel/vulkan/genX_pipeline.c
View File

@@ -183,8 +183,9 @@ emit_vertex_input(struct anv_graphics_pipeline *pipeline,
* VERTEX_BUFFER_STATE which we emit later. * VERTEX_BUFFER_STATE which we emit later.
*/ */
anv_batch_emit(&pipeline->base.batch, GENX(3DSTATE_VF_INSTANCING), vfi) { anv_batch_emit(&pipeline->base.batch, GENX(3DSTATE_VF_INSTANCING), vfi) {
bool per_instance = pipeline->vb[binding].instanced; bool per_instance = vi->bindings[binding].input_rate ==
uint32_t divisor = pipeline->vb[binding].instance_divisor * VK_VERTEX_INPUT_RATE_INSTANCE;
uint32_t divisor = vi->bindings[binding].divisor *
pipeline->instance_multiplier; pipeline->instance_multiplier;
vfi.InstancingEnable = per_instance; vfi.InstancingEnable = per_instance;