commit 32a224686576742a185a10a94e1feef4dfe38c60
author Chia-I Wu <olvaffe@gmail.com> Tue Aug 26 14:13:46 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Tue Aug 26 14:29:50 2014 +0800
tree 30f69be78deaaa4fe99e3bedc898be8f073b243f
parent 48c283de163137939712d4661e3156188a296366

intel: update winsys

Mainly to deprecate INTEL_DOMAIN_x.

icd/intel/cmd_pipeline.c

diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index 0b37c55..9409252 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -100,8 +100,6 @@
    const uint8_t cmd_len = 5;
    const uint32_t dw0 = GEN_RENDER_CMD(3D, GEN6, PIPE_CONTROL) |
                         (cmd_len - 2);
-   const uint32_t read_domains = INTEL_DOMAIN_INSTRUCTION;
-   const uint32_t write_domain = INTEL_DOMAIN_INSTRUCTION;
 
    CMD_ASSERT(cmd, 6, 7.5);
 
@@ -174,10 +172,12 @@
    cmd_batch_reserve_reloc(cmd, cmd_len, (bool) bo);
    cmd_batch_write(cmd, dw0);
    cmd_batch_write(cmd, dw1);
-   if (bo)
-       cmd_batch_reloc(cmd, bo_offset, bo, read_domains, write_domain);
-   else
+   if (bo) {
+       cmd_batch_reloc(cmd, bo_offset, bo, INTEL_RELOC_GGTT |
+                                           INTEL_RELOC_WRITE);
+   } else {
        cmd_batch_write(cmd, 0);
+   }
    cmd_batch_write(cmd, 0);
    cmd_batch_write(cmd, 0);
 }
@@ -275,8 +275,8 @@
 
     cmd_batch_reserve_reloc(cmd, cmd_len, 2);
     cmd_batch_write(cmd, dw0);
-    cmd_batch_reloc(cmd, offset, mem->bo, INTEL_DOMAIN_VERTEX, 0);
-    cmd_batch_reloc(cmd, end_offset, mem->bo, INTEL_DOMAIN_VERTEX, 0);
+    cmd_batch_reloc(cmd, offset, mem->bo, 0);
+    cmd_batch_reloc(cmd, end_offset, mem->bo, 0);
 }
 
 static inline void
@@ -338,8 +338,7 @@
     cmd_batch_write(cmd, view->cmd[0]);
     if (view->img) {
         cmd_batch_reloc(cmd, view->cmd[1], view->img->obj.mem->bo,
-                        INTEL_DOMAIN_RENDER,
-                        INTEL_DOMAIN_RENDER);
+                        INTEL_RELOC_WRITE);
     } else {
         cmd_batch_write(cmd, 0);
     }
@@ -367,8 +366,7 @@
     cmd_batch_write(cmd, view->cmd[6]);
     if (view->img) {
         cmd_batch_reloc(cmd, view->cmd[7], view->img->obj.mem->bo,
-                        INTEL_DOMAIN_RENDER,
-                        INTEL_DOMAIN_RENDER);
+                        INTEL_RELOC_WRITE);
     } else {
         cmd_batch_write(cmd, 0);
     }
@@ -392,8 +390,7 @@
     cmd_batch_write(cmd, view->cmd[8]);
     if (view->img) {
         cmd_batch_reloc(cmd, view->cmd[9], view->img->obj.mem->bo,
-                        INTEL_DOMAIN_RENDER,
-                        INTEL_DOMAIN_RENDER);
+                        INTEL_RELOC_WRITE);
     } else {
         cmd_batch_write(cmd, 0);
     }
@@ -761,7 +758,7 @@
 
                 memcpy(dw, view->cmd, sizeof(uint32_t) * view->cmd_len);
                 cmd_state_reloc(cmd, 1, view->cmd[1], view->img->obj.mem->bo,
-                        INTEL_DOMAIN_RENDER, INTEL_DOMAIN_RENDER);
+                        INTEL_RELOC_WRITE);
                 cmd_state_advance(cmd, view->cmd_len);
             }
             break;
@@ -775,7 +772,7 @@
 
                 memcpy(dw, view->cmd, sizeof(uint32_t) * view->cmd_len);
                 cmd_state_reloc(cmd, 1, view->cmd[1], view->mem->bo,
-                        INTEL_DOMAIN_RENDER, INTEL_DOMAIN_RENDER);
+                        INTEL_RELOC_WRITE);
                 cmd_state_advance(cmd, view->cmd_len);
             }
             break;