include: fix typedefs
Use what was in the upstream header. The switch of XGL_SIZE to size_t
generates quite some warnings and is fixed.
diff --git a/glave-generate.py b/glave-generate.py
index 0de7021..df41850 100755
--- a/glave-generate.py
+++ b/glave-generate.py
@@ -105,13 +105,17 @@
if '*' in xgl_type:
return ("%lu", "*%s" % name)
return ("%lu", name)
+ if "SIZE" in xgl_type:
+ if '*' in xgl_type:
+ return ("%zu", "*%s" % name)
+ return ("%zu", name)
if "FLOAT" in xgl_type:
if '[' in xgl_type: # handle array, current hard-coded to 4 (TODO: Make this dynamic)
return ("[%f, %f, %f, %f]", "%s[0], %s[1], %s[2], %s[3]" % (name, name, name, name))
return ("%f", name)
if "BOOL" in xgl_type or 'xcb_randr_crtc_t' in xgl_type:
return ("%u", name)
- if True in [t in xgl_type for t in ["INT", "SIZE", "FLAGS", "MASK", "xcb_window_t"]]:
+ if True in [t in xgl_type for t in ["INT", "FLAGS", "MASK", "xcb_window_t"]]:
if '[' in xgl_type: # handle array, current hard-coded to 4 (TODO: Make this dynamic)
return ("[%i, %i, %i, %i]", "%s[0], %s[1], %s[2], %s[3]" % (name, name, name, name))
if '*' in xgl_type:
diff --git a/include/xgl.h b/include/xgl.h
index f28aa22..5ccafd0 100644
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -48,6 +48,7 @@
#ifndef __XGL_H__
#define __XGL_H__
+#include <stddef.h>
#include <stdint.h>
#define XGL_MAKE_VERSION(major, minor, patch) \
@@ -68,16 +69,16 @@
/*
* Datatypes
*/
-typedef unsigned char XGL_BOOL;
+typedef uint32_t XGL_BOOL;
typedef void XGL_VOID;
-typedef signed char XGL_CHAR; /* 1-byte signed */
+typedef char XGL_CHAR; /* 1-byte signed */
typedef int32_t XGL_INT; /* 4-byte signed */
typedef int32_t XGL_INT32; /* 4-byte signed */
typedef uint32_t XGL_UINT; /* 4-byte unsigned */
typedef uint32_t XGL_UINT32; /* 4-byte unsigned */
typedef uint64_t XGL_UINT64; /* 8-byte unsigned */
-typedef uint32_t XGL_SIZE; /* 4-byte unsigned */
-typedef uint32_t XGL_GPU_SIZE; /* 4-byte unsigned */
+typedef size_t XGL_SIZE; /* 4-byte unsigned */
+typedef uint64_t XGL_GPU_SIZE; /* 4-byte unsigned */
typedef uint32_t XGL_FLAGS; /* 4-byte unsigned */
typedef uint32_t XGL_SAMPLE_MASK; /* 4-byte unsigned */
typedef uint8_t XGL_UINT8; /* 1-byte unsigned */
diff --git a/tests/base_render_test.cpp b/tests/base_render_test.cpp
index 2146d44..f954c32 100644
--- a/tests/base_render_test.cpp
+++ b/tests/base_render_test.cpp
@@ -278,7 +278,7 @@
ASSERT_XGL_SUCCESS(err);
XGL_MEMORY_REQUIREMENTS mem_req;
- XGL_UINT data_size = sizeof(mem_req);
+ XGL_SIZE data_size = sizeof(mem_req);
err = xglGetObjectInfo(*pPool, XGL_INFO_TYPE_MEMORY_REQUIREMENTS,
&data_size, &mem_req);
ASSERT_XGL_SUCCESS(err);
@@ -753,7 +753,7 @@
ASSERT_XGL_SUCCESS(err);
XGL_MEMORY_REQUIREMENTS mem_req;
- XGL_UINT data_size = sizeof(XGL_MEMORY_REQUIREMENTS);
+ XGL_SIZE data_size = sizeof(XGL_MEMORY_REQUIREMENTS);
err = xglGetObjectInfo(m_image, XGL_INFO_TYPE_MEMORY_REQUIREMENTS,
&data_size, &mem_req);
ASSERT_XGL_SUCCESS(err);
diff --git a/tests/displayengine.cpp b/tests/displayengine.cpp
index 84fdfbe..964bdb9 100644
--- a/tests/displayengine.cpp
+++ b/tests/displayengine.cpp
@@ -73,7 +73,7 @@
XGL_IMAGE_ASPECT_COLOR, 0, 0
};
XGL_SUBRESOURCE_LAYOUT sr_layout;
- XGL_UINT data_size = sizeof(sr_layout);
+ size_t data_size = sizeof(sr_layout);
if (!m_enable) return; // Do nothing except save info if not enabled
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index d99fb1c..931af3d 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -188,7 +188,7 @@
ASSERT_XGL_SUCCESS(err);
XGL_MEMORY_REQUIREMENTS mem_req;
- XGL_UINT data_size = sizeof(mem_req);
+ size_t data_size = sizeof(mem_req);
err = xglGetObjectInfo(m_image, XGL_INFO_TYPE_MEMORY_REQUIREMENTS,
&data_size, &mem_req);
ASSERT_XGL_SUCCESS(err);
diff --git a/tests/init.cpp b/tests/init.cpp
index 2b76ffe..4b07a77 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -181,7 +181,7 @@
XGL_EVENT_CREATE_INFO event_info;
XGL_EVENT event;
XGL_MEMORY_REQUIREMENTS mem_req;
- XGL_UINT data_size = sizeof(mem_req);
+ size_t data_size = sizeof(mem_req);
XGL_RESULT err;
// typedef struct _XGL_EVENT_CREATE_INFO
@@ -290,9 +290,9 @@
TEST_F(XglTest, Query) {
XGL_QUERY_POOL_CREATE_INFO query_info;
XGL_QUERY_POOL query_pool;
- XGL_UINT data_size;
+ size_t data_size;
XGL_MEMORY_REQUIREMENTS mem_req;
- XGL_UINT query_result_size;
+ size_t query_result_size;
XGL_UINT *query_result_data;
XGL_RESULT err;
@@ -469,7 +469,7 @@
XGL_SIZE size;
XGL_FORMAT fmt;
XGL_FORMAT_PROPERTIES image_fmt;
- XGL_UINT data_size;
+ size_t data_size;
w =512;
h = 256;
diff --git a/tests/xgldevice.cpp b/tests/xgldevice.cpp
index 35c3d7b..e728703 100644
--- a/tests/xgldevice.cpp
+++ b/tests/xgldevice.cpp
@@ -97,7 +97,7 @@
{
XGL_RESULT err;
XGL_MEMORY_REQUIREMENTS mem_req;
- XGL_UINT data_size = sizeof(mem_req);
+ XGL_SIZE data_size = sizeof(mem_req);
err = xglGetObjectInfo(obj, XGL_INFO_TYPE_MEMORY_REQUIREMENTS, &data_size, &mem_req);
if (err != XGL_SUCCESS) return err;
diff --git a/tests/xglimage.cpp b/tests/xglimage.cpp
index 481c0e8..3eeacd1 100644
--- a/tests/xglimage.cpp
+++ b/tests/xglimage.cpp
@@ -143,7 +143,7 @@
ASSERT_XGL_SUCCESS(err);
XGL_MEMORY_REQUIREMENTS mem_req;
- XGL_UINT data_size = sizeof(XGL_MEMORY_REQUIREMENTS);
+ XGL_SIZE data_size = sizeof(XGL_MEMORY_REQUIREMENTS);
err = xglGetObjectInfo(m_image, XGL_INFO_TYPE_MEMORY_REQUIREMENTS,
&data_size, &mem_req);
ASSERT_XGL_SUCCESS(err);
diff --git a/tests/xgltestframework.cpp b/tests/xgltestframework.cpp
index f5d03ea..889e655 100644
--- a/tests/xgltestframework.cpp
+++ b/tests/xgltestframework.cpp
@@ -214,7 +214,7 @@
XGL_IMAGE_ASPECT_COLOR, 0, 0
};
XGL_SUBRESOURCE_LAYOUT sr_layout;
- XGL_UINT data_size = sizeof(sr_layout);
+ size_t data_size = sizeof(sr_layout);
err = xglGetImageSubresourceInfo( image->image(), &sr,
XGL_INFO_TYPE_SUBRESOURCE_LAYOUT,
@@ -331,7 +331,7 @@
XGL_IMAGE_ASPECT_COLOR, 0, 0
};
XGL_SUBRESOURCE_LAYOUT sr_layout;
- XGL_UINT data_size = sizeof(sr_layout);
+ size_t data_size = sizeof(sr_layout);
if (!m_show_images) return;
diff --git a/xgl-helper.py b/xgl-helper.py
index cd0292a..e99d7bc 100755
--- a/xgl-helper.py
+++ b/xgl-helper.py
@@ -459,7 +459,9 @@
print_type = "lu"
elif 'UINT8' in struct_member['type']:
print_type = "hu"
- elif True in [ui_str in struct_member['type'] for ui_str in ['UINT', '_SIZE', '_FLAGS', '_SAMPLE_MASK']]:
+ elif '_SIZE' in struct_member['type']:
+ print_type = "zu"
+ elif True in [ui_str in struct_member['type'] for ui_str in ['UINT', '_FLAGS', '_SAMPLE_MASK']]:
print_type = "u"
elif 'INT' in struct_member['type']:
print_type = "i"
@@ -892,7 +894,9 @@
print_type = "lu"
elif 'UINT8' in struct_member['type']:
print_type = "hu"
- elif True in [ui_str in struct_member['type'] for ui_str in ['UINT', '_SIZE', '_FLAGS', '_SAMPLE_MASK']]:
+ elif '_SIZE' in struct_member['type']:
+ print_type = "zu"
+ elif True in [ui_str in struct_member['type'] for ui_str in ['UINT', '_FLAGS', '_SAMPLE_MASK']]:
print_type = "u"
elif 'INT' in struct_member['type']:
print_type = "i"
diff --git a/xgl-layer-generate.py b/xgl-layer-generate.py
index 6214c34..7fe0e13 100755
--- a/xgl-layer-generate.py
+++ b/xgl-layer-generate.py
@@ -105,13 +105,17 @@
if '*' in xgl_type:
return ("%lu", "*%s" % name)
return ("%lu", name)
+ if "SIZE" in xgl_type:
+ if '*' in xgl_type:
+ return ("%zu", "*%s" % name)
+ return ("%zu", name)
if "FLOAT" in xgl_type:
if '[' in xgl_type: # handle array, current hard-coded to 4 (TODO: Make this dynamic)
return ("[%f, %f, %f, %f]", "%s[0], %s[1], %s[2], %s[3]" % (name, name, name, name))
return ("%f", name)
if "BOOL" in xgl_type or 'xcb_randr_crtc_t' in xgl_type:
return ("%u", name)
- if True in [t in xgl_type for t in ["INT", "SIZE", "FLAGS", "MASK", "xcb_window_t"]]:
+ if True in [t in xgl_type for t in ["INT", "FLAGS", "MASK", "xcb_window_t"]]:
if '[' in xgl_type: # handle array, current hard-coded to 4 (TODO: Make this dynamic)
return ("[%i, %i, %i, %i]", "%s[0], %s[1], %s[2], %s[3]" % (name, name, name, name))
if '*' in xgl_type: