From e904c09a3a9c701e8d91f2f6ee161feda7615d90 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Thu, 17 Jul 2014 10:50:59 -0700 Subject: Fix alpha textures in NV ES3 contexts on Windows. Make unit tests iterate over all the rendering GL context types rather than using kNative. Fix the extension printing when gStartupSpew is set. R=jvanverth@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/398183002 --- tests/ImageNewShaderTest.cpp | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'tests/ImageNewShaderTest.cpp') diff --git a/tests/ImageNewShaderTest.cpp b/tests/ImageNewShaderTest.cpp index b4349e0633..f34d066f6b 100644 --- a/tests/ImageNewShaderTest.cpp +++ b/tests/ImageNewShaderTest.cpp @@ -92,17 +92,29 @@ void rasterToGpu(skiatest::Reporter* reporter, GrContext* context) { } DEF_GPUTEST(ImageNewShader_GPU, reporter, factory) { - GrContext* context = factory->get(GrContextFactory::kNative_GLContextType); + for (int i= 0; i < GrContextFactory::kGLContextTypeCnt; ++i) { + GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType) i; - // GPU -> GPU - gpuToGpu(reporter, context); + if (!GrContextFactory::IsRenderingGLContext(glCtxType)) { + continue; + } - // GPU -> RASTER - gpuToRaster(reporter, context); + GrContext* context = factory->get(glCtxType); + if (NULL == context) { + continue; + } - // RASTER -> GPU - rasterToGpu(reporter, context); + // GPU -> GPU + gpuToGpu(reporter, context); + + // GPU -> RASTER + gpuToRaster(reporter, context); + + + // RASTER -> GPU + rasterToGpu(reporter, context); + } } #endif -- cgit v1.2.3