OLD | NEW |
1 #import "SkSampleUIView.h" | 1 #import "SkSampleUIView.h" |
2 | 2 |
3 //#define SKWIND_CONFIG SkBitmap::kRGB_565_Config | 3 //#define SKWIND_CONFIG SkBitmap::kRGB_565_Config |
4 #define SKWIND_CONFIG SkBitmap::kARGB_8888_Config | 4 #define SKWIND_CONFIG SkBitmap::kARGB_8888_Config |
5 #define SKGL_CONFIG kEAGLColorFormatRGB565 | 5 #define SKGL_CONFIG kEAGLColorFormatRGB565 |
6 //#define SKGL_CONFIG kEAGLColorFormatRGBA8 | 6 //#define SKGL_CONFIG kEAGLColorFormatRGBA8 |
7 | 7 |
8 #define FORCE_REDRAW | 8 #define FORCE_REDRAW |
9 | 9 |
10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 case SampleWindow::kPicture_DeviceType: | 129 case SampleWindow::kPicture_DeviceType: |
130 // fallthrough | 130 // fallthrough |
131 #if SK_ANGLE | 131 #if SK_ANGLE |
132 case SampleWindow::kANGLE_DeviceType: | 132 case SampleWindow::kANGLE_DeviceType: |
133 #endif | 133 #endif |
134 break; | 134 break; |
135 #if SK_SUPPORT_GPU | 135 #if SK_SUPPORT_GPU |
136 case SampleWindow::kGPU_DeviceType: | 136 case SampleWindow::kGPU_DeviceType: |
137 case SampleWindow::kNullGPU_DeviceType: | 137 case SampleWindow::kNullGPU_DeviceType: |
138 if (fCurContext) { | 138 if (fCurContext) { |
139 SkAutoTUnref<SkDevice> device(new SkGpuDevice(fCurContext, | 139 SkAutoTUnref<SkBaseDevice> device(new SkGpuDevice(fCurContex
t, |
140 fCurRenderTarg
et)); | 140 fCurRender
Target)); |
141 return new SkCanvas(device); | 141 return new SkCanvas(device); |
142 } else { | 142 } else { |
143 return NULL; | 143 return NULL; |
144 } | 144 } |
145 break; | 145 break; |
146 #endif | 146 #endif |
147 default: | 147 default: |
148 SkASSERT(false); | 148 SkASSERT(false); |
149 return NULL; | 149 return NULL; |
150 } | 150 } |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
486 glBindRenderbuffer(GL_RENDERBUFFER, fGL.fRenderbuffer); | 486 glBindRenderbuffer(GL_RENDERBUFFER, fGL.fRenderbuffer); |
487 glGetRenderbufferParameteriv(GL_RENDERBUFFER, | 487 glGetRenderbufferParameteriv(GL_RENDERBUFFER, |
488 GL_RENDERBUFFER_STENCIL_SIZE, | 488 GL_RENDERBUFFER_STENCIL_SIZE, |
489 &info->fStencilBits); | 489 &info->fStencilBits); |
490 glGetRenderbufferParameteriv(GL_RENDERBUFFER, | 490 glGetRenderbufferParameteriv(GL_RENDERBUFFER, |
491 GL_RENDERBUFFER_SAMPLES_APPLE, | 491 GL_RENDERBUFFER_SAMPLES_APPLE, |
492 &info->fSampleCount); | 492 &info->fSampleCount); |
493 } | 493 } |
494 | 494 |
495 @end | 495 @end |
OLD | NEW |