fix cycle_colortypes so we can test 565

samplecode/SampleApp.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.
  */
 #include "SampleApp.h"
 
 #include "SkData.h"
 #include "SkCanvas.h"
@@ skipping 60 matching lines @@
 #ifdef  PIPE_FILE
 #define FILE_PATH "/path/to/drawing.data"
 #endif
 
 #define PIPE_NETx
 #ifdef  PIPE_NET
 #include "SkSockets.h"
 SkTCPServer gServer;
 #endif
 
-#define USE_ARROWS_FOR_ZOOM true
+#define USE_ARROWS_FOR_ZOOM false
 
 #if SK_ANGLE
 //#define DEFAULT_TO_ANGLE 1
 #else
 #define DEFAULT_TO_GPU 0 // if 1 default rendering is on GPU
 #endif
 
 #define ANIMATING_EVENTTYPE "nextSample"
 #define ANIMATING_DELAY     250
 
@@ skipping 198 matching lines @@
 #if SK_SUPPORT_GPU
         if (fCurContext) {
             // in case we have queued drawing calls
             fCurContext->flush();
 
             if (!IsGpuDeviceType(dType)) {
                 // need to send the raster bits to the (gpu) window
                 fCurContext->setRenderTarget(fCurRenderTarget);
                 const SkBitmap& bm = win->getBitmap();
                 fCurRenderTarget->writePixels(0, 0, bm.width(), bm.height(),
-                                             kSkia8888_GrPixelConfig,
+                                             SkImageInfo2GrPixelConfig(bm.colorType(),
+                                                                       bm.alphaType()),
                                              bm.getPixels(),
                                              bm.rowBytes());
             }
         }
 #endif
 
         win->present();
     }
 
     virtual void windowSizeChanged(SampleWindow* win) {
@@ skipping 1228 matching lines @@
     }
 }
 
 void SampleWindow::afterChild(SkView* child, SkCanvas* canvas) {
     canvas->setDrawFilter(NULL);
 }
 
 static SkColorType gColorTypeCycle[] = {
     kUnknown_SkColorType,           // none -> none
     kUnknown_SkColorType,           // a8 -> none
-    kARGB_4444_SkColorType,         // 565 -> 4444
+    kN32_SkColorType,               // 565 -> 8888
     kN32_SkColorType,               // 4444 -> 8888
     kRGB_565_SkColorType,           // 8888 -> 565
     kRGB_565_SkColorType,           // 8888 -> 565
     kUnknown_SkColorType,           // index8 -> none
 };
 
 static SkColorType cycle_colortypes(SkColorType c) {
     return gColorTypeCycle[c];
 }
 
@@ skipping 997 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }