Added texture wrap demo.

BUG=26099
TEST=Run texture_wrap executable. You should see three quads, each with a different texture wrapping mode.
Review URL: http://codereview.chromium.org/552012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36394 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 145 insertions, 53 deletions

diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index 14845ad..5aeaade 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -78,6 +78,17 @@
         'simple_vertex_shader/main.cc',
       ],
     },
+    {
+      'target_name': 'texture_wrap',
+      'type': 'executable',
+      'dependencies': [
+        'app_framework',
+        '../../third_party/gles2_book/gles2_book.gyp:texture_wrap',
+      ],
+      'sources': [
+        'texture_wrap/main.cc',
+      ],
+    },
   ]
 }
 
diff --git a/gpu/demos/texture_wrap/main.cc b/gpu/demos/texture_wrap/main.cc
new file mode 100644
index 0000000..8f240ed
--- /dev/null
+++ b/gpu/demos/texture_wrap/main.cc
@@ -0,0 +1,64 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This is an example that demonstrates the three texture
+// wrap modes available on 2D textures.
+
+#include "gpu/demos/app_framework/application.h"
+#include "third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.h"
+
+namespace gpu_demos {
+class TextureWrap : public Application {
+ public:
+  TextureWrap();
+  ~TextureWrap();
+
+  bool Init();
+
+ protected:
+  virtual void Draw(float elapsed_sec);
+
+ private:
+  ESContext context_;
+  TWUserData user_data_;
+
+  DISALLOW_COPY_AND_ASSIGN(TextureWrap);
+};
+
+TextureWrap::TextureWrap() {
+  esInitContext(&context_);
+
+  memset(&user_data_, 0, sizeof(TWUserData));
+  context_.userData = &user_data_;
+}
+
+TextureWrap::~TextureWrap() {
+  twShutDown(&context_);
+}
+
+bool TextureWrap::Init() {
+  if (!Application::InitRenderContext()) return false;
+
+  context_.width = width();
+  context_.height = height();
+  if (!twInit(&context_)) return false;
+
+  return true;
+}
+
+void TextureWrap::Draw(float /*elapsed_sec*/) {
+  twDraw(&context_);
+}
+}  // namespace gpu_demos
+
+int main(int argc, char *argv[]) {
+  gpu_demos::TextureWrap app;
+  if (!app.Init()) {
+    printf("Could not init.\n");
+    return EXIT_FAILURE;
+  }
+
+  app.MainLoop();
+  return EXIT_SUCCESS;
+}
diff --git a/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c b/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c
index 8507f77..5298283 100644
--- a/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c
+++ b/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c
@@ -14,30 +14,7 @@
 //    wrap modes available on 2D textures
 //
 #include <stdlib.h>
-#include "esUtil.h"
-
-typedef struct
-{
-   // Handle to a program object
-   GLuint programObject;
-
-   // Attribute locations
-   GLint  positionLoc;
-   GLint  texCoordLoc;
-
-   // Sampler location
-   GLint samplerLoc;
-
-   // Offset location
-   GLint offsetLoc;
-
-   // Texture handle
-   GLuint textureId;
-
-   // Vertex buffer object handle
-   GLuint vboIds[2];
-
-} UserData;
+#include "TextureWrap.h"
 
 ///
 //  Generate an RGB8 checkerboard image
@@ -113,9 +90,9 @@ static GLuint CreateTexture2D( )
 ///
 // Initialize the shader and program object
 //
-int Init ( ESContext *esContext )
+int twInit ( ESContext *esContext )
 {
-   UserData *userData = esContext->userData;
+   TWUserData *userData = esContext->userData;
    GLbyte vShaderStr[] =
       "uniform float u_offset;      \n"
       "attribute vec4 a_position;   \n"
@@ -183,9 +160,9 @@ int Init ( ESContext *esContext )
 #define VTX_POS_SIZE 4
 #define VTX_TEX_SIZE 2
 #define VTX_STRIDE (6 * sizeof(GLfloat))
-void Draw ( ESContext *esContext )
+void twDraw ( ESContext *esContext )
 {
-   UserData *userData = esContext->userData;
+   TWUserData *userData = esContext->userData;
    GLuint offset = 0;
       
    // Set the viewport
@@ -232,16 +209,14 @@ void Draw ( ESContext *esContext )
    glTexParameteri ( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT );
    glUniform1f ( userData->offsetLoc, 0.7f );
    glDrawElements ( GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0 );
-
-   eglSwapBuffers ( esContext->eglDisplay, esContext->eglSurface );
 }
 
 ///
 // Cleanup
 //
-void ShutDown ( ESContext *esContext )
+void twShutDown ( ESContext *esContext )
 {
-   UserData *userData = esContext->userData;
+   TWUserData *userData = esContext->userData;
 
    // Delete texture object
    glDeleteTextures ( 1, &userData->textureId );
@@ -252,24 +227,3 @@ void ShutDown ( ESContext *esContext )
    // Delete vertex buffer objects
    glDeleteBuffers ( 2, userData->vboIds );
 }
-
-
-int main ( int argc, char *argv[] )
-{
-   ESContext esContext;
-   UserData  userData;
-
-   esInitContext ( &esContext );
-   esContext.userData = &userData;
-
-   esCreateWindow ( &esContext, "MipMap 2D", 640, 480, ES_WINDOW_RGB );
-   
-   if ( !Init ( &esContext ) )
-      return 0;
-
-   esRegisterDrawFunc ( &esContext, Draw );
-   
-   esMainLoop ( &esContext );
-
-   ShutDown ( &esContext );
-}
diff --git a/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.h b/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.h
new file mode 100644
index 0000000..0067e67
--- /dev/null
+++ b/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.h
@@ -0,0 +1,52 @@
+//
+// Book:      OpenGL(R) ES 2.0 Programming Guide
+// Authors:   Aaftab Munshi, Dan Ginsburg, Dave Shreiner
+// ISBN-10:   0321502795
+// ISBN-13:   9780321502797
+// Publisher: Addison-Wesley Professional
+// URLs:      http://safari.informit.com/9780321563835
+//            http://www.opengles-book.com
+//
+
+#ifndef TEXTURE_WRAP_H
+#define TEXTURE_WRAP_H
+
+#include "esUtil.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif  // __cplusplus
+
+typedef struct
+{
+   // Handle to a program object
+   GLuint programObject;
+
+   // Attribute locations
+   GLint  positionLoc;
+   GLint  texCoordLoc;
+
+   // Sampler location
+   GLint samplerLoc;
+
+   // Offset location
+   GLint offsetLoc;
+
+   // Texture handle
+   GLuint textureId;
+
+   // Vertex buffer object handle
+   GLuint vboIds[2];
+
+} TWUserData;
+
+extern int twInit ( ESContext *esContext );
+
+extern void twDraw ( ESContext *esContext );
+
+extern void twShutDown ( ESContext *esContext );
+
+#ifdef __cplusplus
+}
+#endif  // __cplusplus
+#endif  // TEXTURE_WRAP_H
diff --git a/third_party/gles2_book/gles2_book.gyp b/third_party/gles2_book/gles2_book.gyp
index 667fbb5..e4975dc 100644
--- a/third_party/gles2_book/gles2_book.gyp
+++ b/third_party/gles2_book/gles2_book.gyp
@@ -83,6 +83,17 @@
         'Chapter_8/Simple_VertexShader/Simple_VertexShader.h',
       ],
     },
+    {
+      'target_name': 'texture_wrap',
+      'type': 'static_library',
+      'dependencies': [
+        'es_util',
+      ],
+      'sources': [
+        'Chapter_9/TextureWrap/TextureWrap.c',
+        'Chapter_9/TextureWrap/TextureWrap.h',
+      ],
+    },
   ]
 }