Simplify random_draw_context used by GLProgramsTest

tests/GLProgramsTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
 #include "SkTypes.h"
@@ skipping 136 matching lines @@
 static const int kRenderTargetHeight = 1;
 static const int kRenderTargetWidth = 1;
 
 static sk_sp<GrDrawContext> random_draw_context(GrContext* context,
                                                 SkRandom* random,
                                                 const GrCaps* caps) {
     GrSurfaceOrigin origin = random->nextBool() ? kTopLeft_GrSurfaceOrigin
                                                 : kBottomLeft_GrSurfaceOrigin;
     int sampleCnt = random->nextBool() ? SkTMin(4, caps->maxSampleCount()) : 0;
 
-    GrUniqueKey key;

[bsalomon, 2016/07/19 15:04:29]

I presume this keying was preserved from pre-DC days in order to avoid texture
creation churn. However, just creating the DC directly all the time falls back
on the scratch texture mechanism and on my machine runs significantly faster.

-    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-    GrUniqueKey::Builder builder(&key, kDomain, 2);
-    builder[0] = origin;
-    builder[1] = sampleCnt;
-    builder.finish();
-
-    sk_sp<GrTexture> texture(context->textureProvider()->findAndRefTextureByUniqueKey(key));
-    if (texture) {
-        sk_sp<GrRenderTarget> rt(sk_ref_sp(texture->asRenderTarget()));
-        return context->drawContext(std::move(rt));
-    }
-
     sk_sp<GrDrawContext> drawContext(context->newDrawContext(SkBackingFit::kExact,
                                                              kRenderTargetWidth,
                                                              kRenderTargetHeight,
                                                              kRGBA_8888_GrPixelConfig,
                                                              sampleCnt,
                                                              origin));
-    if (!drawContext) {
-        return nullptr;
-    }
-
-    // TODO: need a real way to do this via the drawContext
-    texture = drawContext->asTexture();
-    context->textureProvider()->assignUniqueKeyToTexture(key, texture.get());
-
     return drawContext;
 }
 
 static void set_random_xpf(GrPaint* paint, GrProcessorTestData* d) {
     sk_sp<GrXPFactory> xpf(GrProcessorTestFactory<GrXPFactory>::Make(d));
     SkASSERT(xpf);
     paint->setXPFactory(std::move(xpf));
 }
 
 static sk_sp<GrFragmentProcessor> create_random_proc_tree(GrProcessorTestData* d,
@@ skipping 267 matching lines @@
     GrContextOptions opts;
     opts.fSuppressPrints = true;
     sk_gpu_test::GrContextFactory debugFactory(opts);
     skiatest::RunWithGPUTestContexts(test_glprograms_native, &is_native_gl_context_type,
                                      reporter, &debugFactory);
     skiatest::RunWithGPUTestContexts(test_glprograms_other_contexts,
                                      &is_other_rendering_gl_context_type, reporter, &debugFactory);
 }
 
 #endif