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

diff --git a/gpu/include/GrContext.h b/gpu/include/GrContext.h
index d80aef21ef3a31f7d0f63b764a9afccb955dc6a3..0f69e0bdaae0c77c4cc509eed764171648f01954 100644 (file)
--- 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 5251604dd906c7e7d30ab6cb447ad9b3b13274bc..e45303a49e09d67829faf1c440b68b447b979d05 100644 (file)
--- 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 <CoreFoundation/CoreFoundation.h>
 #include <CoreFoundation/CFURLAccess.h>