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

anv: set MOCS on push constants

Browse Source 
v2: Also set MOCS on 3DSTATE_CONSTANT_ALL (Ken)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 67d2cb3e93 ("anv: Add get_push_range_address() helper.")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3732>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3732>
This commit is contained in:
Lionel Landwerlin
2020-02-06 10:13:36 +02:00
committed by Marge Bot
parent a140ea1ced
commit f9febfae41
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -2837,6 +2837,10 @@ cmd_buffer_emit_push_constant(struct anv_cmd_buffer *cmd_buffer,
const struct anv_pipeline_bind_map *bind_map = const struct anv_pipeline_bind_map *bind_map =
&pipeline->shaders[stage]->bind_map; &pipeline->shaders[stage]->bind_map;
#if GEN_GEN >= 12
c.MOCS = cmd_buffer->device->isl_dev.mocs.internal;
#endif
#if GEN_GEN >= 8 || GEN_IS_HASWELL #if GEN_GEN >= 8 || GEN_IS_HASWELL
/* The Skylake PRM contains the following restriction: /* The Skylake PRM contains the following restriction:
* *
@@ -2897,6 +2901,7 @@ cmd_buffer_emit_push_constant_all(struct anv_cmd_buffer *cmd_buffer,
if (count == 0) { if (count == 0) {
anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_CONSTANT_ALL), c) { anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_CONSTANT_ALL), c) {
c.ShaderUpdateEnable = shader_mask; c.ShaderUpdateEnable = shader_mask;
c.MOCS = cmd_buffer->device->isl_dev.mocs.internal;
} }
return; return;
} }
@@ -2927,7 +2932,8 @@ cmd_buffer_emit_push_constant_all(struct anv_cmd_buffer *cmd_buffer,
dw = anv_batch_emitn(&cmd_buffer->batch, num_dwords, dw = anv_batch_emitn(&cmd_buffer->batch, num_dwords,
GENX(3DSTATE_CONSTANT_ALL), GENX(3DSTATE_CONSTANT_ALL),
.ShaderUpdateEnable = shader_mask, .ShaderUpdateEnable = shader_mask,
.PointerBufferMask = buffers); .PointerBufferMask = buffers,
.MOCS = cmd_buffer->device->isl_dev.mocs.internal);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
const struct anv_push_range *range = &bind_map->push_ranges[i]; const struct anv_push_range *range = &bind_map->push_ranges[i];