diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2015-01-29 08:55:56 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-02-04 17:58:10 -0700 |
| commit | c4fffc7c6f3b4ae4cc1f969c2d0985091fe41adb (patch) | |
| tree | 8a64e7dec3aa2dea0f0258fe9c256ff39eee276d /icd/common | |
| parent | 5f192769a661b589df055884165425b77aa814c8 (diff) | |
| download | usermoji-c4fffc7c6f3b4ae4cc1f969c2d0985091fe41adb.tar.xz | |
xgl: Remove XGL_* typedef wrappers
Part of moving to xgl.h rev#38, svn rev 29293-29302
Diffstat (limited to 'icd/common')
| -rw-r--r-- | icd/common/icd-format.c | 6 | ||||
| -rw-r--r-- | icd/common/icd-format.h | 2 | ||||
| -rw-r--r-- | icd/common/icd-log.c | 2 | ||||
| -rw-r--r-- | icd/common/icd.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c index 4119de11..ffdd5924 100644 --- a/icd/common/icd-format.c +++ b/icd/common/icd-format.c @@ -30,8 +30,8 @@ #include "icd-format.h" static const struct icd_format_info { - XGL_SIZE size; - XGL_UINT channel_count; + size_t size; + uint32_t channel_count; } icd_format_table[XGL_NUM_FMT] = { [XGL_FMT_UNDEFINED] = { 0, 0 }, [XGL_FMT_R4G4_UNORM] = { 1, 2 }, @@ -549,7 +549,7 @@ unsigned int icd_format_get_channel_count(XGL_FORMAT format) * icd_format_get_size(format) bytes. */ void icd_format_get_raw_value(XGL_FORMAT format, - const XGL_UINT32 color[4], + const uint32_t color[4], void *value) { /* assume little-endian */ diff --git a/icd/common/icd-format.h b/icd/common/icd-format.h index f1825f66..0d52c46a 100644 --- a/icd/common/icd-format.h +++ b/icd/common/icd-format.h @@ -66,7 +66,7 @@ XGL_IMAGE_FORMAT_CLASS icd_format_get_class(XGL_FORMAT format); unsigned int icd_format_get_channel_count(XGL_FORMAT format); void icd_format_get_raw_value(XGL_FORMAT format, - const XGL_UINT32 color[4], + const uint32_t color[4], void *value); #endif /* ICD_FORMAT_H */ diff --git a/icd/common/icd-log.c b/icd/common/icd-log.c index 15d8ac87..f900b19d 100644 --- a/icd/common/icd-log.c +++ b/icd/common/icd-log.c @@ -31,7 +31,7 @@ struct icd_logger_callback { XGL_DBG_MSG_CALLBACK_FUNCTION func; - XGL_VOID *user_data; + void *user_data; struct icd_logger_callback *next; }; diff --git a/icd/common/icd.h b/icd/common/icd.h index b30e8585..1e053c8a 100644 --- a/icd/common/icd.h +++ b/icd/common/icd.h @@ -40,8 +40,8 @@ # define ICD_EXPORT #endif -XGL_RESULT XGLAPI icdDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, XGL_VOID* pUserData); +XGL_RESULT XGLAPI icdDbgRegisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback, void* pUserData); XGL_RESULT XGLAPI icdDbgUnregisterMsgCallback(XGL_DBG_MSG_CALLBACK_FUNCTION pfnMsgCallback); -XGL_RESULT XGLAPI icdDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, XGL_SIZE dataSize, const XGL_VOID* pData); +XGL_RESULT XGLAPI icdDbgSetGlobalOption(XGL_DBG_GLOBAL_OPTION dbgOption, size_t dataSize, const void* pData); #endif /* ICD_H */ |