vulkan: Add SDK 0.9 to 0.10 patch stack (4648d9c1) · Commits · e / os / android_frameworks_native

vulkan/patches/README

+6 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,12 @@ $ cd <somewhere in target git repo>
		$ git am $VULKAN_PATCHES/$PATCH_DIR/*


		frameworks_base-apk_library_dir
		-------------------------------
		This branch is for frameworks/native. It changes all the Vulkan components to
		use the SDK 0.10 version of the API and extensions.


		frameworks_base-apk_library_dir
		-------------------------------
		This branch is for $TOP/frameworks/base. It modifies the framework to

vulkan/patches/frameworks_native-sdk_0.10/0001-vulkan-Update-from-version-0.172.2-to-0.174.0.patch

0 → 100644

+505 −0

File added.

Preview size limit exceeded, changes collapsed.

vulkan/patches/frameworks_native-sdk_0.10/0002-vulkan-Update-from-version-0.174.0-to-0.177.0.patch

0 → 100644

+206 −0

Original line number	Diff line number	Diff line
		From 8ce9e519e5af3e2310765825115ffc3a65af818c Mon Sep 17 00:00:00 2001
		From: Jesse Hall <jessehall@google.com>
		Date: Thu, 19 Nov 2015 21:51:33 -0800
		Subject: [PATCH 02/30] vulkan: Update from version 0.174.0 to 0.177.0

		Change-Id: I4b837c0bdb4fd6120688e8389ab8591178d370fb
		---
		vulkan/api/templates/vulkan_h.tmpl \| 2 +-
		vulkan/api/vulkan.api \| 12 +++++-------
		vulkan/include/vulkan/vulkan.h \| 25 ++++++++++---------------
		vulkan/nulldrv/null_driver.cpp \| 2 +-
		vulkan/tools/vkinfo.cpp \| 6 ++----
		5 files changed, 19 insertions(+), 28 deletions(-)

		diff --git a/vulkan/api/templates/vulkan_h.tmpl b/vulkan/api/templates/vulkan_h.tmpl
		index 2dee541..c55107d 100644
		--- a/vulkan/api/templates/vulkan_h.tmpl
		+++ b/vulkan/api/templates/vulkan_h.tmpl
		@@ -53,7 +53,7 @@ extern "C" {
		#define VK_API_VERSION \
		VK_MAKE_VERSION({{Global "VERSION_MAJOR"}}, {{Global "VERSION_MINOR"}}, {{Global "VERSION_PATCH"}})
		¶
		-#if defined(__cplusplus) && (_MSC_VER >= 1800 \|\| __cplusplus >= 201103L)
		+#if defined(__cplusplus) && ((defined(_MSC_VER) && _MSC_VER >= 1800 \|\| __cplusplus >= 201103L)
		#define VK_NULL_HANDLE nullptr
		#else
		#define VK_NULL_HANDLE 0
		diff --git a/vulkan/api/vulkan.api b/vulkan/api/vulkan.api
		index 7ab0e86..2b499fd 100644
		--- a/vulkan/api/vulkan.api
		+++ b/vulkan/api/vulkan.api
		@@ -27,7 +27,7 @@ import platform "platform.api"

		// API version (major.minor.patch)
		define VERSION_MAJOR 0
		-define VERSION_MINOR 174
		+define VERSION_MINOR 177
		define VERSION_PATCH 0

		// API limits
		@@ -695,8 +695,7 @@ bitfield VkMemoryPropertyFlags {
		VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT = 0x00000002, /// Memory may not have i/o coherency so vkFlushMappedMemoryRanges and vkInvalidateMappedMemoryRanges must be used flush/invalidate host cache
		/// vkInvalidateMappedMemoryRanges must be used flush/invalidate host cache
		VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT = 0x00000004, /// Memory should not be cached by the host
		- VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT = 0x00000008, /// Memory should support host write combining
		- VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT = 0x00000010, /// Memory may be allocated by the driver when it is required
		+ VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT = 0x00000008, /// Memory may be allocated by the driver when it is required
		}

		/// Memory heap flags
		@@ -932,7 +931,6 @@ bitfield VkAttachmentDescriptionFlags {

		/// Subpass description flags
		bitfield VkSubpassDescriptionFlags {
		- VK_SUBPASS_DESCRIPTION_NO_OVERDRAW_BIT = 0x00000001,
		}

		/// Command pool creation flags
		@@ -1108,7 +1106,7 @@ class VkInstanceCreateInfo {
		class VkQueueFamilyProperties {
		VkQueueFlags queueFlags /// Queue flags
		u32 queueCount
		- VkBool32 supportsTimestamps
		+ u32 timestampValidBits
		}

		class VkPhysicalDeviceMemoryProperties {
		@@ -1522,6 +1520,8 @@ class VkPipelineMultisampleStateCreateInfo {
		VkBool32 sampleShadingEnable /// optional (GL45)
		f32 minSampleShading /// optional (GL45)
		const VkSampleMask* pSampleMask
		+ VkBool32 alphaToCoverageEnable
		+ VkBool32 alphaToOneEnable
		}

		class VkPipelineColorBlendAttachmentState {
		@@ -1538,8 +1538,6 @@ class VkPipelineColorBlendAttachmentState {
		class VkPipelineColorBlendStateCreateInfo {
		VkStructureType sType /// Must be VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO
		const void* pNext /// Pointer to next structure
		- VkBool32 alphaToCoverageEnable
		- VkBool32 alphaToOneEnable
		VkBool32 logicOpEnable
		VkLogicOp logicOp
		u32 attachmentCount /// # of pAttachments
		diff --git a/vulkan/include/vulkan/vulkan.h b/vulkan/include/vulkan/vulkan.h
		index 5d884cd..124d088 100644
		--- a/vulkan/include/vulkan/vulkan.h
		+++ b/vulkan/include/vulkan/vulkan.h
		@@ -41,10 +41,10 @@ extern "C" {
		((major << 22) \| (minor << 12) \| patch)

		// Vulkan API version supported by this file
		-#define VK_API_VERSION VK_MAKE_VERSION(0, 174, 0)
		+#define VK_API_VERSION VK_MAKE_VERSION(0, 177, 0)


		-#if defined(__cplusplus) && (_MSC_VER >= 1800 \|\| __cplusplus >= 201103L)
		+#if defined(__cplusplus) && ((defined(_MSC_VER) && _MSC_VER >= 1800) \|\| __cplusplus >= 201103L)
		#define VK_NULL_HANDLE nullptr
		#else
		#define VK_NULL_HANDLE 0
		@@ -711,10 +711,10 @@ typedef enum {
		VK_TEX_ADDRESS_MODE_CLAMP = 2,
		VK_TEX_ADDRESS_MODE_MIRROR_ONCE = 3,
		VK_TEX_ADDRESS_MODE_CLAMP_BORDER = 4,
		- VK_TEX_ADDRESS_BEGIN_RANGE = VK_TEX_ADDRESS_MODE_WRAP,
		- VK_TEX_ADDRESS_END_RANGE = VK_TEX_ADDRESS_MODE_CLAMP_BORDER,
		- VK_TEX_ADDRESS_NUM = (VK_TEX_ADDRESS_MODE_CLAMP_BORDER - VK_TEX_ADDRESS_MODE_WRAP + 1),
		- VK_TEX_ADDRESS_MAX_ENUM = 0x7FFFFFFF
		+ VK_TEX_ADDRESS_MODE_BEGIN_RANGE = VK_TEX_ADDRESS_MODE_WRAP,
		+ VK_TEX_ADDRESS_MODE_END_RANGE = VK_TEX_ADDRESS_MODE_CLAMP_BORDER,
		+ VK_TEX_ADDRESS_MODE_NUM = (VK_TEX_ADDRESS_MODE_CLAMP_BORDER - VK_TEX_ADDRESS_MODE_WRAP + 1),
		+ VK_TEX_ADDRESS_MODE_MAX_ENUM = 0x7FFFFFFF
		} VkTexAddressMode;

		typedef enum {
		@@ -893,8 +893,7 @@ typedef enum {
		VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT = 0x00000001,
		VK_MEMORY_PROPERTY_HOST_NON_COHERENT_BIT = 0x00000002,
		VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT = 0x00000004,
		- VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT = 0x00000008,
		- VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT = 0x00000010,
		+ VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT = 0x00000008,
		} VkMemoryPropertyFlagBits;
		typedef VkFlags VkMemoryPropertyFlags;

		@@ -1013,10 +1012,6 @@ typedef enum {
		VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT = 0x00000001,
		} VkAttachmentDescriptionFlagBits;
		typedef VkFlags VkAttachmentDescriptionFlags;
		-
		-typedef enum {
		- VK_SUBPASS_DESCRIPTION_NO_OVERDRAW_BIT = 0x00000001,
		-} VkSubpassDescriptionFlagBits;
		typedef VkFlags VkSubpassDescriptionFlags;

		typedef enum {
		@@ -1336,7 +1331,7 @@ typedef struct {
		typedef struct {
		VkQueueFlags queueFlags;
		uint32_t queueCount;
		- VkBool32 supportsTimestamps;
		+ uint32_t timestampValidBits;
		} VkQueueFamilyProperties;

		typedef struct {
		@@ -1684,6 +1679,8 @@ typedef struct {
		VkBool32 sampleShadingEnable;
		float minSampleShading;
		const VkSampleMask* pSampleMask;
		+ VkBool32 alphaToCoverageEnable;
		+ VkBool32 alphaToOneEnable;
		} VkPipelineMultisampleStateCreateInfo;

		typedef struct {
		@@ -1724,8 +1721,6 @@ typedef struct {
		typedef struct {
		VkStructureType sType;
		const void* pNext;
		- VkBool32 alphaToCoverageEnable;
		- VkBool32 alphaToOneEnable;
		VkBool32 logicOpEnable;
		VkLogicOp logicOp;
		uint32_t attachmentCount;
		diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp
		index 9d028eb..8992db4 100644
		--- a/vulkan/nulldrv/null_driver.cpp
		+++ b/vulkan/nulldrv/null_driver.cpp
		@@ -288,7 +288,7 @@ VkResult GetPhysicalDeviceQueueFamilyProperties(
		properties->queueFlags =
		VK_QUEUE_GRAPHICS_BIT \| VK_QUEUE_COMPUTE_BIT \| VK_QUEUE_DMA_BIT;
		properties->queueCount = 1;
		- properties->supportsTimestamps = VK_FALSE;
		+ properties->timestampValidBits = 64;
		}
		*count = 1;
		return VK_SUCCESS;
		diff --git a/vulkan/tools/vkinfo.cpp b/vulkan/tools/vkinfo.cpp
		index 583e607..2af04ad 100644
		--- a/vulkan/tools/vkinfo.cpp
		+++ b/vulkan/tools/vkinfo.cpp
		@@ -124,8 +124,6 @@ void DumpPhysicalDevice(uint32_t idx, VkPhysicalDevice pdev) {
		strbuf << " NON_COHERENT";
		if ((flags & VK_MEMORY_PROPERTY_HOST_UNCACHED_BIT) != 0)
		strbuf << " UNCACHED";
		- if ((flags & VK_MEMORY_PROPERTY_HOST_WRITE_COMBINED_BIT) != 0)
		- strbuf << " WRITE_COMBINED";
		if ((flags & VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) != 0)
		strbuf << " LAZILY_ALLOCATED";
		printf(" Type %u: %s\n", type, strbuf.str().c_str());
		@@ -154,9 +152,9 @@ void DumpPhysicalDevice(uint32_t idx, VkPhysicalDevice pdev) {
		queue_flags &= ~flag;
		sep = "+";
		}
		- printf(" Queue Family %u: %2ux %s timestamps:%s\n", family,
		+ printf(" Queue Family %u: %2ux %s timestamps:%ub\n", family,
		qprops.queueCount, strbuf.str().c_str(),
		- qprops.supportsTimestamps ? "YES" : "NO");
		+ qprops.timestampValidBits);
		strbuf.str(std::string());
		}
		}
		--
		2.4.0

vulkan/patches/frameworks_native-sdk_0.10/0003-vulkan-Update-from-version-0.177.0-to-0.179.0.patch

0 → 100644

+1092 −0

File added.

Preview size limit exceeded, changes collapsed.

vulkan/patches/frameworks_native-sdk_0.10/0004-vulkan-Update-from-version-0.179.0-to-0.180.0.patch

0 → 100644

+186 −0

Original line number	Diff line number	Diff line
		From 167ad20ec48e513fc70447a517d807f082bce6eb Mon Sep 17 00:00:00 2001
		From: Jesse Hall <jessehall@google.com>
		Date: Thu, 19 Nov 2015 22:30:07 -0800
		Subject: [PATCH 04/30] vulkan: Update from version 0.179.0 to 0.180.0

		Change-Id: I2cbf4a8b065e8150734d76d614ab0850bc8324dc
		---
		vulkan/api/vulkan.api \| 33 +++++++++++++++++++++------------
		vulkan/include/vulkan/vulkan.h \| 19 ++++++++++++++-----
		vulkan/libvulkan/entry.cpp \| 4 ++--
		vulkan/nulldrv/null_driver.cpp \| 2 +-
		vulkan/nulldrv/null_driver.h \| 2 +-
		5 files changed, 39 insertions(+), 21 deletions(-)

		diff --git a/vulkan/api/vulkan.api b/vulkan/api/vulkan.api
		index 7844f63..669a64e 100644
		--- a/vulkan/api/vulkan.api
		+++ b/vulkan/api/vulkan.api
		@@ -27,7 +27,7 @@ import platform "platform.api"

		// API version (major.minor.patch)
		define VERSION_MAJOR 0
		-define VERSION_MINOR 179
		+define VERSION_MINOR 180
		define VERSION_PATCH 0

		// API limits
		@@ -1058,6 +1058,15 @@ class VkLayerProperties {
		char[VK_MAX_DESCRIPTION] description /// Free-form description of the layer
		}

		+class VkSubmitInfo {
		+ u32 waitSemCount
		+ const VkSemaphore* pWaitSemaphores
		+ u32 cmdBufferCount
		+ const VkCmdBuffer* pCommandBuffers
		+ u32 signalSemCount
		+ const VkSemaphore* pSignalSemaphores
		+}
		+
		class VkApplicationInfo {
		VkStructureType sType /// Type of structure. Should be VK_STRUCTURE_TYPE_APPLICATION_INFO
		const void* pNext /// Next structure in chain
		@@ -2348,8 +2357,8 @@ cmd void vkGetDeviceQueue(
		@threadSafety("app")
		cmd VkResult vkQueueSubmit(
		VkQueue queue,
		- u32 cmdBufferCount,
		- const VkCmdBuffer* pCmdBuffers,
		+ u32 submitCount,
		+ const VkSubmitInfo* pSubmitInfo,
		VkFence fence) {
		queueObject := GetQueue(queue)

		@@ -2358,15 +2367,15 @@ cmd VkResult vkQueueSubmit(
		assert(fenceObject.device == queueObject.device)
		}

		- cmdBuffers := pCmdBuffers[0:cmdBufferCount]
		- for i in (0 .. cmdBufferCount) {
		- cmdBuffer := cmdBuffers[i]
		- cmdBufferObject := GetCmdBuffer(cmdBuffer)
		- assert(cmdBufferObject.device == queueObject.device)
		-
		- validate("QueueCheck", cmdBufferObject.queueFlags in queueObject.flags,
		- "vkQueueSubmit: enqueued cmdBuffer requires missing queue capabilities.")
		- }
		+ // cmdBuffers := pCmdBuffers[0:cmdBufferCount]
		+ // for i in (0 .. cmdBufferCount) {
		+ // cmdBuffer := cmdBuffers[i]
		+ // cmdBufferObject := GetCmdBuffer(cmdBuffer)
		+ // assert(cmdBufferObject.device == queueObject.device)
		+ //
		+ // validate("QueueCheck", cmdBufferObject.queueFlags in queueObject.flags,
		+ // "vkQueueSubmit: enqueued cmdBuffer requires missing queue capabilities.")
		+ // }

		return ?
		}
		diff --git a/vulkan/include/vulkan/vulkan.h b/vulkan/include/vulkan/vulkan.h
		index eb427f8..3706b34 100644
		--- a/vulkan/include/vulkan/vulkan.h
		+++ b/vulkan/include/vulkan/vulkan.h
		@@ -41,7 +41,7 @@ extern "C" {
		((major << 22) \| (minor << 12) \| patch)

		// Vulkan API version supported by this file
		-#define VK_API_VERSION VK_MAKE_VERSION(0, 179, 0)
		+#define VK_API_VERSION VK_MAKE_VERSION(0, 180, 0)


		#if defined(__cplusplus) && ((defined(_MSC_VER) && _MSC_VER >= 1800) \|\| __cplusplus >= 201103L)
		@@ -97,12 +97,12 @@ VK_DEFINE_HANDLE(VkInstance)
		VK_DEFINE_HANDLE(VkPhysicalDevice)
		VK_DEFINE_HANDLE(VkDevice)
		VK_DEFINE_HANDLE(VkQueue)
		+VK_DEFINE_NONDISP_HANDLE(VkSemaphore)
		VK_DEFINE_HANDLE(VkCmdBuffer)
		VK_DEFINE_NONDISP_HANDLE(VkFence)
		VK_DEFINE_NONDISP_HANDLE(VkDeviceMemory)
		VK_DEFINE_NONDISP_HANDLE(VkBuffer)
		VK_DEFINE_NONDISP_HANDLE(VkImage)
		-VK_DEFINE_NONDISP_HANDLE(VkSemaphore)
		VK_DEFINE_NONDISP_HANDLE(VkEvent)
		VK_DEFINE_NONDISP_HANDLE(VkQueryPool)
		VK_DEFINE_NONDISP_HANDLE(VkBufferView)
		@@ -1384,6 +1384,15 @@ typedef struct {
		} VkLayerProperties;

		typedef struct {
		+ uint32_t waitSemCount;
		+ const VkSemaphore* pWaitSemaphores;
		+ uint32_t cmdBufferCount;
		+ const VkCmdBuffer* pCommandBuffers;
		+ uint32_t signalSemCount;
		+ const VkSemaphore* pSignalSemaphores;
		+} VkSubmitInfo;
		+
		+typedef struct {
		VkStructureType sType;
		const void* pNext;
		VkDeviceSize allocationSize;
		@@ -2115,7 +2124,7 @@ typedef VkResult (VKAPI *PFN_vkEnumerateDeviceExtensionProperties)(VkPhysicalDev
		typedef VkResult (VKAPI PFN_vkEnumerateInstanceLayerProperties)(uint32_t pCount, VkLayerProperties* pProperties);
		typedef VkResult (VKAPI PFN_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice physicalDevice, uint32_t pCount, VkLayerProperties* pProperties);
		typedef void (VKAPI PFN_vkGetDeviceQueue)(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue pQueue);
		-typedef VkResult (VKAPI PFN_vkQueueSubmit)(VkQueue queue, uint32_t cmdBufferCount, const VkCmdBuffer pCmdBuffers, VkFence fence);
		+typedef VkResult (VKAPI PFN_vkQueueSubmit)(VkQueue queue, uint32_t submitCount, const VkSubmitInfo pSubmitInfo, VkFence fence);
		typedef VkResult (VKAPI *PFN_vkQueueWaitIdle)(VkQueue queue);
		typedef VkResult (VKAPI *PFN_vkDeviceWaitIdle)(VkDevice device);
		typedef VkResult (VKAPI PFN_vkAllocMemory)(VkDevice device, const VkMemoryAllocInfo pAllocInfo, VkDeviceMemory* pMem);
		@@ -2330,8 +2339,8 @@ void VKAPI vkGetDeviceQueue(

		VkResult VKAPI vkQueueSubmit(
		VkQueue queue,
		- uint32_t cmdBufferCount,
		- const VkCmdBuffer* pCmdBuffers,
		+ uint32_t submitCount,
		+ const VkSubmitInfo* pSubmitInfo,
		VkFence fence);

		VkResult VKAPI vkQueueWaitIdle(
		diff --git a/vulkan/libvulkan/entry.cpp b/vulkan/libvulkan/entry.cpp
		index b7c4848..2bf6aae 100644
		--- a/vulkan/libvulkan/entry.cpp
		+++ b/vulkan/libvulkan/entry.cpp
		@@ -132,8 +132,8 @@ void vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queue
		}

		__attribute__((visibility("default")))
		-VkResult vkQueueSubmit(VkQueue queue, uint32_t cmdBufferCount, const VkCmdBuffer* pCmdBuffers, VkFence fence) {
		- return GetVtbl(queue).QueueSubmit(queue, cmdBufferCount, pCmdBuffers, fence);
		+VkResult vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmitInfo, VkFence fence) {
		+ return GetVtbl(queue).QueueSubmit(queue, submitCount, pSubmitInfo, fence);
		}

		__attribute__((visibility("default")))
		diff --git a/vulkan/nulldrv/null_driver.cpp b/vulkan/nulldrv/null_driver.cpp
		index 0d1b468..2bef297 100644
		--- a/vulkan/nulldrv/null_driver.cpp
		+++ b/vulkan/nulldrv/null_driver.cpp
		@@ -709,7 +709,7 @@ VkResult EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, con
		return VK_SUCCESS;
		}

		-VkResult QueueSubmit(VkQueue queue, uint32_t cmdBufferCount, const VkCmdBuffer* pCmdBuffers, VkFence fence) {
		+VkResult QueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmitInfo, VkFence fence) {
		return VK_SUCCESS;
		}

		diff --git a/vulkan/nulldrv/null_driver.h b/vulkan/nulldrv/null_driver.h
		index 2679777..a1d1e05 100644
		--- a/vulkan/nulldrv/null_driver.h
		+++ b/vulkan/nulldrv/null_driver.h
		@@ -44,7 +44,7 @@ VkResult EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, con
		VkResult EnumerateInstanceLayerProperties(uint32_t* pCount, VkLayerProperties* pProperties);
		VkResult EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t* pCount, VkLayerProperties* pProperties);
		void GetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue);
		-VkResult QueueSubmit(VkQueue queue, uint32_t cmdBufferCount, const VkCmdBuffer* pCmdBuffers, VkFence fence);
		+VkResult QueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmitInfo, VkFence fence);
		VkResult QueueWaitIdle(VkQueue queue);
		VkResult DeviceWaitIdle(VkDevice device);
		VkResult AllocMemory(VkDevice device, const VkMemoryAllocInfo* pAllocInfo, VkDeviceMemory* pMem);
		--
		2.4.0