AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Make glPatchParameteri required when tessellation is supported"

Browse Source 
This reverts commit 7d7cd2b178.

Reason for revert: breaking chrome roll

Original change's description:
> Make glPatchParameteri required when tessellation is supported
> 
> Chrome started wrangling this entrypoint in the following CL:
> 
> https://chromium-review.googlesource.com/c/chromium/src/+/2253344
> 
> Change-Id: Ief4dfb1ddca8d86e0c09dfdc443e01830cb4de20
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298405
> Reviewed-by: Kevin Lubick <kjlubick@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=kjlubick@google.com,csmartdalton@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I569f2a16de156c5b2e819cb2a45ea942ca2cdec7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298819
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2020-06-24 20:09:12 +00:00 committed by Michael Ludwig
parent d8f4f42b03
commit 632db1c742
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpu/gl/GrGLInterfaceAutogen.cpp
View File

@ -226,9 +226,7 @@ bool GrGLInterface::validate() const {
(GR_IS_GR_GL_ES(fStandard) && (
(glVer >= GR_GL_VER(3,2)) ||
fExtensions.has("GL_OES_tessellation_shader")))) {
if (!fFunctions.fPatchParameteri) {
RETURN_FALSE_INTERFACE;
}
// all functions were marked optional or test_only
}
if ((GR_IS_GR_GL(fStandard) && (

4
tools/gpu/gl/interface/interface.json5
View File

@ -103,6 +103,10 @@
"functions": [
"PatchParameteri",
],
// FIXME: Make this method non-optional once Chrome starts adding it to the interface.
"optional": [
"PatchParameteri",
]
},
{