Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / gen_framework.py

diff --git a/external/vulkancts/gen_framework.py b/external/vulkancts/gen_framework.py
index e738dd1..e6d9e55 100644 (file)
--- a/external/vulkancts/gen_framework.py
+++ b/external/vulkancts/gen_framework.py
@@ -113,6 +113,7 @@ DEFINITIONS                 = [
        "VK_MAX_MEMORY_HEAPS",
        "VK_MAX_DESCRIPTION_SIZE",
        "VK_ATTACHMENT_UNUSED",
+       "VK_SUBPASS_EXTERNAL"
 ]
 
 PLATFORM_TYPES         = [
@@ -413,7 +414,7 @@ def writeHandleType (api, filename):
 def getEnumValuePrefix (enum):
        prefix = enum.name[0]
        for i in range(1, len(enum.name)):
-               if enum.name[i].isupper():
+               if enum.name[i].isupper() and not enum.name[i-1].isupper():
                        prefix += "_"
                prefix += enum.name[i].upper()
        return prefix