scripts: Update known good for 106 header update
Changes:
- Integrate upstream script changes: We have to plumb-through the new
conventions object to continue using the makeCParamDecl utility function
- Add GGP to available platforms
- Define `VULKAN_HPP_TYPESAFE_CONVERSION` in `cube.cpp` to avoid build
errors concerning explicit/implicit casting in `vulkan.hpp`
- Update known-good files
Updated:
- `build-android/vulkan-headers_revision_android`
- `cube/cube.cpp`
- `scripts/common_codegen.py`
- `scripts/known_good.json`
- `scripts/kvt_genvk.py`
- `scripts/mock_icd_generator.py`
- `scripts/vulkan_tools_helper_file_generator.py`
Change-Id: Ie9deb9f088d666195bcb987e30974f274d33fc85
diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android
index 88920af..ec192f8 100644
--- a/build-android/vulkan-headers_revision_android
+++ b/build-android/vulkan-headers_revision_android
@@ -1 +1 @@
-v1.1.102
+v1.1.106
diff --git a/cube/cube.cpp b/cube/cube.cpp
index d640086..e30c516 100644
--- a/cube/cube.cpp
+++ b/cube/cube.cpp
@@ -34,6 +34,7 @@
#define VULKAN_HPP_NO_SMART_HANDLE
#define VULKAN_HPP_NO_EXCEPTIONS
+#define VULKAN_HPP_TYPESAFE_CONVERSION
#include <vulkan/vulkan.hpp>
#include <vulkan/vk_sdk_platform.h>
diff --git a/scripts/common_codegen.py b/scripts/common_codegen.py
index 47bb632..8954532 100644
--- a/scripts/common_codegen.py
+++ b/scripts/common_codegen.py
@@ -50,6 +50,7 @@
platform_dict = {
'android' : 'VK_USE_PLATFORM_ANDROID_KHR',
'fuchsia' : 'VK_USE_PLATFORM_FUCHSIA',
+ 'ggp': 'VK_USE_PLATFORM_GGP',
'ios' : 'VK_USE_PLATFORM_IOS_MVK',
'macos' : 'VK_USE_PLATFORM_MACOS_MVK',
'metal' : 'VK_USE_PLATFORM_METAL_EXT',
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 0bb2287..7aa09d2 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -6,7 +6,7 @@
"sub_dir" : "glslang",
"build_dir" : "glslang/build",
"install_dir" : "glslang/build/install",
- "commit" : "5432f0dd8f331f15182681664d7486681e8514e6",
+ "commit" : "e06c7e9a515b716c731bda13f507546f107775d1",
"prebuild" : [
"python update_glslang_sources.py"
]
@@ -17,7 +17,7 @@
"sub_dir" : "Vulkan-Headers",
"build_dir" : "Vulkan-Headers/build",
"install_dir" : "Vulkan-Headers/build/install",
- "commit" : "v1.1.102"
+ "commit" : "v1.1.106"
},
{
"name" : "MoltenVK",
@@ -41,7 +41,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.1.102",
+ "commit" : "v1.1.106",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",
diff --git a/scripts/kvt_genvk.py b/scripts/kvt_genvk.py
index 399c35b..e7404aa 100644
--- a/scripts/kvt_genvk.py
+++ b/scripts/kvt_genvk.py
@@ -112,10 +112,14 @@
# Defaults for generating re-inclusion protection wrappers (or not)
protectFeature = protect
+ # An API style convention object
+ conventions = VulkanConventions()
+
# Helper file generator options for typemap_helper.h
genOpts['vk_typemap_helper.h'] = [
HelperFileOutputGenerator,
HelperFileOutputGeneratorOptions(
+ conventions = conventions,
filename = 'vk_typemap_helper.h',
directory = directory,
apiname = 'vulkan',
@@ -140,6 +144,7 @@
genOpts['mock_icd.h'] = [
MockICDOutputGenerator,
MockICDGeneratorOptions(
+ conventions = conventions,
filename = 'mock_icd.h',
directory = directory,
apiname = 'vulkan',
@@ -164,6 +169,7 @@
genOpts['mock_icd.cpp'] = [
MockICDOutputGenerator,
MockICDGeneratorOptions(
+ conventions = conventions,
filename = 'mock_icd.cpp',
directory = directory,
apiname = 'vulkan',
@@ -296,6 +302,7 @@
# Generator Modifications
from mock_icd_generator import MockICDGeneratorOptions, MockICDOutputGenerator
from vulkan_tools_helper_file_generator import HelperFileOutputGenerator, HelperFileOutputGeneratorOptions
+ from vkconventions import VulkanConventions
# This splits arguments which are space-separated lists
args.feature = [name for arg in args.feature for name in arg.split()]
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py
index 4cbd831..48d9465 100644
--- a/scripts/mock_icd_generator.py
+++ b/scripts/mock_icd_generator.py
@@ -934,6 +934,7 @@
# separate line, align parameter names at the specified column
class MockICDGeneratorOptions(GeneratorOptions):
def __init__(self,
+ conventions = None,
filename = None,
directory = '.',
apiname = None,
@@ -959,7 +960,7 @@
alignFuncParam = 0,
expandEnumerants = True,
helper_file_type = ''):
- GeneratorOptions.__init__(self, filename, directory, apiname, profile,
+ GeneratorOptions.__init__(self, conventions, filename, directory, apiname, profile,
versions, emitversions, defaultExtensions,
addExtensions, removeExtensions, emitExtensions, sortProcedure)
self.prefixText = prefixText
diff --git a/scripts/vulkan_tools_helper_file_generator.py b/scripts/vulkan_tools_helper_file_generator.py
index e6e690f..ca5b240 100644
--- a/scripts/vulkan_tools_helper_file_generator.py
+++ b/scripts/vulkan_tools_helper_file_generator.py
@@ -31,6 +31,7 @@
# HelperFileOutputGeneratorOptions - subclass of GeneratorOptions.
class HelperFileOutputGeneratorOptions(GeneratorOptions):
def __init__(self,
+ conventions = None,
filename = None,
directory = '.',
apiname = None,
@@ -53,7 +54,7 @@
library_name = '',
expandEnumerants = True,
helper_file_type = ''):
- GeneratorOptions.__init__(self, filename, directory, apiname, profile,
+ GeneratorOptions.__init__(self, conventions, filename, directory, apiname, profile,
versions, emitversions, defaultExtensions,
addExtensions, removeExtensions, emitExtensions, sortProcedure)
self.prefixText = prefixText
