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

Unified Diff: gpu/demos/simple_texture_2d/main.cc

Issue 542120: Converted all demos to use gpu::demos::Example base class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/demos/mip_map_2d/main.cc ('k') | gpu/demos/simple_texture_cubemap/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/demos/simple_texture_2d/main.cc
===================================================================
--- gpu/demos/simple_texture_2d/main.cc (revision 36529)
+++ gpu/demos/simple_texture_2d/main.cc (working copy)
@@ -6,60 +6,25 @@
// texture image. The purpose of this example is to demonstrate
// the basics of 2D texturing
-#include "gpu/demos/app_framework/application.h"
+#include "gpu/demos/gles2_book/example.h"
#include "third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.h"
-namespace gpu_demos {
-class SimpleTexture2D : public Application {
- public:
- SimpleTexture2D();
- ~SimpleTexture2D();
+namespace gpu {
+namespace demos {
+namespace gles2_book {
+typedef Example<STUserData,
+ stInit,
+ NoOpUpdateFunc,
+ stDraw,
+ stShutDown> SimpleTexture2D;
+} // namespace gles2_book
+} // namespace demos
+} // namespace gpu
- bool Init();
-
- protected:
- virtual void Draw(float elapsed_sec);
-
- private:
- ESContext context_;
- STUserData user_data_;
-
- DISALLOW_COPY_AND_ASSIGN(SimpleTexture2D);
-};
-
-SimpleTexture2D::SimpleTexture2D() {
- esInitContext(&context_);
-
- memset(&user_data_, 0, sizeof(STUserData));
- context_.userData = &user_data_;
-}
-
-SimpleTexture2D::~SimpleTexture2D() {
- stShutDown(&context_);
-}
-
-bool SimpleTexture2D::Init() {
- if (!Application::InitRenderContext()) return false;
-
- context_.width = width();
- context_.height = height();
- if (!stInit(&context_)) return false;
-
- return true;
-}
-
-void SimpleTexture2D::Draw(float /*elapsed_sec*/) {
- stDraw(&context_);
-}
-} // namespace gpu_demos
-
int main(int argc, char *argv[]) {
- gpu_demos::SimpleTexture2D app;
- if (!app.Init()) {
- printf("Could not init.\n");
- return EXIT_FAILURE;
- }
+ gpu::demos::gles2_book::SimpleTexture2D demo;
+ CHECK(demo.Init());
- app.MainLoop();
+ demo.MainLoop();
return EXIT_SUCCESS;
}
« no previous file with comments | « gpu/demos/mip_map_2d/main.cc ('k') | gpu/demos/simple_texture_cubemap/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698