commit 55dffd3e1168ea6200e2e4b77eb26d54406550e5
author Chia-I Wu <olv@lunarg.com> Tue Nov 25 11:18:44 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Nov 26 10:03:13 2014 -0700
tree 6232ea55a6b9ed83285b9f378cde4516021ec1f1
parent c5e2ae38e38ae90f177cba0db87ab732bc0016cf

intel: set INTEL_RELOC_WRITE for descriptor set entries

When an image or memory view may be rendered to, INTEL_RELOC_WRITE should be
set.

icd/intel/cmd_pipeline.c

diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index dfe26c5..74e70e3 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -1582,6 +1582,8 @@
                 const XGL_UINT slot_offset = cmd->bind.dset.graphics_offset;
                 const struct intel_dset_slot *dset_slot =
                     &dset->slots[slot_offset + slot->u.index];
+                const uint32_t reloc_flags =
+                    (dset_slot->read_only) ? 0 : INTEL_RELOC_WRITE;
 
                 switch (dset_slot->type) {
                 case INTEL_DSET_SLOT_IMG_VIEW:
@@ -1593,7 +1595,7 @@
                     cmd_reserve_reloc(cmd, 1);
                     cmd_surface_reloc(cmd, offset, 1,
                             dset_slot->u.img_view->img->obj.mem->bo,
-                            dset_slot->u.img_view->cmd[1], 0);
+                            dset_slot->u.img_view->cmd[1], reloc_flags);
                     break;
                 case INTEL_DSET_SLOT_MEM_VIEW:
                     offset = cmd_surface_write(cmd, INTEL_CMD_ITEM_SURFACE,
@@ -1604,7 +1606,7 @@
                     cmd_reserve_reloc(cmd, 1);
                     cmd_surface_reloc(cmd, offset, 1,
                             dset_slot->u.mem_view.mem->bo,
-                            dset_slot->u.mem_view.cmd[1], 0);
+                            dset_slot->u.mem_view.cmd[1], reloc_flags);
                     break;
                 case INTEL_DSET_SLOT_SAMPLER:
                     assert(0 == cmd->bind.dset.graphics_offset);