summaryrefslogtreecommitdiffstats
path: root/gpu/demos
diff options
context:
space:
mode:
authoralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-09 17:06:42 +0000
committeralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-09 17:06:42 +0000
commitefb8f2987c9b500b3af21f3498df5ac4ae091551 (patch)
tree02e102d22c835937981b20e178af38d01e366eb0 /gpu/demos
parent1fe3ec310377e2549d05344583251e9e45148553 (diff)
downloadchromium_src-efb8f2987c9b500b3af21f3498df5ac4ae091551.zip
chromium_src-efb8f2987c9b500b3af21f3498df5ac4ae091551.tar.gz
chromium_src-efb8f2987c9b500b3af21f3498df5ac4ae091551.tar.bz2
Renamed gles_book_examples to gles2_book to make it shorter and more correct. I still need to rename gles_book_examples.gyp to gles2_book.gyp. I will do it in another CL as svn does not like changes in renamed directories.
TBR=apatrick Review URL: http://codereview.chromium.org/543002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos')
-rw-r--r--gpu/demos/DEPS2
-rw-r--r--gpu/demos/demos.gyp2
-rw-r--r--gpu/demos/hello_triangle/main.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/gpu/demos/DEPS b/gpu/demos/DEPS
index 74c3f98..8684e76 100644
--- a/gpu/demos/DEPS
+++ b/gpu/demos/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+third_party/gles_book_examples",
+ "+third_party/gles2_book",
]
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index 9bf55d6..83a57f2 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -28,7 +28,7 @@
'type': 'executable',
'dependencies': [
'app_framework',
- '../../third_party/gles_book_examples/gles_book_examples.gyp:hello_triangle',
+ '../../third_party/gles2_book/gles_book_examples.gyp:hello_triangle',
],
'sources': [
'hello_triangle/main.cc',
diff --git a/gpu/demos/hello_triangle/main.cc b/gpu/demos/hello_triangle/main.cc
index ef22208..573b1c9 100644
--- a/gpu/demos/hello_triangle/main.cc
+++ b/gpu/demos/hello_triangle/main.cc
@@ -8,7 +8,7 @@
// OpenGL ES 2.0 rendering.
#include "gpu/demos/app_framework/application.h"
-#include "third_party/gles_book_examples/Chapter_2/Hello_Triangle/Hello_Triangle.h"
+#include "third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h"
namespace gpu_demos {
class HelloTriangle : public Application {