AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Set MOCS in 3DSTATE_CONSTANT_XS even if there isn't a buffer.

Browse Source 
This avoids MOCS != 0 assertions in later patches.  iris also does this,
and we do it for the 3DSTATE_CONSTANT_ALL packet path as well.  It's a
bit pointless, but it should hopefully be harmless also.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13480>
This commit is contained in:
Kenneth Graunke
2021-10-18 23:39:30 -07:00
committed by Marge Bot
parent 158ad07b3e
commit 7ae9f516f0
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/vulkan/genX_cmd_buffer.c
+21 -20
View File
@@ -3178,30 +3178,31 @@ cmd_buffer_emit_push_constant(struct anv_cmd_buffer *cmd_buffer,
anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_CONSTANT_VS), c) {
c._3DCommandSubOpcode = push_constant_opcodes[stage];
/* Set MOCS, except on Gfx8, because the Broadwell PRM says:
*
* "Constant Buffer Object Control State must be always
* programmed to zero."
*
* This restriction does not exist on any newer platforms.
*
* We only have one MOCS field for the whole packet, not one per
* buffer. We could go out of our way here to walk over all of
* the buffers and see if any of them are used externally and use
* the external MOCS. However, the notion that someone would use
* the same bit of memory for both scanout and a UBO is nuts.
*
* Let's not bother and assume it's all internal.
*/
#if GFX_VER >= 9
c.MOCS = mocs;
#elif GFX_VER < 8
c.ConstantBody.MOCS = mocs;
#endif
if (anv_pipeline_has_stage(pipeline, stage)) {
const struct anv_pipeline_bind_map *bind_map =
&pipeline->shaders[stage]->bind_map;
/* Set MOCS, except on Gfx8, because the Broadwell PRM says:
*
* "Constant Buffer Object Control State must be always programmed
* to zero."
*
* This restriction does not exist on any newer platforms.
*
* We only have one MOCS field for the whole packet, not one per
* buffer. We could go out of our way here to walk over all of the
* buffers and see if any of them are used externally and use the
* external MOCS. However, the notion that someone would use the
* same bit of memory for both scanout and a UBO is nuts. Let's not
* bother and assume it's all internal.
*/
#if GFX_VER >= 9
c.MOCS = mocs;
#elif GFX_VER < 8
c.ConstantBody.MOCS = mocs;
#endif
#if GFX_VERx10 >= 75
/* The Skylake PRM contains the following restriction:
*