commit 4c329eb0de72d7b81c1f5efd98f32f9e4132604f
author Jeremy Hayes <jeremy@lunarg.com> Wed Jan 14 14:58:37 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:07 2015 -0700
tree 2e45850a62c2e37c75dfd30ac19f22b2d6011e2c
parent 32bde721097083216f634559d1ac08ec4eabd676

XGL: Move to svn r28460.

icd/common/icd-format.h

diff --git a/icd/common/icd-format.h b/icd/common/icd-format.h
index 963eb61..1292577 100644
--- a/icd/common/icd-format.h
+++ b/icd/common/icd-format.h
@@ -99,7 +99,7 @@
 
 size_t icd_format_get_size(XGL_FORMAT format);
 
-XGL_UINT icd_format_get_channel_count(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],

icd/intel/state.c

diff --git a/icd/intel/state.c b/icd/intel/state.c
index 232c70b..c022e26 100644
--- a/icd/intel/state.c
+++ b/icd/intel/state.c
@@ -112,7 +112,7 @@
                   const XGL_RASTER_STATE_CREATE_INFO *info)
 {
     switch (info->fillMode) {
-    case XFL_FILL_POINTS:
+    case XGL_FILL_POINTS:
         state->cmd_sf_fill |= GEN7_SF_DW1_FRONTFACE_POINT |
                               GEN7_SF_DW1_BACKFACE_POINT;
         break;