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

Patch TextureBindingsResetTest to match CommandBuffer expectations

Browse Source 
Bug: skia:10412
Bug: skia:12437
Change-Id: I93077bbd2ed40252966305df1b93ceb813218828
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/446181
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2021-09-09 10:36:46 -04:00 committed by SkCQ
parent 19a7b9749c
commit 171ff2fdd5
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -45,7 +45,7 @@ deps = {
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c876c8f87101c5a75f6014b0f832499afeb65b73",
"../src": {
"url": "https://chromium.googlesource.com/chromium/src.git@aa692f23db429726339eacfc55de2838056ca05a",
"url": "https://chromium.googlesource.com/chromium/src.git@a2b0fa8ea08111655f2f8465530220d892b9cf08",
"condition": "checkout_chromium",
},

4
infra/bots/gen_tasks_logic/dm_flags.go
View File

@ -348,6 +348,10 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
if b.extraConfig("CommandBuffer") {
// skbug.com/10412
skip("_ test _ GLBackendAllocationTest")
skip("_ test _ InitialTextureClear")
// skbug.com/12437
skip("_ test _ GrDDLImage_MakeSubset")
skip("_ test _ GrContext_oomed")
}
// skbug.com/9043 - these devices render this test incorrectly

8
infra/bots/tasks.json
View File

File diff suppressed because one or more lines are too long

8
tests/TextureBindingsResetTest.cpp
View File

@ -36,7 +36,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(TextureBindingsResetTest, reporter, ctxInf
if ((supportRectangle = glGpu->glCaps().rectangleTextureSupport())) {
targets.push_back({GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_BINDING_RECTANGLE});
}
GrGLint numUnits;
GrGLint numUnits = 0;
GL(GetIntegerv(GR_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &numUnits));
SkTDArray<GrGLuint> claimedIDs;
claimedIDs.setCount(numUnits * targets.count());
@ -56,9 +56,9 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(TextureBindingsResetTest, reporter, ctxInf
for (int u = 0; u < numUnits; ++u) {
GL(ActiveTexture(GR_GL_TEXTURE0 + u));
for (auto target : targets) {
GrGLuint boundID = ~0;
GL(GetIntegerv(target.fQuery, reinterpret_cast<GrGLint*>(&boundID)));
if (boundID != claimedIDs[i] && boundID != 0) {
GrGLint boundID = -1;
GL(GetIntegerv(target.fQuery, &boundID));
if (boundID != (int) claimedIDs[i] && boundID != 0) {
ERRORF(reporter, "Unit %d, target 0x%04x has ID %d bound. Expected %d or 0.", u,
target.fName, boundID, claimedIDs[i]);
return;