Pull cache out of GrContext

tests/FloatingPointTextureTest.cpp

 /*
  * Copyright 2014 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 straightforward test of floating point textures, which are
  * supported on some platforms.  As of right now, this test only supports
  * 32 bit floating point textures, and indeed floating point test values
  * have been selected to require 32 bits of precision and full IEEE conformance
  */
-#if SK_SUPPORT_GPU
+
 #include <float.h>
 #include "Test.h"
+#if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrTexture.h"
 #include "GrContextFactory.h"
 
 #include "SkGpuDevice.h"
 #include "SkHalf.h"
 
 static const int DEV_W = 100, DEV_H = 100;
 static const int FP_CONTROL_ARRAY_SIZE = DEV_W * DEV_H * 4/*RGBA*/;
 static const float kMaxIntegerRepresentableInSPFloatingPoint = 16777216;  // 2 ^ 24
@@ skipping 25 matching lines @@
             GrContextFactory::GLContextType type =
                 static_cast<GrContextFactory::GLContextType>(glCtxType);
             if (!GrContextFactory::IsRenderingGLContext(type)) {
                 continue;
             }
             GrContext* context = factory->get(type);
             if (NULL == context){
                 continue;
             }
 
-            SkAutoTUnref<GrTexture> fpTexture(context->createTexture(desc, false,
-                                                                     controlPixelData.begin(), 0));
+            SkAutoTUnref<GrTexture> fpTexture(context->textureProvider()->createTexture(
+                desc, false, controlPixelData.begin(), 0));
             // Floating point textures are NOT supported everywhere
             if (NULL == fpTexture) {
                 continue;
             }
             fpTexture->readPixels(0, 0, DEV_W, DEV_H, desc.fConfig, readBuffer.begin(), 0);
             REPORTER_ASSERT(reporter,
                     0 == memcmp(readBuffer.begin(), controlPixelData.begin(), readBuffer.bytes()));
         }
     }
 }
@@ skipping 25 matching lines @@
             GrContextFactory::GLContextType type =
                 static_cast<GrContextFactory::GLContextType>(glCtxType);
             if (!GrContextFactory::IsRenderingGLContext(type)) {
                 continue;
             }
             GrContext* context = factory->get(type);
             if (NULL == context){
                 continue;
             }
 
-            SkAutoTUnref<GrTexture> fpTexture(context->createTexture(desc, false,
-                                                                     controlPixelData.begin(), 0));
+            SkAutoTUnref<GrTexture> fpTexture(context->textureProvider()->createTexture(
+                desc, false, controlPixelData.begin(), 0));
             // 16-bit floating point textures are NOT supported everywhere
             if (NULL == fpTexture) {
                 continue;
             }
             fpTexture->readPixels(0, 0, DEV_W, DEV_H, desc.fConfig, readBuffer.begin(), 0);
             REPORTER_ASSERT(reporter,
                     0 == memcmp(readBuffer.begin(), controlPixelData.begin(), readBuffer.bytes()));
         }
     }
 }
 
 #endif