commit 8655b62207a5b2e16ad0ba2247bf880fcf7901f8
author dan sinclair <dj2@everburning.com> Sat Nov 07 02:03:45 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Sat Nov 07 02:03:45 2020 +0000
tree 8999583c1d2d6dfff8ac1b42f1b578af4328c699
parent 2c0cd311b891e209a0613b98c236bf4deb90edb4

Switch to GLSL450 memory model.

This CL updates Tint to use the GLSL450 memory model.

Bug: tint:63
Change-Id: Ia32851fbf8ee71233977a00386af5a91cb4b4b58
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/31601
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: David Neto <dneto@google.com>

src/writer/spirv/builder.cc

diff --git a/src/writer/spirv/builder.cc b/src/writer/spirv/builder.cc
index 1903704..054645f 100644
--- a/src/writer/spirv/builder.cc
+++ b/src/writer/spirv/builder.cc
@@ -277,14 +277,9 @@
 bool Builder::Build() {
   push_capability(SpvCapabilityShader);
 
-  // TODO(dneto): Stop using the Vulkan memory model. crbug.com/tint/63
-  push_capability(SpvCapabilityVulkanMemoryModel);
-  push_extension(spv::Op::OpExtension,
-                 {Operand::String("SPV_KHR_vulkan_memory_model")});
-
   push_memory_model(spv::Op::OpMemoryModel,
                     {Operand::Int(SpvAddressingModelLogical),
-                     Operand::Int(SpvMemoryModelVulkanKHR)});
+                     Operand::Int(SpvMemoryModelGLSL450)});
 
   for (const auto& var : mod_->global_variables()) {
     if (!GenerateGlobalVariable(var.get())) {

src/writer/spirv/builder_function_test.cc

diff --git a/src/writer/spirv/builder_function_test.cc b/src/writer/spirv/builder_function_test.cc
index ba4ad59..9ecc5f0 100644
--- a/src/writer/spirv/builder_function_test.cc
+++ b/src/writer/spirv/builder_function_test.cc
@@ -260,9 +260,7 @@
   Builder b(&mod);
   ASSERT_TRUE(b.Build());
   EXPECT_EQ(DumpBuilder(b), R"(OpCapability Shader
-OpCapability VulkanMemoryModel
-OpExtension "SPV_KHR_vulkan_memory_model"
-OpMemoryModel Logical Vulkan
+OpMemoryModel Logical GLSL450
 OpEntryPoint GLCompute %7 "a"
 OpEntryPoint GLCompute %17 "b"
 OpExecutionMode %7 LocalSize 1 1 1

src/writer/spirv/builder_test.cc

diff --git a/src/writer/spirv/builder_test.cc b/src/writer/spirv/builder_test.cc
index 1e22d5f..4df6910 100644
--- a/src/writer/spirv/builder_test.cc
+++ b/src/writer/spirv/builder_test.cc
@@ -34,9 +34,7 @@
   Builder b(&m);
   ASSERT_TRUE(b.Build());
   EXPECT_EQ(DumpBuilder(b), R"(OpCapability Shader
-OpCapability VulkanMemoryModel
-OpExtension "SPV_KHR_vulkan_memory_model"
-OpMemoryModel Logical Vulkan
+OpMemoryModel Logical GLSL450
 )");
 }