Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1002)

Side by Side Diff: tests/GLInterfaceValidationTest.cpp

Issue 1464283002: Fix GLInterfaceValidation test after "Remove GrContextFactory::getGLContext" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "Test.h" 8 #include "Test.h"
9 9
10 // This is a GPU-backend specific test 10 // This is a GPU-backend specific test
11 #if SK_SUPPORT_GPU 11 #if SK_SUPPORT_GPU
12 12
13 #include "GrContextFactory.h" 13 #include "GrContextFactory.h"
14 14
15 DEF_GPUTEST(GLInterfaceValidation, reporter, factory) { 15 DEF_GPUTEST(GLInterfaceValidation, reporter, factory) {
16 for (int i = 0; i <= GrContextFactory::kLastGLContextType; ++i) { 16 for (int i = 0; i <= GrContextFactory::kLastGLContextType; ++i) {
17 GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContext Type)i; 17 GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContext Type)i;
18 // this forces the factory to make the context if it hasn't yet 18 // this forces the factory to make the context if it hasn't yet
19 GrContextFactory::ContextInfo* contextInfo = factory->getContextInfo(glC txType); 19 GrContextFactory::ContextInfo* contextInfo = factory->getContextInfo(glC txType);
20 SkGLContext* glCtx = contextInfo->fGLContext; 20 SkGLContext* glCtx = contextInfo ? contextInfo->fGLContext : nullptr;
21 21
22 // We're supposed to fail the NVPR context type when we the native conte xt that does not 22 // We're supposed to fail the NVPR context type when we the native conte xt that does not
23 // support the NVPR extension. 23 // support the NVPR extension.
24 if (GrContextFactory::kNVPR_GLContextType == glCtxType && 24 if (GrContextFactory::kNVPR_GLContextType == glCtxType &&
25 factory->getContextInfo(GrContextFactory::kNative_GLContextType) && 25 factory->getContextInfo(GrContextFactory::kNative_GLContextType) &&
26 !factory->getContextInfo(GrContextFactory::kNative_GLContextType)->f GLContext->gl()->hasExtension("GL_NV_path_rendering")) { 26 !factory->getContextInfo(GrContextFactory::kNative_GLContextType)->f GLContext->gl()->hasExtension("GL_NV_path_rendering")) {
27 REPORTER_ASSERT(reporter, nullptr == glCtx); 27 REPORTER_ASSERT(reporter, nullptr == glCtx);
28 continue; 28 continue;
29 } 29 }
30 30
31 REPORTER_ASSERT(reporter, glCtx); 31 REPORTER_ASSERT(reporter, glCtx);
32 if (glCtx) { 32 if (glCtx) {
33 const GrGLInterface* interface = glCtx->gl(); 33 const GrGLInterface* interface = glCtx->gl();
34 REPORTER_ASSERT(reporter, interface->validate()); 34 REPORTER_ASSERT(reporter, interface->validate());
35 } 35 }
36 } 36 }
37 } 37 }
38 38
39 #endif 39 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698