aboutsummaryrefslogtreecommitdiff
path: root/icd/common
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2014-12-27 14:14:50 +0800
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-02-04 17:58:02 -0700
commit6fb3caecc605008d2dbd3eb729ef34dedfeb094f (patch)
tree7062e19b4621ca81ab7a612cec987f60566c489b /icd/common
parent9be0fb9abe725774aa0c25d5b0289e0834f7f943 (diff)
downloadusermoji-6fb3caecc605008d2dbd3eb729ef34dedfeb094f.tar.xz
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.
Diffstat (limited to 'icd/common')
-rw-r--r--icd/common/icd-format.c2
-rw-r--r--icd/common/icd-format.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c
index 8aecb3eb..c56d70fc 100644
--- a/icd/common/icd-format.c
+++ b/icd/common/icd-format.c
@@ -66,7 +66,7 @@ static const struct icd_format_info {
[XGL_CH_FMT_BC7] = { 16, 4 },
};
-unsigned int icd_format_get_size(XGL_FORMAT format)
+size_t icd_format_get_size(XGL_FORMAT format)
{
return icd_format_table[format.channelFormat].size;
}
diff --git a/icd/common/icd-format.h b/icd/common/icd-format.h
index 1bfc8af8..963eb61a 100644
--- a/icd/common/icd-format.h
+++ b/icd/common/icd-format.h
@@ -97,7 +97,7 @@ static inline int icd_format_get_block_width(XGL_FORMAT format)
return (icd_format_is_compressed(format)) ? 4 : 1;
}
-XGL_SIZE icd_format_get_size(XGL_FORMAT format);
+size_t icd_format_get_size(XGL_FORMAT format);
XGL_UINT icd_format_get_channel_count(XGL_FORMAT format);