rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags

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
@@ skipping 21 matching lines @@
         controlPixelData[i] = FLT_MIN;
         controlPixelData[i + 1] = FLT_MAX;
         controlPixelData[i + 2] = FLT_EPSILON;
         controlPixelData[i + 3] = kMaxIntegerRepresentableInSPFloatingPoint;
     }
 
     for (int origin = 0; origin < 2; ++origin) {
         int glCtxTypeCnt = 1;
         glCtxTypeCnt = GrContextFactory::kGLContextTypeCnt;
         for (int glCtxType = 0; glCtxType < glCtxTypeCnt; ++glCtxType) {
-            GrTextureDesc desc;
-            desc.fFlags = kRenderTarget_GrTextureFlagBit;
+            GrSurfaceDesc desc;
+            desc.fFlags = kRenderTarget_GrSurfaceFlag;
             desc.fWidth = DEV_W;
             desc.fHeight = DEV_H;
             desc.fConfig = kRGBA_float_GrPixelConfig;
             desc.fOrigin = 0 == origin ?
                 kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
 
             GrContext* context = NULL;
             GrContextFactory::GLContextType type =
                     static_cast<GrContextFactory::GLContextType>(glCtxType);
             if (!GrContextFactory::IsRenderingGLContext(type)) {
@@ skipping 17 matching lines @@
             fpTexture->writePixels(0, 0, DEV_W, DEV_H, desc.fConfig, controlPixelData, 0);
             fpTexture->readPixels(0, 0, DEV_W, DEV_H, desc.fConfig, readBuffer, 0);
             for (int j = 0; j < FP_CONTROL_ARRAY_SIZE; ++j) {
                 REPORTER_ASSERT(reporter, readBuffer[j] == controlPixelData[j]);
             }
         }
     }
 }
 
 #endif