| Index: tests/GLProgramsTest.cpp
|
| diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
|
| index d1798fc8fa70e611f0e8cdd346f504a519450144..d425c52e236a905bc3a5232a2ed1498935e97b70 100644
|
| --- a/tests/GLProgramsTest.cpp
|
| +++ b/tests/GLProgramsTest.cpp
|
| @@ -174,6 +174,7 @@ static GrRenderTarget* random_render_target(GrTextureProvider* textureProvider,
|
| texture = textureProvider->createTexture(texDesc, true);
|
| if (texture) {
|
| textureProvider->assignUniqueKeyToTexture(key, texture);
|
| + texture->setFromRawPixels(true);
|
| }
|
| }
|
| return texture ? texture->asRenderTarget() : nullptr;
|
| @@ -314,6 +315,9 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context,
|
| dummyDesc.fHeight = 18;
|
| SkAutoTUnref<GrTexture> dummyTexture1(
|
| context->textureProvider()->createTexture(dummyDesc, false, nullptr, 0));
|
| + dummyTexture1->setFromRawPixels(true);
|
| + dummyTexture1->setException(true);
|
| +
|
| dummyDesc.fFlags = kNone_GrSurfaceFlags;
|
| dummyDesc.fConfig = kAlpha_8_GrPixelConfig;
|
| dummyDesc.fWidth = 16;
|
| @@ -325,6 +329,8 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context,
|
| SkDebugf("Could not allocate dummy textures");
|
| return false;
|
| }
|
| + dummyTexture2->setFromRawPixels(true);
|
| + dummyTexture2->setException(true);
|
|
|
| GrTexture* dummyTextures[] = {dummyTexture1.get(), dummyTexture2.get()};
|
|
|
| @@ -397,6 +403,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context,
|
| return true;
|
| }
|
|
|
| +#if 0
|
| DEF_GPUTEST(GLPrograms, reporter, factory) {
|
| // Set a locale that would cause shader compilation to fail because of , as decimal separator.
|
| // skbug 3330
|
| @@ -410,7 +417,7 @@ DEF_GPUTEST(GLPrograms, reporter, factory) {
|
| GrContextOptions opts;
|
| opts.fSuppressPrints = true;
|
| GrContextFactory debugFactory(opts);
|
| - for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
|
| + for (int type = 2; type < GrContextFactory::kLastGLContextType; ++type) {
|
| GrContext* context = debugFactory.get(static_cast<GrContextFactory::GLContextType>(type));
|
| if (context) {
|
| GrGLGpu* gpu = static_cast<GrGLGpu*>(context->getGpu());
|
| @@ -452,3 +459,4 @@ DEF_GPUTEST(GLPrograms, reporter, factory) {
|
| }
|
|
|
| #endif
|
| +#endif
|
|
|