Skip to content

Commit a640745

Browse files
csmartdalton86heathmill
authored andcommitted
Disable QCOM_tiled_rendering while we wait for test devices
There are devices that advertise this extension but don't actually provide the GL entrypoints. This is causing live crashes. Bug: flutter:47164 Bug: flutter:47804 Change-Id: Idded47e8dbd4462463ad91a62b06b0df3245f0c1 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263809 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com> (cherry picked from commit 0a1923e) Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264641
1 parent c3ff97a commit a640745

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

src/gpu/gl/GrGLCaps.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,9 +681,11 @@ void GrGLCaps::init(const GrContextOptions& contextOptions,
681681
fSamplerObjectSupport = version >= GR_GL_VER(2,0);
682682
}
683683

684-
if (GR_IS_GR_GL_ES(standard)) {
685-
fTiledRenderingSupport = ctxInfo.hasExtension("GL_QCOM_tiled_rendering");
686-
}
684+
// https://github.com/flutter/flutter/issues/47164
685+
// https://github.com/flutter/flutter/issues/47804
686+
// if (GR_IS_GR_GL_ES(standard)) {
687+
// fTiledRenderingSupport = ctxInfo.hasExtension("GL_QCOM_tiled_rendering");
688+
// }
687689

688690
FormatWorkarounds formatWorkarounds;
689691

src/gpu/gl/GrGLInterfaceAutogen.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,7 @@ bool GrGLInterface::validate() const {
335335

336336
if ((GR_IS_GR_GL_ES(fStandard) && (
337337
fExtensions.has("GL_QCOM_tiled_rendering")))) {
338-
if (!fFunctions.fEndTiling ||
339-
!fFunctions.fStartTiling) {
340-
RETURN_FALSE_INTERFACE;
341-
}
338+
// all functions were marked optional or test_only
342339
}
343340

344341
if ((GR_IS_GR_GL(fStandard) && (

tools/gpu/gl/interface/interface.json5

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@
271271

272272
"functions": [
273273
"StartTiling", "EndTiling",
274+
],
275+
// https://github.com/flutter/flutter/issues/47164
276+
// https://github.com/flutter/flutter/issues/47804
277+
"optional": [
278+
"StartTiling", "EndTiling",
274279
]
275280
},
276281

0 commit comments

Comments
 (0)