commit d02809afb17503149e2e8b9a85c9e145a3e558a4
author Jeremy Hayes <jeremy@lunarg.com> Wed Apr 15 14:17:56 2015 -0600
committer Jeremy Hayes <jeremy@lunarg.com> Thu Apr 16 14:14:49 2015 -0600
tree 1e6a5a8dc6b03e12544597ff9ba5dd566a027150
parent 2fea26c0d7235c2ef80f921b6a29197850fb6006

vulkan: Update object memory requirements (13723).

icd/intel/buf.c

diff --git a/icd/intel/buf.c b/icd/intel/buf.c
index e18952a..adcb2a1 100644
--- a/icd/intel/buf.c
+++ b/icd/intel/buf.c
@@ -67,6 +67,7 @@
 
             mem_req->alignment = 4096;
 
+            mem_req->memPropsAllowed = INTEL_MEMORY_PROPERTY_ALL;
         }
         break;
     default:

icd/intel/event.c

diff --git a/icd/intel/event.c b/icd/intel/event.c
index 293dd9f..61520bf 100644
--- a/icd/intel/event.c
+++ b/icd/intel/event.c
@@ -106,6 +106,7 @@
             /* use dword aligned to 64-byte boundaries */
             mem_req->size = 4;
             mem_req->alignment = 64;
+            mem_req->memPropsAllowed = INTEL_MEMORY_PROPERTY_ALL;
         }
         break;
     default:

icd/intel/img.c

diff --git a/icd/intel/img.c b/icd/intel/img.c
index 753bec2..6796865 100644
--- a/icd/intel/img.c
+++ b/icd/intel/img.c
@@ -63,6 +63,7 @@
                 return ret;
             mem_req->size = img->total_size;
             mem_req->alignment = 4096;
+            mem_req->memPropsAllowed = INTEL_MEMORY_PROPERTY_ALL;
         }
         break;
     default:

icd/intel/intel.h

diff --git a/icd/intel/intel.h b/icd/intel/intel.h
index c69f7a6..de7bcbd 100644
--- a/icd/intel/intel.h
+++ b/icd/intel/intel.h
@@ -56,6 +56,11 @@
 #define INTEL_MAX_VERTEX_ELEMENT_COUNT (INTEL_MAX_VERTEX_BINDING_COUNT + 1)
 #define INTEL_MAX_RENDER_TARGETS 8
 
+#define INTEL_MEMORY_PROPERTY_ALL (VK_MEMORY_PROPERTY_GPU_ONLY | VK_MEMORY_PROPERTY_CPU_VISIBLE_BIT |\
+    VK_MEMORY_PROPERTY_CPU_GPU_COHERENT_BIT | VK_MEMORY_PROPERTY_CPU_UNCACHED_BIT |\
+    VK_MEMORY_PROPERTY_CPU_WRITE_COMBINED_BIT | VK_MEMORY_PROPERTY_PREFER_CPU_LOCAL |\
+    VK_MEMORY_PROPERTY_SHAREABLE_BIT)
+
 enum intel_debug_flags {
     INTEL_DEBUG_BATCH       = 1 << 0,
 

icd/intel/obj.c

diff --git a/icd/intel/obj.c b/icd/intel/obj.c
index 62c45c9..45b346e 100644
--- a/icd/intel/obj.c
+++ b/icd/intel/obj.c
@@ -45,6 +45,8 @@
             if (data == NULL)
                 return ret;
             memset(data, 0, s);
+            VkMemoryRequirements *mem_req = data;
+            mem_req->memPropsAllowed = INTEL_MEMORY_PROPERTY_ALL;
             break;
         }
     case VK_INFO_TYPE_MEMORY_ALLOCATION_COUNT:

icd/intel/pipeline.c

diff --git a/icd/intel/pipeline.c b/icd/intel/pipeline.c
index da765bf..decb881 100644
--- a/icd/intel/pipeline.c
+++ b/icd/intel/pipeline.c
@@ -486,6 +486,7 @@
             if (data) {
                 mem_req->size = pipeline->scratch_size;
                 mem_req->alignment = 1024;
+                mem_req->memPropsAllowed = INTEL_MEMORY_PROPERTY_ALL;
             }
         }
         break;

icd/intel/query.c

diff --git a/icd/intel/query.c b/icd/intel/query.c
index d47653f..8f2aa52 100644
--- a/icd/intel/query.c
+++ b/icd/intel/query.c
@@ -52,6 +52,7 @@
                 return ret;
             mem_req->size = query->slot_stride * query->slot_count;
             mem_req->alignment = 64;
+            mem_req->memPropsAllowed = INTEL_MEMORY_PROPERTY_ALL;
         }
         break;
     default: