| OLD | NEW |
| 1 #import "SkSampleUIView.h" | 1 #import "SkSampleUIView.h" |
| 2 | 2 |
| 3 #define SKGL_CONFIG kEAGLColorFormatRGB565 | 3 #define SKGL_CONFIG kEAGLColorFormatRGB565 |
| 4 //#define SKGL_CONFIG kEAGLColorFormatRGBA8 | 4 //#define SKGL_CONFIG kEAGLColorFormatRGBA8 |
| 5 | 5 |
| 6 #define FORCE_REDRAW | 6 #define FORCE_REDRAW |
| 7 | 7 |
| 8 #include "SkCanvas.h" | 8 #include "SkCanvas.h" |
| 9 #include "SkCGUtils.h" | 9 #include "SkCGUtils.h" |
| 10 #include "SampleApp.h" | 10 #include "SampleApp.h" |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 nil]; | 330 nil]; |
| 331 fGLLayer.actions = newActions; | 331 fGLLayer.actions = newActions; |
| 332 fRasterLayer.actions = newActions; | 332 fRasterLayer.actions = newActions; |
| 333 [newActions release]; | 333 [newActions release]; |
| 334 | 334 |
| 335 fDevManager = new SkiOSDeviceManager(fGL.fFramebuffer); | 335 fDevManager = new SkiOSDeviceManager(fGL.fFramebuffer); |
| 336 static char* kDummyArgv = const_cast<char*>("dummyExecutableName"); | 336 static char* kDummyArgv = const_cast<char*>("dummyExecutableName"); |
| 337 fWind = new SampleWindow(self, 1, &kDummyArgv, fDevManager); | 337 fWind = new SampleWindow(self, 1, &kDummyArgv, fDevManager); |
| 338 | 338 |
| 339 fWind->resize(self.frame.size.width, self.frame.size.height, | 339 fWind->resize(self.frame.size.width, self.frame.size.height, |
| 340 kN32_SkColorType); | 340 kPMColor_SkColorType); |
| 341 } | 341 } |
| 342 return self; | 342 return self; |
| 343 } | 343 } |
| 344 | 344 |
| 345 - (void)dealloc { | 345 - (void)dealloc { |
| 346 delete fDevManager; | 346 delete fDevManager; |
| 347 delete fFPSState; | 347 delete fFPSState; |
| 348 self.fRasterLayer = nil; | 348 self.fRasterLayer = nil; |
| 349 self.fGLLayer = nil; | 349 self.fGLLayer = nil; |
| 350 [fGL.fContext release]; | 350 [fGL.fContext release]; |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 glBindRenderbuffer(GL_RENDERBUFFER, fGL.fRenderbuffer); | 485 glBindRenderbuffer(GL_RENDERBUFFER, fGL.fRenderbuffer); |
| 486 glGetRenderbufferParameteriv(GL_RENDERBUFFER, | 486 glGetRenderbufferParameteriv(GL_RENDERBUFFER, |
| 487 GL_RENDERBUFFER_STENCIL_SIZE, | 487 GL_RENDERBUFFER_STENCIL_SIZE, |
| 488 &info->fStencilBits); | 488 &info->fStencilBits); |
| 489 glGetRenderbufferParameteriv(GL_RENDERBUFFER, | 489 glGetRenderbufferParameteriv(GL_RENDERBUFFER, |
| 490 GL_RENDERBUFFER_SAMPLES_APPLE, | 490 GL_RENDERBUFFER_SAMPLES_APPLE, |
| 491 &info->fSampleCount); | 491 &info->fSampleCount); |
| 492 } | 492 } |
| 493 | 493 |
| 494 @end | 494 @end |
| OLD | NEW |