Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(430)

Side by Side Diff: experimental/iOSSampleApp/SkSampleUIView.mm

Issue 170743002: fix iOS build -- pass colortype, not config (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « experimental/iOSSampleApp/Shared/SkUIView.mm ('k') | include/views/SkWindow.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #import "SkSampleUIView.h" 1 #import "SkSampleUIView.h"
2 2
3 //#define SKWIND_CONFIG SkBitmap::kRGB_565_Config
4 #define SKWIND_CONFIG SkBitmap::kARGB_8888_Config
5 #define SKGL_CONFIG kEAGLColorFormatRGB565 3 #define SKGL_CONFIG kEAGLColorFormatRGB565
6 //#define SKGL_CONFIG kEAGLColorFormatRGBA8 4 //#define SKGL_CONFIG kEAGLColorFormatRGBA8
7 5
8 #define FORCE_REDRAW 6 #define FORCE_REDRAW
9 7
10 #include "SkCanvas.h" 8 #include "SkCanvas.h"
11 #include "SkCGUtils.h" 9 #include "SkCGUtils.h"
12 #include "SampleApp.h" 10 #include "SampleApp.h"
13 11
14 #if SK_SUPPORT_GPU 12 #if SK_SUPPORT_GPU
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 [NSNull null], @"bounds", 329 [NSNull null], @"bounds",
332 nil]; 330 nil];
333 fGLLayer.actions = newActions; 331 fGLLayer.actions = newActions;
334 fRasterLayer.actions = newActions; 332 fRasterLayer.actions = newActions;
335 [newActions release]; 333 [newActions release];
336 334
337 fDevManager = new SkiOSDeviceManager(fGL.fFramebuffer); 335 fDevManager = new SkiOSDeviceManager(fGL.fFramebuffer);
338 static char* kDummyArgv = const_cast<char*>("dummyExecutableName"); 336 static char* kDummyArgv = const_cast<char*>("dummyExecutableName");
339 fWind = new SampleWindow(self, 1, &kDummyArgv, fDevManager); 337 fWind = new SampleWindow(self, 1, &kDummyArgv, fDevManager);
340 338
341 fWind->resize(self.frame.size.width, self.frame.size.height, SKWIND_CONF IG); 339 fWind->resize(self.frame.size.width, self.frame.size.height,
340 kPMColor_SkColorType);
342 } 341 }
343 return self; 342 return self;
344 } 343 }
345 344
346 - (void)dealloc { 345 - (void)dealloc {
347 delete fDevManager; 346 delete fDevManager;
348 delete fFPSState; 347 delete fFPSState;
349 self.fRasterLayer = nil; 348 self.fRasterLayer = nil;
350 self.fGLLayer = nil; 349 self.fGLLayer = nil;
351 [fGL.fContext release]; 350 [fGL.fContext release];
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 glBindRenderbuffer(GL_RENDERBUFFER, fGL.fRenderbuffer); 485 glBindRenderbuffer(GL_RENDERBUFFER, fGL.fRenderbuffer);
487 glGetRenderbufferParameteriv(GL_RENDERBUFFER, 486 glGetRenderbufferParameteriv(GL_RENDERBUFFER,
488 GL_RENDERBUFFER_STENCIL_SIZE, 487 GL_RENDERBUFFER_STENCIL_SIZE,
489 &info->fStencilBits); 488 &info->fStencilBits);
490 glGetRenderbufferParameteriv(GL_RENDERBUFFER, 489 glGetRenderbufferParameteriv(GL_RENDERBUFFER,
491 GL_RENDERBUFFER_SAMPLES_APPLE, 490 GL_RENDERBUFFER_SAMPLES_APPLE,
492 &info->fSampleCount); 491 &info->fSampleCount);
493 } 492 }
494 493
495 @end 494 @end
OLDNEW
« no previous file with comments | « experimental/iOSSampleApp/Shared/SkUIView.mm ('k') | include/views/SkWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698