commit e2d07a5a3810d83d0ea7ecb396d61477893b74a4
author Mark Lobodzinski <mark@lunarg.com> Thu Jan 29 08:55:56 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:10 2015 -0700
tree 2fee3cac3c0ee07e3e6245e215247d133482245a
parent 744fdea4179c49dc6a24c21e15818a2f3e8b36b7

xgl:  Remove XGL_* typedef wrappers

Part of moving to xgl.h rev#38, svn rev 29293-29302

icd/intel/query.c

diff --git a/icd/intel/query.c b/icd/intel/query.c
index b694b38..70c3ad5 100644
--- a/icd/intel/query.c
+++ b/icd/intel/query.c
@@ -37,7 +37,7 @@
 }
 
 static XGL_RESULT query_get_info(struct intel_base *base, int type,
-                                 XGL_SIZE *size, XGL_VOID *data)
+                                 size_t *size, void *data)
 {
     struct intel_query *query = intel_query_from_base(base);
     XGL_RESULT ret = XGL_SUCCESS;
@@ -114,10 +114,10 @@
 
 static void
 query_process_occlusion(const struct intel_query *query,
-                        XGL_UINT count, const uint8_t *raw,
+                        uint32_t count, const uint8_t *raw,
                         uint64_t *results)
 {
-    XGL_UINT i;
+    uint32_t i;
 
     for (i = 0; i < count; i++) {
         const uint32_t *pair = (const uint32_t *) raw;
@@ -129,11 +129,11 @@
 
 static void
 query_process_pipeline_statistics(const struct intel_query *query,
-                                  XGL_UINT count, const uint8_t *raw,
+                                  uint32_t count, const uint8_t *raw,
                                   XGL_PIPELINE_STATISTICS_DATA *results)
 {
-    const XGL_UINT num_regs = sizeof(results[0]) / sizeof(uint64_t);
-    XGL_UINT i, j;
+    const uint32_t num_regs = sizeof(results[0]) / sizeof(uint64_t);
+    uint32_t i, j;
 
     for (i = 0; i < count; i++) {
         const uint64_t *before = (const uint64_t *) raw;
@@ -148,7 +148,7 @@
 }
 
 XGL_RESULT intel_query_get_results(struct intel_query *query,
-                                   XGL_UINT slot_start, XGL_UINT slot_count,
+                                   uint32_t slot_start, uint32_t slot_count,
                                    void *results)
 {
     const uint8_t *ptr;
@@ -195,10 +195,10 @@
 
 ICD_EXPORT XGL_RESULT XGLAPI xglGetQueryPoolResults(
     XGL_QUERY_POOL                              queryPool,
-    XGL_UINT                                    startQuery,
-    XGL_UINT                                    queryCount,
-    XGL_SIZE*                                   pDataSize,
-    XGL_VOID*                                   pData)
+    uint32_t                                    startQuery,
+    uint32_t                                    queryCount,
+    size_t*                                     pDataSize,
+    void*                                       pData)
 {
     struct intel_query *query = intel_query(queryPool);