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

Unified Diff: gpu/demos/simple_vertex_shader/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/simple_texture_cubemap/main.cc ('k') | gpu/demos/stencil_test/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/demos/simple_vertex_shader/main.cc
===================================================================
--- gpu/demos/simple_vertex_shader/main.cc (revision 36529)
+++ gpu/demos/simple_vertex_shader/main.cc (working copy)
@@ -7,62 +7,25 @@
// example is to demonstrate the basic concepts of
// OpenGL ES 2.0 rendering.
-#include "gpu/demos/app_framework/application.h"
+#include "gpu/demos/gles2_book/example.h"
#include "third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.h"
-namespace gpu_demos {
-class SimpleVertexShader : public Application {
- public:
- SimpleVertexShader();
- ~SimpleVertexShader();
+namespace gpu {
+namespace demos {
+namespace gles2_book {
+typedef Example<SVSUserData,
+ svsInit,
+ svsUpdate,
+ svsDraw,
+ svsShutDown> SimpleVertexShader;
+} // namespace gles2_book
+} // namespace demos
+} // namespace gpu
- bool Init();
-
- protected:
- virtual void Draw(float elapsed_sec);
-
- private:
- ESContext context_;
- SVSUserData user_data_;
-
- DISALLOW_COPY_AND_ASSIGN(SimpleVertexShader);
-};
-
-SimpleVertexShader::SimpleVertexShader() {
- esInitContext(&context_);
-
- memset(&user_data_, 0, sizeof(SVSUserData));
- context_.userData = &user_data_;
-}
-
-SimpleVertexShader::~SimpleVertexShader() {
- svsShutDown(&context_);
-}
-
-bool SimpleVertexShader::Init() {
- if (!Application::InitRenderContext()) return false;
-
- context_.width = width();
- context_.height = height();
- if (!svsInit(&context_)) return false;
-
- return true;
-}
-
-void SimpleVertexShader::Draw(float elapsed_sec) {
- svsUpdate(&context_, elapsed_sec);
-
- svsDraw(&context_);
-}
-} // namespace gpu_demos
-
int main(int argc, char *argv[]) {
- gpu_demos::SimpleVertexShader app;
- if (!app.Init()) {
- printf("Could not init.\n");
- return EXIT_FAILURE;
- }
+ gpu::demos::gles2_book::SimpleVertexShader demo;
+ CHECK(demo.Init());
- app.MainLoop();
+ demo.MainLoop();
return EXIT_SUCCESS;
}
« no previous file with comments | « gpu/demos/simple_texture_cubemap/main.cc ('k') | gpu/demos/stencil_test/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698