From 84223118f7073a28f42c11ad08595e07c0ceb933 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Thu, 14 Jul 2011 14:45:44 +0000 Subject: [PATCH] Remove some cruft from SampleApp.cpp Review URL: http://codereview.appspot.com/4724042 git-svn-id: http://skia.googlecode.com/svn/trunk@1858 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gpu/include/GrContext.h | 2 ++ samplecode/SampleApp.cpp | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gpu/include/GrContext.h b/gpu/include/GrContext.h index d80aef21ef..0f69e0bdaa 100644 --- a/gpu/include/GrContext.h +++ b/gpu/include/GrContext.h @@ -693,6 +693,8 @@ public: fContext->unlockTexture(fEntry); } } + + GrTexture* texture() { return fEntry->texture(); } private: GrContext* fContext; GrTextureEntry* fEntry; diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 5251604dd9..e45303a49e 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -34,8 +34,6 @@ extern SkView* create_overview(int, const SkViewFactory[]); -#define SK_SUPPORT_GL - #define ANIMATING_EVENTTYPE "nextSample" #define ANIMATING_DELAY 750 @@ -46,10 +44,6 @@ extern SkView* create_overview(int, const SkViewFactory[]); #endif #define FPS_REPEAT_COUNT (10 * FPS_REPEAT_MULTIPLIER) -#ifdef SK_SUPPORT_GL - #include "GrGLConfig.h" -#endif - static SampleWindow* gSampleWindow; /////////////// @@ -175,10 +169,6 @@ SkViewRegister::SkViewRegister(SkViewFactory fact) : fFact(fact) { gHead = this; } -#if defined(SK_SUPPORT_GL) - #define SK_USE_SHADERS -#endif - #if 0 #include #include -- 2.34.1