xgl: Add xgl header changes for rev30 and 31.
Switched EnumerateLayer parameter order, added conditional definition
of xgl function prototypes, and prepended 'xgl' to all function
prototypes. This included fixes for bugs #13173 and #13180.
diff --git a/icd/intel/CMakeLists.txt b/icd/intel/CMakeLists.txt
index e9823d2..3a62dc4 100644
--- a/icd/intel/CMakeLists.txt
+++ b/icd/intel/CMakeLists.txt
@@ -5,6 +5,8 @@
# LLVM required defines
add_definitions(-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES")
+
# DEBUG and NDEBUG flags are important for proper mesa behavior
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
diff --git a/icd/intel/intel.c b/icd/intel/intel.c
index 85c6d5a..50f3be7 100644
--- a/icd/intel/intel.c
+++ b/icd/intel/intel.c
@@ -138,8 +138,8 @@
XGL_PHYSICAL_GPU gpu,
XGL_SIZE maxLayerCount,
XGL_SIZE maxStringSize,
- XGL_CHAR* const* pOutLayers,
XGL_SIZE* pOutLayerCount,
+ XGL_CHAR* const* pOutLayers,
XGL_VOID* pReserved)
{
if (!pOutLayerCount)