From 80ddae038ce1d02e35bf26eada99e9500e01fac1 Mon Sep 17 00:00:00 2001
From: Jon Ashburn <jon@lunarg.com>
Date: Wed, 15 Oct 2014 15:30:23 -0600
Subject: Add xglEnumerateLayers function including support in layers.

Also add this call to xglbase (init.cpp) test.
---
 include/xgl.h      | 8 ++++++++
 include/xglLayer.h | 7 ++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/xgl.h b/include/xgl.h
index 7f3986c5..b810c046 100644
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -1796,6 +1796,14 @@ XGL_RESULT XGLAPI xglGetExtensionSupport(
     XGL_PHYSICAL_GPU                            gpu,
     const XGL_CHAR*                             pExtName);
 
+// Layer discovery function
+XGL_RESULT XGLAPI xglEnumerateLayers(
+    XGL_PHYSICAL_GPU gpu,
+    XGL_SIZE maxLayerCount,
+    XGL_SIZE maxStringSize,
+    XGL_CHAR* const* pOutLayers,
+    XGL_SIZE* pOutLayerCount);
+
 // Queue functions
 
 XGL_RESULT XGLAPI xglGetDeviceQueue(
diff --git a/include/xglLayer.h b/include/xglLayer.h
index b762e57b..f139fff4 100644
--- a/include/xglLayer.h
+++ b/include/xglLayer.h
@@ -21,6 +21,7 @@ typedef XGL_RESULT (XGLAPI *GetGpuInfoType)(XGL_PHYSICAL_GPU gpu, XGL_PHYSICAL_G
 typedef XGL_RESULT (XGLAPI *CreateDeviceType)(XGL_PHYSICAL_GPU gpu, const XGL_DEVICE_CREATE_INFO* pCreateInfo, XGL_DEVICE* pDevice);
 typedef XGL_RESULT (XGLAPI *DestroyDeviceType)(XGL_DEVICE device);
 typedef XGL_RESULT (XGLAPI *GetExtensionSupportType)(XGL_PHYSICAL_GPU gpu, const XGL_CHAR* pExtName);
+typedef XGL_RESULT (XGLAPI *EnumerateLayersType)(XGL_PHYSICAL_GPU gpu, XGL_SIZE maxLayerCount, XGL_SIZE maxStringSize, XGL_CHAR* const* pOutLayers, XGL_SIZE* pOutLayerCount);
 typedef XGL_RESULT (XGLAPI *GetDeviceQueueType)(XGL_DEVICE device, XGL_QUEUE_TYPE queueType, XGL_UINT queueIndex, XGL_QUEUE* pQueue);
 typedef XGL_RESULT (XGLAPI *QueueSubmitType)(XGL_QUEUE queue, XGL_UINT cmdBufferCount, const XGL_CMD_BUFFER* pCmdBuffers, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs, XGL_FENCE fence);
 typedef XGL_RESULT (XGLAPI *QueueSetGlobalMemReferencesType)(XGL_QUEUE queue, XGL_UINT memRefCount, const XGL_MEMORY_REF* pMemRefs);
@@ -150,6 +151,7 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE
     CreateDeviceType CreateDevice;
     DestroyDeviceType DestroyDevice;
     GetExtensionSupportType GetExtensionSupport;
+    EnumerateLayersType EnumerateLayers;
     GetDeviceQueueType GetDeviceQueue;
     QueueSubmitType QueueSubmit;
     QueueSetGlobalMemReferencesType QueueSetGlobalMemReferences;
@@ -267,8 +269,3 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE
 
 // ------------------------------------------------------------------------------------------------
 // API functions
-XGL_RESULT xglEnumerateLayers(
-    XGL_PHYSICAL_GPU gpu,
-    XGL_SIZE maxLayerCount,
-    XGL_CHAR* const* pOutLayers,
-    XGL_SIZE* pOutLayerCount);
-- 
cgit v1.2.3