| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 164 | 164 | 
| 165     virtual void windowSizeChanged(SampleWindow* win) SK_OVERRIDE { | 165     virtual void windowSizeChanged(SampleWindow* win) SK_OVERRIDE { | 
| 166 #if SK_SUPPORT_GPU | 166 #if SK_SUPPORT_GPU | 
| 167         if (NULL != fCurContext) { | 167         if (NULL != fCurContext) { | 
| 168             SkOSWindow::AttachmentInfo info; | 168             SkOSWindow::AttachmentInfo info; | 
| 169 | 169 | 
| 170             win->attach(fBackend, fMSAASampleCount, &info); | 170             win->attach(fBackend, fMSAASampleCount, &info); | 
| 171 | 171 | 
| 172             glBindFramebuffer(GL_FRAMEBUFFER, fLayerFBO); | 172             glBindFramebuffer(GL_FRAMEBUFFER, fLayerFBO); | 
| 173             GrBackendRenderTargetDesc desc; | 173             GrBackendRenderTargetDesc desc; | 
| 174             desc.fWidth = SkScalarRound(win->width()); | 174             desc.fWidth = SkScalarRoundToInt(win->width()); | 
| 175             desc.fHeight = SkScalarRound(win->height()); | 175             desc.fHeight = SkScalarRoundToInt(win->height()); | 
| 176             desc.fConfig = kSkia8888_GrPixelConfig; | 176             desc.fConfig = kSkia8888_GrPixelConfig; | 
| 177             desc.fRenderTargetHandle = fLayerFBO; | 177             desc.fRenderTargetHandle = fLayerFBO; | 
| 178             desc.fSampleCnt = info.fSampleCount; | 178             desc.fSampleCnt = info.fSampleCount; | 
| 179             desc.fStencilBits = info.fStencilBits; | 179             desc.fStencilBits = info.fStencilBits; | 
| 180 | 180 | 
| 181             SkSafeUnref(fCurRenderTarget); | 181             SkSafeUnref(fCurRenderTarget); | 
| 182             fCurRenderTarget = fCurContext->wrapBackendRenderTarget(desc); | 182             fCurRenderTarget = fCurContext->wrapBackendRenderTarget(desc); | 
| 183         } | 183         } | 
| 184 #endif | 184 #endif | 
| 185     } | 185     } | 
| (...skipping 300 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 | 
|---|