From 21c0fb00ba42f8077fe62868301cf0be711d8147 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 9 Oct 2015 11:53:21 -0400 Subject: [PATCH] Update SPIR-V tests and spirv-tools to SPIR-V rev32. Change-Id: I60da261bff306e6749ef75890d9238761681f939 --- external/fetch_sources.py | 2 +- external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/external/fetch_sources.py b/external/fetch_sources.py index 6e3fd94..296dc52 100644 --- a/external/fetch_sources.py +++ b/external/fetch_sources.py @@ -170,7 +170,7 @@ PACKAGES = [ postExtract = postExtractLibpng), GitRepo( "git@gitlab.khronos.org:spirv/spirv-tools.git", - "eac78e60d02c1315ae2f56866fb291dd6c606107", + "6e5fc02aef16d8cdc65d39c20166cd2775d2af35", "spirv-tools"), GitRepo( "git@gitlab.khronos.org:GLSL/glslang.git", diff --git a/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp index 3694168..7fefdd5 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp @@ -126,7 +126,7 @@ void createTriangleAsmProgs (SourceCollections& dst) " OpCapability Shader\n" "%1 = OpExtInstImport \"GLSL.std.450\"\n" " OpMemoryModel Logical GLSL450\n" - " OpEntryPoint Vertex %4 \"main\"\n" + " OpEntryPoint Vertex %4 \"main\" %10 %12 %16 %17\n" " OpName %4 \"main\"\n" " OpName %10 \"gl_Position\"\n" " OpName %12 \"a_position\"\n" @@ -135,9 +135,7 @@ void createTriangleAsmProgs (SourceCollections& dst) " OpDecorate %10 BuiltIn Position\n" " OpDecorate %12 Location 0\n" " OpDecorate %16 BuiltIn VertexId\n" - " OpDecorate %16 NoStaticUse\n" " OpDecorate %17 BuiltIn InstanceId\n" - " OpDecorate %17 NoStaticUse\n" "%2 = OpTypeVoid\n" "%3 = OpTypeFunction %2\n" "%7 = OpTypeFloat 32\n" @@ -163,7 +161,7 @@ void createTriangleAsmProgs (SourceCollections& dst) " OpCapability Shader\n" "%1 = OpExtInstImport \"GLSL.std.450\"\n" " OpMemoryModel Logical GLSL450\n" - " OpEntryPoint Fragment %4 \"main\"\n" + " OpEntryPoint Fragment %4 \"main\" %10\n" " OpExecutionMode %4 OriginLowerLeft\n" " OpName %4 \"main\"\n" " OpName %10 \"o_color\"\n" -- 2.7.4