Add vkEnumerate functions that android needs exported literally

renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj

@@ -25,6 +25,9 @@
     <ClCompile Include="vk_memory.cpp" />
     <ClCompile Include="vk_state.cpp" />
     <ClCompile Include="vk_tracelayer.cpp" />
+    <ClCompile Include="vk_tracelayer_android.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="vk_common.cpp" />
     <ClCompile Include="vk_core.cpp" />
     <ClCompile Include="vk_debug.cpp" />

renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters

@@ -88,6 +88,9 @@
     <ClCompile Include="vk_linux.cpp">
       <Filter>OS\Posix</Filter>
     </ClCompile>
+    <ClCompile Include="vk_tracelayer_android.cpp">
+      <Filter>OS\Posix</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="vk_replay.h">
@@ -164,4 +167,4 @@
       <Filter>Layer</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>

renderdoc/driver/vulkan/vk_tracelayer_android.cpp

@@ -0,0 +1,96 @@
+/******************************************************************************
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2016 Baldur Karlsson
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ ******************************************************************************/
+
+#include <string.h>
+#include <stdlib.h>
+#include "official/vk_layer.h"
+
+// RenderDoc Includes
+
+#include "vk_common.h"
+#include "vk_core.h"
+#include "vk_resources.h"
+#include "vk_hookset_defs.h"
+
+// The android loader has limitations at present that require the enumerate functions
+// to be exported with the precise canonical names. We just forward them to the
+// layer-named functions
+
+#if !defined(RENDERDOC_PLATFORM_ANDROID)
+#error "This file should only be compiled on android!"
+#endif
+
+extern "C" {
+
+// these are in vk_tracelayer.cpp
+VK_LAYER_EXPORT VkResult VKAPI_CALL VK_LAYER_RENDERDOC_CaptureEnumerateDeviceLayerProperties(
+	VkPhysicalDevice                            physicalDevice,
+	uint32_t*                                   pPropertyCount,
+	VkLayerProperties*                          pProperties);
+
+VK_LAYER_EXPORT VkResult VKAPI_CALL VK_LAYER_RENDERDOC_CaptureEnumerateDeviceExtensionProperties(
+	VkPhysicalDevice        physicalDevice,
+	const char             *pLayerName,
+	uint32_t               *pPropertyCount,
+	VkExtensionProperties  *pProperties);
+
+VK_LAYER_EXPORT VkResult VKAPI_CALL vkCaptureEnumerateDeviceLayerProperties(
+	VkPhysicalDevice                            physicalDevice,
+	uint32_t*                                   pPropertyCount,
+	VkLayerProperties*                          pProperties)
+{
+	return VK_LAYER_RENDERDOC_CaptureEnumerateDeviceLayerProperties(physicalDevice, pPropertyCount, pProperties);
+}
+
+VK_LAYER_EXPORT VkResult VKAPI_CALL vkCaptureEnumerateDeviceExtensionProperties(
+	VkPhysicalDevice        physicalDevice,
+	const char             *pLayerName,
+	uint32_t               *pPropertyCount,
+	VkExtensionProperties  *pProperties)
+{
+	return VK_LAYER_RENDERDOC_CaptureEnumerateDeviceExtensionProperties(physicalDevice, pLayerName, pPropertyCount, pProperties);
+}
+
+VK_LAYER_EXPORT VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties(
+	uint32_t*                                   pPropertyCount,
+	VkLayerProperties*                          pProperties)
+{
+	// VK_LAYER_RENDERDOC_CaptureEnumerateDeviceLayerProperties ignores the physicalDevice parameter
+	// since the layer properties are static
+	return VK_LAYER_RENDERDOC_CaptureEnumerateDeviceLayerProperties(VK_NULL_HANDLE, pPropertyCount, pProperties);
+}
+
+VK_LAYER_EXPORT VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties(
+	const char             *pLayerName,
+	uint32_t               *pPropertyCount,
+	VkExtensionProperties  *pProperties)
+{
+	// we don't export any instance extensions
+	if(pPropertyCount)
+		*pPropertyCount = 0;
+
+	return VK_SUCCESS;
+}
+
+}