Index: gpu/demos/mip_map_2d/main.cc |
=================================================================== |
--- gpu/demos/mip_map_2d/main.cc (revision 36529) |
+++ gpu/demos/mip_map_2d/main.cc (working copy) |
@@ -5,60 +5,25 @@ |
// This is a simple example that demonstrates generating a mipmap chain |
// and rendering with it. |
-#include "gpu/demos/app_framework/application.h" |
+#include "gpu/demos/gles2_book/example.h" |
#include "third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.h" |
-namespace gpu_demos { |
-class MipMap2D : public Application { |
- public: |
- MipMap2D(); |
- ~MipMap2D(); |
+namespace gpu { |
+namespace demos { |
+namespace gles2_book { |
+typedef Example<MMUserData, |
+ mmInit, |
+ NoOpUpdateFunc, |
+ mmDraw, |
+ mmShutDown> MipMap2D; |
+} // namespace gles2_book |
+} // namespace demos |
+} // namespace gpu |
- bool Init(); |
- |
- protected: |
- virtual void Draw(float elapsed_sec); |
- |
- private: |
- ESContext context_; |
- MMUserData user_data_; |
- |
- DISALLOW_COPY_AND_ASSIGN(MipMap2D); |
-}; |
- |
-MipMap2D::MipMap2D() { |
- esInitContext(&context_); |
- |
- memset(&user_data_, 0, sizeof(MMUserData)); |
- context_.userData = &user_data_; |
-} |
- |
-MipMap2D::~MipMap2D() { |
- mmShutDown(&context_); |
-} |
- |
-bool MipMap2D::Init() { |
- if (!Application::InitRenderContext()) return false; |
- |
- context_.width = width(); |
- context_.height = height(); |
- if (!mmInit(&context_)) return false; |
- |
- return true; |
-} |
- |
-void MipMap2D::Draw(float /*elapsed_sec*/) { |
- mmDraw(&context_); |
-} |
-} // namespace gpu_demos |
- |
int main(int argc, char *argv[]) { |
- gpu_demos::MipMap2D app; |
- if (!app.Init()) { |
- printf("Could not init.\n"); |
- return EXIT_FAILURE; |
- } |
+ gpu::demos::gles2_book::MipMap2D demo; |
+ CHECK(demo.Init()); |
- app.MainLoop(); |
+ demo.MainLoop(); |
return EXIT_SUCCESS; |
} |