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

Attempt to fix AMD ANGLE bots.

Browse Source 
Makes the second context used for image tests be of the same type as it was before https://skia.googlesource.com/skia/+/6405e71279e99731f89db69325c6763ec62a98e1

Change-Id: Id861214e5bea2b874ba5eae4489a982340c2f101
Reviewed-on: https://skia-review.googlesource.com/9912
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2017-03-20 17:08:43 -04:00 committed by Skia Commit-Bot
parent bbb24f2ab8
commit 107524c2a2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/ImageTest.cpp
View File

@ -445,11 +445,11 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(c, reporter, ctxInfo) {
GrContextFactory::ContextType pick_second_context_type(const sk_gpu_test::ContextInfo& info) {
switch (info.backend()) {
case kOpenGL_GrBackend:
if (info.glContext()->gl()->fStandard == kGLES_GrGLStandard) {
return GrContextFactory::kGLES_ContextType;
} else {
return GrContextFactory::kGL_ContextType;
}
#if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_UNIX) || defined (SK_BUILD_FOR_MAC)
return GrContextFactory::kGL_ContextType;
#else
return GrContextFactory::kGLES_ContextType;
#endif
case kVulkan_GrBackend:
return GrContextFactory::kVulkan_ContextType;
}
@ -928,7 +928,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredTextureImage, reporter, ctxInfo) {
testContext->makeCurrent();
return otherContextImage;
}, {{SkMatrix::I(), kNone_SkFilterQuality, 0}},
kNone_SkFilterQuality, 1, false },
kNone_SkFilterQuality, 1, false },
// Create an image that is too large to upload.
{ createLarge, {{SkMatrix::I(), kNone_SkFilterQuality, 0}},
kNone_SkFilterQuality, 1, false },