commit ee841c568f50ca3e554289e8bbbc462a8d38fa96
author Nicolas Capens <capn@google.com> Tue Nov 13 14:18:26 2018 -0500
committer Nicolas Capens <nicolascapens@google.com> Wed Nov 14 15:38:59 2018 +0000
tree bcecc60428fba2afce2134429af186e98fcc9989
parent 513a11652e38e232373936a57164bcf2f649aeeb

Base the driver version on Version.h.

Also always clear the UUIDs first so that shorter strings don't leave
data undefined.

Bug b/116336664

Change-Id: I77d5ae1514db5d68d540614b7c57c4872695ecca
Reviewed-on: https://swiftshader-review.googlesource.com/c/22490
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Vulkan/VkConfig.h

diff --git a/src/Vulkan/VkConfig.h b/src/Vulkan/VkConfig.h
index f68a688..7646a74 100644
--- a/src/Vulkan/VkConfig.h
+++ b/src/Vulkan/VkConfig.h
@@ -15,17 +15,22 @@
 #ifndef VK_CONFIG_HPP_
 #define VK_CONFIG_HPP_
 
+#include "Version.h"
+
+#include <vulkan/vulkan_core.h>
+
 namespace vk
 {
 
 // Note: Constant array initialization requires a string literal.
 //       constexpr char* or char[] does not work for that purpose.
 #define SWIFTSHADER_DEVICE_NAME "SwiftShader Device" // Max length: VK_MAX_PHYSICAL_DEVICE_NAME_SIZE
-#define SWIFTSHADER_UUID "SwiftShaderUUID" // Max length: VK_UUID_SIZE
+#define SWIFTSHADER_UUID "SwiftShaderUUID" // Max length: VK_UUID_SIZE (16)
 
 enum
 {
-	DRIVER_VERSION = 1,
+	API_VERSION = VK_API_VERSION_1_1,
+	DRIVER_VERSION = VK_MAKE_VERSION(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION),
 	VENDOR_ID = 0x1AE0, // Google
 	DEVICE_ID = 0xC0DE, // SwiftShader
 };
@@ -45,8 +50,9 @@
 	MAX_IMAGE_ARRAY_LAYERS = 11,
 };
 
-enum {
-	MaxVertexInputBindings = 16,
+enum
+{
+	MAX_VERTEX_INPUT_BINDINGS = 16,
 };
 
 }