Reland "gpu: Update GrGLCaps usage of fTextureRectangle with chromium."
This reverts commit f01008997555274463e3616c5b3898d4c97bdfa9.
Reason for revert: Fixes landed in chromium (see crbug.com/998038).
Original change's description:
> Revert "gpu: Update GrGLCaps usage of fTextureRectangle with chromium."
>
> This reverts commit c43ab22a8caf94c93cc5d5547136f2f2d4f89e69.
>
> Reason for revert: crbug.com/998038
>
> Original change's description:
> > gpu: Update GrGLCaps usage of fTextureRectangle with chromium.
> >
> > R=​bsalomon@google.com
> >
> > Bug:900706
> > Change-Id: I0ca0062f12f905c47e9f096acf675b93f131e390
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/234990
> > Commit-Queue: Khushal Sagar <khushalsagar@chromium.org>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=bsalomon@google.com,khushalsagar@chromium.org
>
> Change-Id: Iebdaed117229987f23ec1b1ad48ec6719972ad95
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 900706
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/237431
> Reviewed-by: Michael Ludwig <michaelludwig@google.com>
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>
TBR=bsalomon@google.com,khushalsagar@chromium.org,michaelludwig@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 900706, 998038
Change-Id: I959fbc97c2424ebb9d4e8fa570d71ff941194daa
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/240824
Reviewed-by: Khushal Sagar <khushalsagar@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Khushal Sagar <khushalsagar@chromium.org>
diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
index 4bd15389..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:
