intel: Set the memType in mem_requirements for all objects

Conflicts:
	icd/intel/event.c
	icd/intel/img.c

diff --git a/icd/intel/buf.c b/icd/intel/buf.c
index d873b2c..ead29ba 100644 (file)
--- a/icd/intel/buf.c
+++ b/icd/intel/buf.c
@@ -64,6 +64,7 @@ static XGL_RESULT buf_get_info(struct intel_base *base, int type,
                 mem_req->size = u_align(mem_req->size, 256) + 16;
 
             mem_req->alignment = 4096;
+            mem_req->memType = XGL_MEMORY_TYPE_BUFFER;
 
         }
         break;

diff --git a/icd/intel/event.c b/icd/intel/event.c
index 23788fa..9a29a2b 100644 (file)
--- a/icd/intel/event.c
+++ b/icd/intel/event.c
@@ -106,6 +106,7 @@ static XGL_RESULT event_get_info(struct intel_base *base, int type,
             /* use dword aligned to 64-byte boundaries */
             mem_req->size = 4;
             mem_req->alignment = 64;
+            mem_req->memType = XGL_MEMORY_TYPE_OTHER;
         }
         break;
     default:

diff --git a/icd/intel/img.c b/icd/intel/img.c
index 9046059..e52dff7 100644 (file)
--- a/icd/intel/img.c
+++ b/icd/intel/img.c
@@ -64,6 +64,7 @@ static XGL_RESULT img_get_info(struct intel_base *base, int type,
                 return ret;
             mem_req->size = img->total_size;
             mem_req->alignment = 4096;
+            mem_req->memType = XGL_MEMORY_TYPE_IMAGE;
         }
         break;
     case XGL_INFO_TYPE_IMAGE_MEMORY_REQUIREMENTS:

diff --git a/icd/intel/obj.c b/icd/intel/obj.c
index 67ddeb1..4a32346 100644 (file)
--- a/icd/intel/obj.c
+++ b/icd/intel/obj.c
@@ -53,13 +53,16 @@ XGL_RESULT intel_base_get_info(struct intel_base *base, int type,
 
     switch (type) {
     case XGL_INFO_TYPE_MEMORY_REQUIREMENTS:
-        s = sizeof(XGL_MEMORY_REQUIREMENTS);
-        *size = s;
-        if (data == NULL)
-            return ret;
-        memset(data, 0, s);
-
-        break;
+        {
+            XGL_MEMORY_REQUIREMENTS *mem_req = data;
+            s = sizeof(XGL_MEMORY_REQUIREMENTS);
+            *size = s;
+            if (data == NULL)
+                return ret;
+            memset(data, 0, s);
+            mem_req->memType =  XGL_MEMORY_TYPE_OTHER;
+            break;
+        }
     case XGL_INFO_TYPE_MEMORY_ALLOCATION_COUNT:
         *size = sizeof(XGL_UINT);
         if (data == NULL)

diff --git a/icd/intel/pipeline.c b/icd/intel/pipeline.c
index 7e1bbce..db571f7 100644 (file)
--- a/icd/intel/pipeline.c
+++ b/icd/intel/pipeline.c
@@ -423,6 +423,7 @@ static XGL_RESULT pipeline_get_info(struct intel_base *base, int type,
             if (data) {
                 mem_req->size = pipeline->scratch_size;
                 mem_req->alignment = 1024;
+                mem_req->memType =  XGL_MEMORY_TYPE_OTHER;
             }
         }
         break;

diff --git a/icd/intel/query.c b/icd/intel/query.c
index 6abfd01..b694b38 100644 (file)
--- a/icd/intel/query.c
+++ b/icd/intel/query.c
@@ -52,7 +52,7 @@ static XGL_RESULT query_get_info(struct intel_base *base, int type,
                 return ret;
             mem_req->size = query->slot_stride * query->slot_count;
             mem_req->alignment = 64;
-
+            mem_req->memType =  XGL_MEMORY_TYPE_OTHER;
         }
         break;
     default: