Index: dm/DM.cpp |
diff --git a/dm/DM.cpp b/dm/DM.cpp |
index 6549af5a0fdb3ddc606191d4c736238fbf1a7963..7497161369b42788dac022dc8f9eedb534801135 100644 |
--- a/dm/DM.cpp |
+++ b/dm/DM.cpp |
@@ -609,8 +609,8 @@ |
SINK("gpudft", GPUSink, Gr::kNative_GLContextType, api, 0, true, FLAGS_gpu_threading); |
SINK("msaa4", GPUSink, Gr::kNative_GLContextType, api, 4, false, FLAGS_gpu_threading); |
SINK("msaa16", GPUSink, Gr::kNative_GLContextType, api, 16, false, FLAGS_gpu_threading); |
- SINK("nvprmsaa4", GPUSink, Gr::kNative_GLContextType, Gr::kEnableNVPR_GLContextOptions, api, 4, true, FLAGS_gpu_threading); |
- SINK("nvprmsaa16", GPUSink, Gr::kNative_GLContextType, Gr::kEnableNVPR_GLContextOptions, api, 16, true, FLAGS_gpu_threading); |
+ SINK("nvprmsaa4", GPUSink, Gr::kNVPR_GLContextType, api, 4, true, FLAGS_gpu_threading); |
+ SINK("nvprmsaa16", GPUSink, Gr::kNVPR_GLContextType, api, 16, true, FLAGS_gpu_threading); |
#if SK_ANGLE |
SINK("angle", GPUSink, Gr::kANGLE_GLContextType, api, 0, false, FLAGS_gpu_threading); |
SINK("angle-gl", GPUSink, Gr::kANGLE_GL_GLContextType, api, 0, false, FLAGS_gpu_threading); |
@@ -1171,7 +1171,6 @@ |
void RunWithGPUTestContexts(T test, GPUTestContexts testContexts, Reporter* reporter, |
GrContextFactory* factory) { |
#if SK_SUPPORT_GPU |
- const GrGLStandard api = get_gpu_api(); |
for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) { |
GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType) i; |
int contextSelector = kNone_GPUTestContexts; |
@@ -1187,12 +1186,7 @@ |
if ((testContexts & contextSelector) == 0) { |
continue; |
} |
- if (GrContextFactory::ContextInfo* context = factory->getContextInfo(glCtxType, api)) { |
- call_test(test, reporter, context); |
- } |
- if (GrContextFactory::ContextInfo* context = |
- factory->getContextInfo(glCtxType, api, |
- GrContextFactory::kEnableNVPR_GLContextOptions)) { |
+ if (GrContextFactory::ContextInfo* context = factory->getContextInfo(glCtxType)) { |
call_test(test, reporter, context); |
} |
} |