commit 034f78a46675faeb97e9ec0b0ae575b04e98ee04
author Brian Osman <brianosman@google.com> Fri Oct 02 15:01:22 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 02 20:36:04 2020 +0000
tree e2867c0b8f71bdbbc83e91307667d3ccb615a5d1
parent e8c2608ec6d905d400268815eb19620f7beaee35

Detect non-2D textures in MetalCodeGenerator and fail cleanly

We were letting this get further, then asserting.

Bug: skia:10797
Change-Id: Iff6fe43aa32450b5a517c94773031d593f1f62a2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/321794
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/SkSLMetalCodeGenerator.cpp

diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index 97e277b..6f44c0a 100644
--- a/src/sksl/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -958,8 +958,14 @@
                         if (var.fVar->fModifiers.fLayout.fBinding < 0) {
                             fErrors.error(decls.fOffset,
                                           "Metal samplers must have 'layout(binding=...)'");
+                            return;
                         }
-                        this->write(", texture2d<float> "); // FIXME - support other texture types
+                        if (var.fVar->type().dimensions() != SpvDim2D) {
+                            // TODO: Support other texture types (skbug.com/10797)
+                            fErrors.error(decls.fOffset, "Unsupported texture dimensions");
+                            return;
+                        }
+                        this->write(", texture2d<float> ");
                         this->writeName(var.fVar->fName);
                         this->write("[[texture(");
                         this->write(to_string(var.fVar->fModifiers.fLayout.fBinding));