diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
index 4bd1538..852c9d7 100644
--- a/src/gpu/effects/GrTextureDomain.cpp
+++ b/src/gpu/effects/GrTextureDomain.cpp
@@ -220,9 +220,9 @@
         };
 
         if (proxy->textureType() == GrTextureType::kRectangle) {
-            SkASSERT(values[0] >= 0.0f && values[0] <= proxy->height());
+            SkASSERT(values[0] >= 0.0f && values[0] <= proxy->width());
             SkASSERT(values[1] >= 0.0f && values[1] <= proxy->height());
-            SkASSERT(values[2] >= 0.0f && values[2] <= proxy->height());
+            SkASSERT(values[2] >= 0.0f && values[2] <= proxy->width());
             SkASSERT(values[3] >= 0.0f && values[3] <= proxy->height());
         } else {
             SkASSERT(values[0] >= 0.0f && values[0] <= 1.0f);
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 8a4359b..2fc2f1b 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -236,10 +236,14 @@
             fRectangleTextureSupport = true;
         }
     } else if (GR_IS_GR_GL_ES(standard)) {
-        // ANGLE will advertise the extension in ES2 contexts but actually using the texture in
-        // a shader requires ES3 shading language.
-        fRectangleTextureSupport = ctxInfo.hasExtension("GL_ANGLE_texture_rectangle") &&
-                                   ctxInfo.glslGeneration() >= k330_GrGLSLGeneration;
+        if (kChromium_GrGLDriver == ctxInfo.driver()) {
+            fRectangleTextureSupport = ctxInfo.hasExtension("GL_ARB_texture_rectangle");
+        } else {
+            // ANGLE will advertise the extension in ES2 contexts but actually using the texture in
+            // a shader requires ES3 shading language.
+            fRectangleTextureSupport = ctxInfo.hasExtension("GL_ANGLE_texture_rectangle") &&
+                                       ctxInfo.glslGeneration() >= k330_GrGLSLGeneration;
+        }
     } // no WebGL support
 
     // GrCaps defaults fClampToBorderSupport to true, so disable when unsupported
diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index d086627..df7c0b0 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -656,7 +656,7 @@
                         proj = false;
                         break;
                     case SpvDimRect:
-                        dim = "Rect";
+                        dim = "2DRect";
                         proj = false;
                         break;
                     case SpvDimBuffer: