diff options
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleApp.cpp | 23 | ||||
-rw-r--r-- | samplecode/SampleApp.h | 4 |
2 files changed, 9 insertions, 18 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index ad0bdaaec2..92c9e6c984 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -139,8 +139,7 @@ public: : fCurContext(NULL) , fCurIntf(NULL) , fCurRenderTarget(NULL) - , fBackend(kNone_BackEndType) - , fMSAASampleCount(0) { + , fBackend(kNone_BackEndType) { } virtual ~DefaultDeviceManager() { @@ -149,7 +148,7 @@ public: SkSafeUnref(fCurRenderTarget); } - virtual void setUpBackend(SampleWindow* win, int msaaSampleCount) { + virtual void setUpBackend(SampleWindow* win) { SkASSERT(kNone_BackEndType == fBackend); fBackend = kNone_BackEndType; @@ -176,12 +175,11 @@ public: break; } - bool result = win->attach(fBackend, msaaSampleCount); + bool result = win->attach(fBackend); if (!result) { SkDebugf("Failed to initialize GL"); return; } - fMSAASampleCount = msaaSampleCount; SkASSERT(NULL == fCurIntf); switch (win->getDeviceType()) { @@ -289,7 +287,7 @@ public: virtual void windowSizeChanged(SampleWindow* win) { if (fCurContext) { - win->attach(fBackend, fMSAASampleCount); + win->attach(fBackend); GrPlatformRenderTargetDesc desc; desc.fWidth = SkScalarRound(win->width()); @@ -315,7 +313,6 @@ private: GrRenderTarget* fCurRenderTarget; SkOSWindow::SkBackEndTypes fBackend; - int fMSAASampleCount; typedef SampleWindow::DeviceManager INHERITED; }; @@ -648,10 +645,9 @@ static inline SampleWindow::DeviceType cycle_devicetype(SampleWindow::DeviceType } static void usage(const char * argv0) { - SkDebugf("%s [--slide sampleName] [-i resourcePath] [-msaa=<samplecnt>]\n", argv0); + SkDebugf("%s [--slide sampleName] [-i resourcePath]\n", argv0); SkDebugf(" sampleName: sample at which to start.\n"); SkDebugf(" resourcePath: directory that stores image resources.\n"); - SkDebugf(" msaa: request multisampling with the given sample count.\n"); } SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* devManager) : INHERITED(hwnd) { @@ -667,7 +663,6 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev const char* resourcePath = NULL; fCurrIndex = -1; - fMSAASampleCount = 0; const char* const commandName = argv[0]; char* const* stop = argv + argc; @@ -685,9 +680,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev fprintf(stderr, "Unknown sample \"%s\"\n", *argv); } } - } else if (1 == sscanf(*argv, "--msaa=%d", &fMSAASampleCount) && - fMSAASampleCount >= 0) { - } + } else { usage(commandName); } @@ -827,7 +820,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev devManager->ref(); fDevManager = devManager; } - fDevManager->setUpBackend(this, fMSAASampleCount); + fDevManager->setUpBackend(this); // If another constructor set our dimensions, ensure that our // onSizeChange gets called. @@ -1678,7 +1671,7 @@ void SampleWindow::setDeviceType(DeviceType type) { fDeviceType = type; - fDevManager->setUpBackend(this, fMSAASampleCount); + fDevManager->setUpBackend(this); this->updateTitle(); this->inval(NULL); diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h index a177b7308c..ba404da515 100644 --- a/samplecode/SampleApp.h +++ b/samplecode/SampleApp.h @@ -50,7 +50,7 @@ public: */ class DeviceManager : public SkRefCnt { public: - virtual void setUpBackend(SampleWindow* win, int msaaSampleCount) = 0; + virtual void setUpBackend(SampleWindow* win) = 0; virtual void tearDownBackend(SampleWindow* win) = 0; @@ -170,8 +170,6 @@ private: SkOSMenu::TriState fHintingState; unsigned fFlipAxis; - int fMSAASampleCount; - int fScrollTestX, fScrollTestY; SkScalar fZoomCenterX, fZoomCenterY; |