diff options
author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-09 17:06:42 +0000 |
---|---|---|
committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-09 17:06:42 +0000 |
commit | efb8f2987c9b500b3af21f3498df5ac4ae091551 (patch) | |
tree | 02e102d22c835937981b20e178af38d01e366eb0 | |
parent | 1fe3ec310377e2549d05344583251e9e45148553 (diff) | |
download | chromium_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
-rw-r--r-- | build/all.gyp | 2 | ||||
-rw-r--r-- | gpu/demos/DEPS | 2 | ||||
-rw-r--r-- | gpu/demos/demos.gyp | 2 | ||||
-rw-r--r-- | gpu/demos/hello_triangle/main.cc | 2 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_10/MultiTexture/MultiTexture.c (renamed from third_party/gles_book_examples/Chapter_10/MultiTexture/MultiTexture.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_10/MultiTexture/basemap.tga (renamed from third_party/gles_book_examples/Chapter_10/MultiTexture/basemap.tga) | bin | 786476 -> 786476 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_10/MultiTexture/lightmap.tga (renamed from third_party/gles_book_examples/Chapter_10/MultiTexture/lightmap.tga) | bin | 196626 -> 196626 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_10/RM_AlphaTest/RM_AlphaTest.rfx (renamed from third_party/gles_book_examples/Chapter_10/RM_AlphaTest/RM_AlphaTest.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_10/RM_AlphaTest/Torus.3ds (renamed from third_party/gles_book_examples/Chapter_10/RM_AlphaTest/Torus.3ds) | bin | 77621 -> 77621 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_10/RM_AlphaTest/cloud.tga (renamed from third_party/gles_book_examples/Chapter_10/RM_AlphaTest/cloud.tga) | bin | 262188 -> 262188 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_10/RM_ClipPlane/RM_ClipPlane.rfx (renamed from third_party/gles_book_examples/Chapter_10/RM_ClipPlane/RM_ClipPlane.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_10/RM_ClipPlane/Sphere.3ds (renamed from third_party/gles_book_examples/Chapter_10/RM_ClipPlane/Sphere.3ds) | bin | 23649 -> 23649 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_10/RM_LinearFog/LinearFog.rfx (renamed from third_party/gles_book_examples/Chapter_10/RM_LinearFog/LinearFog.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_10/RM_LinearFog/Terrain.3ds (renamed from third_party/gles_book_examples/Chapter_10/RM_LinearFog/Terrain.3ds) | bin | 1477635 -> 1477635 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_10/RM_LinearFog/Terrain.tga (renamed from third_party/gles_book_examples/Chapter_10/RM_LinearFog/Terrain.tga) | bin | 786971 -> 786971 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_11/Multisample/Multisample.c (renamed from third_party/gles_book_examples/Chapter_11/Multisample/Multisample.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c (renamed from third_party/gles_book_examples/Chapter_11/Stencil_Test/Stencil_Test.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/EnvironmentMapping/EnvironmentMapping.rfx (renamed from third_party/gles_book_examples/Chapter_13/EnvironmentMapping/EnvironmentMapping.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/EnvironmentMapping/Fieldstone.tga (renamed from third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Fieldstone.tga) | bin | 786476 -> 786476 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/EnvironmentMapping/FieldstoneBumpDOT3.tga (renamed from third_party/gles_book_examples/Chapter_13/EnvironmentMapping/FieldstoneBumpDOT3.tga) | bin | 786450 -> 786450 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/EnvironmentMapping/Snow.dds (renamed from third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Snow.dds) | bin | 2097440 -> 2097440 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/EnvironmentMapping/Sphere.3ds (renamed from third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Sphere.3ds) | bin | 23649 -> 23649 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/EnvironmentMapping/Teapot.3ds (renamed from third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Teapot.3ds) | bin | 1004218 -> 1004218 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/Noise3D/Noise3D.rfx (renamed from third_party/gles_book_examples/Chapter_13/Noise3D/Noise3D.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/Noise3D/NoiseVolume.dds (renamed from third_party/gles_book_examples/Chapter_13/Noise3D/NoiseVolume.dds) | bin | 2097280 -> 2097280 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/Noise3D/SkyDome.3ds (renamed from third_party/gles_book_examples/Chapter_13/Noise3D/SkyDome.3ds) | bin | 83982 -> 83982 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/Noise3D/Terrain.3ds (renamed from third_party/gles_book_examples/Chapter_13/Noise3D/Terrain.3ds) | bin | 1477635 -> 1477635 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/Noise3D/Terrain.tga (renamed from third_party/gles_book_examples/Chapter_13/Noise3D/Terrain.tga) | bin | 786971 -> 786971 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/Noise3D/generatenoise.c (renamed from third_party/gles_book_examples/Chapter_13/Noise3D/generatenoise.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ParticleSystem/ParticleSystem.c (renamed from third_party/gles_book_examples/Chapter_13/ParticleSystem/ParticleSystem.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ParticleSystem/smoke.tga (renamed from third_party/gles_book_examples/Chapter_13/ParticleSystem/smoke.tga) | bin | 49170 -> 49170 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PerFragmentLighting/Fieldstone.tga (renamed from third_party/gles_book_examples/Chapter_13/PerFragmentLighting/Fieldstone.tga) | bin | 786476 -> 786476 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PerFragmentLighting/FieldstoneBumpDOT3.tga (renamed from third_party/gles_book_examples/Chapter_13/PerFragmentLighting/FieldstoneBumpDOT3.tga) | bin | 786450 -> 786450 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PerFragmentLighting/PerFragmentLighting.rfx (renamed from third_party/gles_book_examples/Chapter_13/PerFragmentLighting/PerFragmentLighting.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PerFragmentLighting/Torus.3ds (renamed from third_party/gles_book_examples/Chapter_13/PerFragmentLighting/Torus.3ds) | bin | 77621 -> 77621 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PostProcess/Car.3ds (renamed from third_party/gles_book_examples/Chapter_13/PostProcess/Car.3ds) | bin | 71400 -> 71400 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PostProcess/Cube.x (renamed from third_party/gles_book_examples/Chapter_13/PostProcess/Cube.x) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PostProcess/Fieldstone.tga (renamed from third_party/gles_book_examples/Chapter_13/PostProcess/Fieldstone.tga) | bin | 786476 -> 786476 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PostProcess/PostProcess.rfx (renamed from third_party/gles_book_examples/Chapter_13/PostProcess/PostProcess.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/PostProcess/ScreenAlignedQuad.3ds (renamed from third_party/gles_book_examples/Chapter_13/PostProcess/ScreenAlignedQuad.3ds) | bin | 1504 -> 1504 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProceduralTextures/Checker.rfx (renamed from third_party/gles_book_examples/Chapter_13/ProceduralTextures/Checker.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProceduralTextures/CheckerAA.rfx (renamed from third_party/gles_book_examples/Chapter_13/ProceduralTextures/CheckerAA.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProceduralTextures/ProceduralTextures.rfx (renamed from third_party/gles_book_examples/Chapter_13/ProceduralTextures/ProceduralTextures.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProceduralTextures/ScreenAlignedQuad.3ds (renamed from third_party/gles_book_examples/Chapter_13/ProceduralTextures/ScreenAlignedQuad.3ds) | bin | 1504 -> 1504 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProceduralTextures/checker.fs (renamed from third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.fs) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProceduralTextures/checker.tiff (renamed from third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.tiff) | bin | 311274 -> 311274 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProceduralTextures/checker.vs (renamed from third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.vs) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Corona.tga (renamed from third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Corona.tga) | bin | 786971 -> 786971 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProjectiveSpotlight/ProjectiveSpotlight.rfx (renamed from third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/ProjectiveSpotlight.rfx) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Terrain.3ds (renamed from third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Terrain.3ds) | bin | 1477635 -> 1477635 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Terrain.tga (renamed from third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Terrain.tga) | bin | 786971 -> 786971 bytes | |||
-rw-r--r-- | third_party/gles2_book/Chapter_15/Hello_Triangle_KD/Hello_Triangle_KD.c (renamed from third_party/gles_book_examples/Chapter_15/Hello_Triangle_KD/Hello_Triangle_KD.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c (renamed from third_party/gles_book_examples/Chapter_2/Hello_Triangle/Hello_Triangle.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h (renamed from third_party/gles_book_examples/Chapter_2/Hello_Triangle/Hello_Triangle.h) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c (renamed from third_party/gles_book_examples/Chapter_8/Simple_VertexShader/Simple_VertexShader.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.h (renamed from third_party/gles_book_examples/Chapter_8/Simple_VertexShader/Simple_VertexShader.h) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c (renamed from third_party/gles_book_examples/Chapter_9/MipMap2D/MipMap2D.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c (renamed from third_party/gles_book_examples/Chapter_9/Simple_Texture2D/Simple_Texture2D.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c (renamed from third_party/gles_book_examples/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c (renamed from third_party/gles_book_examples/Chapter_9/TextureWrap/TextureWrap.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Common/Include/esUtil.h (renamed from third_party/gles_book_examples/Common/Include/esUtil.h) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Common/Include/esUtil_win.h (renamed from third_party/gles_book_examples/Common/Include/esUtil_win.h) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Common/Source/Win32/esUtil_TGA.c (renamed from third_party/gles_book_examples/Common/Source/Win32/esUtil_TGA.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Common/Source/esShader.c (renamed from third_party/gles_book_examples/Common/Source/esShader.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Common/Source/esShapes.c (renamed from third_party/gles_book_examples/Common/Source/esShapes.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Common/Source/esTransform.c (renamed from third_party/gles_book_examples/Common/Source/esTransform.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/Common/Source/esUtil.c (renamed from third_party/gles_book_examples/Common/Source/esUtil.c) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/README.TXT (renamed from third_party/gles_book_examples/README.TXT) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/README.chromium (renamed from third_party/gles_book_examples/README.chromium) | 0 | ||||
-rw-r--r-- | third_party/gles2_book/gles_book_examples.gyp (renamed from third_party/gles_book_examples/gles_book_examples.gyp) | 0 |
70 files changed, 3 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp index b2eefb0..c1c400f 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -95,14 +95,12 @@ '../chrome/app/locales/locales.gyp:*', '../courgette/courgette.gyp:*', '../gears/gears.gyp:*', - '../gpu/demos/demos.gyp:*', '../gpu/gpu.gyp:*', '../rlz/rlz.gyp:*', '../sandbox/sandbox.gyp:*', '../third_party/bsdiff/bsdiff.gyp:*', '../third_party/bspatch/bspatch.gyp:*', '../third_party/cld/cld.gyp:*', - '../third_party/gles_book_examples/gles_book_examples.gyp:*', '../tools/memory_watcher/memory_watcher.gyp:*', # As of now Skia build has problems with Linux and/or 64 bits. # TODO(sehr,brettw): Make this unconditional. 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 { diff --git a/third_party/gles_book_examples/Chapter_10/MultiTexture/MultiTexture.c b/third_party/gles2_book/Chapter_10/MultiTexture/MultiTexture.c index dc8c190..dc8c190 100644 --- a/third_party/gles_book_examples/Chapter_10/MultiTexture/MultiTexture.c +++ b/third_party/gles2_book/Chapter_10/MultiTexture/MultiTexture.c diff --git a/third_party/gles_book_examples/Chapter_10/MultiTexture/basemap.tga b/third_party/gles2_book/Chapter_10/MultiTexture/basemap.tga Binary files differindex 8acafae..8acafae 100644 --- a/third_party/gles_book_examples/Chapter_10/MultiTexture/basemap.tga +++ b/third_party/gles2_book/Chapter_10/MultiTexture/basemap.tga diff --git a/third_party/gles_book_examples/Chapter_10/MultiTexture/lightmap.tga b/third_party/gles2_book/Chapter_10/MultiTexture/lightmap.tga Binary files differindex d95b262..d95b262 100644 --- a/third_party/gles_book_examples/Chapter_10/MultiTexture/lightmap.tga +++ b/third_party/gles2_book/Chapter_10/MultiTexture/lightmap.tga diff --git a/third_party/gles_book_examples/Chapter_10/RM_AlphaTest/RM_AlphaTest.rfx b/third_party/gles2_book/Chapter_10/RM_AlphaTest/RM_AlphaTest.rfx index 4cb98eb..4cb98eb 100644 --- a/third_party/gles_book_examples/Chapter_10/RM_AlphaTest/RM_AlphaTest.rfx +++ b/third_party/gles2_book/Chapter_10/RM_AlphaTest/RM_AlphaTest.rfx diff --git a/third_party/gles_book_examples/Chapter_10/RM_AlphaTest/Torus.3ds b/third_party/gles2_book/Chapter_10/RM_AlphaTest/Torus.3ds Binary files differindex cceac9aa..cceac9aa 100644 --- a/third_party/gles_book_examples/Chapter_10/RM_AlphaTest/Torus.3ds +++ b/third_party/gles2_book/Chapter_10/RM_AlphaTest/Torus.3ds diff --git a/third_party/gles_book_examples/Chapter_10/RM_AlphaTest/cloud.tga b/third_party/gles2_book/Chapter_10/RM_AlphaTest/cloud.tga Binary files differindex 74ddd8f..74ddd8f 100644 --- a/third_party/gles_book_examples/Chapter_10/RM_AlphaTest/cloud.tga +++ b/third_party/gles2_book/Chapter_10/RM_AlphaTest/cloud.tga diff --git a/third_party/gles_book_examples/Chapter_10/RM_ClipPlane/RM_ClipPlane.rfx b/third_party/gles2_book/Chapter_10/RM_ClipPlane/RM_ClipPlane.rfx index 73bb7a8..73bb7a8 100644 --- a/third_party/gles_book_examples/Chapter_10/RM_ClipPlane/RM_ClipPlane.rfx +++ b/third_party/gles2_book/Chapter_10/RM_ClipPlane/RM_ClipPlane.rfx diff --git a/third_party/gles_book_examples/Chapter_10/RM_ClipPlane/Sphere.3ds b/third_party/gles2_book/Chapter_10/RM_ClipPlane/Sphere.3ds Binary files differindex 108b93d..108b93d 100644 --- a/third_party/gles_book_examples/Chapter_10/RM_ClipPlane/Sphere.3ds +++ b/third_party/gles2_book/Chapter_10/RM_ClipPlane/Sphere.3ds diff --git a/third_party/gles_book_examples/Chapter_10/RM_LinearFog/LinearFog.rfx b/third_party/gles2_book/Chapter_10/RM_LinearFog/LinearFog.rfx index f7cd646..f7cd646 100644 --- a/third_party/gles_book_examples/Chapter_10/RM_LinearFog/LinearFog.rfx +++ b/third_party/gles2_book/Chapter_10/RM_LinearFog/LinearFog.rfx diff --git a/third_party/gles_book_examples/Chapter_10/RM_LinearFog/Terrain.3ds b/third_party/gles2_book/Chapter_10/RM_LinearFog/Terrain.3ds Binary files differindex a46d787..a46d787 100644 --- a/third_party/gles_book_examples/Chapter_10/RM_LinearFog/Terrain.3ds +++ b/third_party/gles2_book/Chapter_10/RM_LinearFog/Terrain.3ds diff --git a/third_party/gles_book_examples/Chapter_10/RM_LinearFog/Terrain.tga b/third_party/gles2_book/Chapter_10/RM_LinearFog/Terrain.tga Binary files differindex 47d5117..47d5117 100644 --- a/third_party/gles_book_examples/Chapter_10/RM_LinearFog/Terrain.tga +++ b/third_party/gles2_book/Chapter_10/RM_LinearFog/Terrain.tga diff --git a/third_party/gles_book_examples/Chapter_11/Multisample/Multisample.c b/third_party/gles2_book/Chapter_11/Multisample/Multisample.c index 596f340..596f340 100644 --- a/third_party/gles_book_examples/Chapter_11/Multisample/Multisample.c +++ b/third_party/gles2_book/Chapter_11/Multisample/Multisample.c diff --git a/third_party/gles_book_examples/Chapter_11/Stencil_Test/Stencil_Test.c b/third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c index 1caf098..1caf098 100644 --- a/third_party/gles_book_examples/Chapter_11/Stencil_Test/Stencil_Test.c +++ b/third_party/gles2_book/Chapter_11/Stencil_Test/Stencil_Test.c diff --git a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/EnvironmentMapping.rfx b/third_party/gles2_book/Chapter_13/EnvironmentMapping/EnvironmentMapping.rfx index 8c32adb..8c32adb 100644 --- a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/EnvironmentMapping.rfx +++ b/third_party/gles2_book/Chapter_13/EnvironmentMapping/EnvironmentMapping.rfx diff --git a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Fieldstone.tga b/third_party/gles2_book/Chapter_13/EnvironmentMapping/Fieldstone.tga Binary files differindex 8acafae..8acafae 100644 --- a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Fieldstone.tga +++ b/third_party/gles2_book/Chapter_13/EnvironmentMapping/Fieldstone.tga diff --git a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/FieldstoneBumpDOT3.tga b/third_party/gles2_book/Chapter_13/EnvironmentMapping/FieldstoneBumpDOT3.tga Binary files differindex 6290f52..6290f52 100644 --- a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/FieldstoneBumpDOT3.tga +++ b/third_party/gles2_book/Chapter_13/EnvironmentMapping/FieldstoneBumpDOT3.tga diff --git a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Snow.dds b/third_party/gles2_book/Chapter_13/EnvironmentMapping/Snow.dds Binary files differindex 62799c2..62799c2 100644 --- a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Snow.dds +++ b/third_party/gles2_book/Chapter_13/EnvironmentMapping/Snow.dds diff --git a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Sphere.3ds b/third_party/gles2_book/Chapter_13/EnvironmentMapping/Sphere.3ds Binary files differindex 108b93d..108b93d 100644 --- a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Sphere.3ds +++ b/third_party/gles2_book/Chapter_13/EnvironmentMapping/Sphere.3ds diff --git a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Teapot.3ds b/third_party/gles2_book/Chapter_13/EnvironmentMapping/Teapot.3ds Binary files differindex 78be5fb..78be5fb 100644 --- a/third_party/gles_book_examples/Chapter_13/EnvironmentMapping/Teapot.3ds +++ b/third_party/gles2_book/Chapter_13/EnvironmentMapping/Teapot.3ds diff --git a/third_party/gles_book_examples/Chapter_13/Noise3D/Noise3D.rfx b/third_party/gles2_book/Chapter_13/Noise3D/Noise3D.rfx index b6663d1..b6663d1 100644 --- a/third_party/gles_book_examples/Chapter_13/Noise3D/Noise3D.rfx +++ b/third_party/gles2_book/Chapter_13/Noise3D/Noise3D.rfx diff --git a/third_party/gles_book_examples/Chapter_13/Noise3D/NoiseVolume.dds b/third_party/gles2_book/Chapter_13/Noise3D/NoiseVolume.dds Binary files differindex bd8147d..bd8147d 100644 --- a/third_party/gles_book_examples/Chapter_13/Noise3D/NoiseVolume.dds +++ b/third_party/gles2_book/Chapter_13/Noise3D/NoiseVolume.dds diff --git a/third_party/gles_book_examples/Chapter_13/Noise3D/SkyDome.3ds b/third_party/gles2_book/Chapter_13/Noise3D/SkyDome.3ds Binary files differindex 5994396..5994396 100644 --- a/third_party/gles_book_examples/Chapter_13/Noise3D/SkyDome.3ds +++ b/third_party/gles2_book/Chapter_13/Noise3D/SkyDome.3ds diff --git a/third_party/gles_book_examples/Chapter_13/Noise3D/Terrain.3ds b/third_party/gles2_book/Chapter_13/Noise3D/Terrain.3ds Binary files differindex a46d787..a46d787 100644 --- a/third_party/gles_book_examples/Chapter_13/Noise3D/Terrain.3ds +++ b/third_party/gles2_book/Chapter_13/Noise3D/Terrain.3ds diff --git a/third_party/gles_book_examples/Chapter_13/Noise3D/Terrain.tga b/third_party/gles2_book/Chapter_13/Noise3D/Terrain.tga Binary files differindex 47d5117..47d5117 100644 --- a/third_party/gles_book_examples/Chapter_13/Noise3D/Terrain.tga +++ b/third_party/gles2_book/Chapter_13/Noise3D/Terrain.tga diff --git a/third_party/gles_book_examples/Chapter_13/Noise3D/generatenoise.c b/third_party/gles2_book/Chapter_13/Noise3D/generatenoise.c index a4c969b..a4c969b 100644 --- a/third_party/gles_book_examples/Chapter_13/Noise3D/generatenoise.c +++ b/third_party/gles2_book/Chapter_13/Noise3D/generatenoise.c diff --git a/third_party/gles_book_examples/Chapter_13/ParticleSystem/ParticleSystem.c b/third_party/gles2_book/Chapter_13/ParticleSystem/ParticleSystem.c index c6be9cf..c6be9cf 100644 --- a/third_party/gles_book_examples/Chapter_13/ParticleSystem/ParticleSystem.c +++ b/third_party/gles2_book/Chapter_13/ParticleSystem/ParticleSystem.c diff --git a/third_party/gles_book_examples/Chapter_13/ParticleSystem/smoke.tga b/third_party/gles2_book/Chapter_13/ParticleSystem/smoke.tga Binary files differindex 06a0705..06a0705 100644 --- a/third_party/gles_book_examples/Chapter_13/ParticleSystem/smoke.tga +++ b/third_party/gles2_book/Chapter_13/ParticleSystem/smoke.tga diff --git a/third_party/gles_book_examples/Chapter_13/PerFragmentLighting/Fieldstone.tga b/third_party/gles2_book/Chapter_13/PerFragmentLighting/Fieldstone.tga Binary files differindex 8acafae..8acafae 100644 --- a/third_party/gles_book_examples/Chapter_13/PerFragmentLighting/Fieldstone.tga +++ b/third_party/gles2_book/Chapter_13/PerFragmentLighting/Fieldstone.tga diff --git a/third_party/gles_book_examples/Chapter_13/PerFragmentLighting/FieldstoneBumpDOT3.tga b/third_party/gles2_book/Chapter_13/PerFragmentLighting/FieldstoneBumpDOT3.tga Binary files differindex 6290f52..6290f52 100644 --- a/third_party/gles_book_examples/Chapter_13/PerFragmentLighting/FieldstoneBumpDOT3.tga +++ b/third_party/gles2_book/Chapter_13/PerFragmentLighting/FieldstoneBumpDOT3.tga diff --git a/third_party/gles_book_examples/Chapter_13/PerFragmentLighting/PerFragmentLighting.rfx b/third_party/gles2_book/Chapter_13/PerFragmentLighting/PerFragmentLighting.rfx index 58c3b9f..58c3b9f 100644 --- a/third_party/gles_book_examples/Chapter_13/PerFragmentLighting/PerFragmentLighting.rfx +++ b/third_party/gles2_book/Chapter_13/PerFragmentLighting/PerFragmentLighting.rfx diff --git a/third_party/gles_book_examples/Chapter_13/PerFragmentLighting/Torus.3ds b/third_party/gles2_book/Chapter_13/PerFragmentLighting/Torus.3ds Binary files differindex cceac9aa..cceac9aa 100644 --- a/third_party/gles_book_examples/Chapter_13/PerFragmentLighting/Torus.3ds +++ b/third_party/gles2_book/Chapter_13/PerFragmentLighting/Torus.3ds diff --git a/third_party/gles_book_examples/Chapter_13/PostProcess/Car.3ds b/third_party/gles2_book/Chapter_13/PostProcess/Car.3ds Binary files differindex fb261dc..fb261dc 100644 --- a/third_party/gles_book_examples/Chapter_13/PostProcess/Car.3ds +++ b/third_party/gles2_book/Chapter_13/PostProcess/Car.3ds diff --git a/third_party/gles_book_examples/Chapter_13/PostProcess/Cube.x b/third_party/gles2_book/Chapter_13/PostProcess/Cube.x index 35c0f4c..35c0f4c 100644 --- a/third_party/gles_book_examples/Chapter_13/PostProcess/Cube.x +++ b/third_party/gles2_book/Chapter_13/PostProcess/Cube.x diff --git a/third_party/gles_book_examples/Chapter_13/PostProcess/Fieldstone.tga b/third_party/gles2_book/Chapter_13/PostProcess/Fieldstone.tga Binary files differindex 8acafae..8acafae 100644 --- a/third_party/gles_book_examples/Chapter_13/PostProcess/Fieldstone.tga +++ b/third_party/gles2_book/Chapter_13/PostProcess/Fieldstone.tga diff --git a/third_party/gles_book_examples/Chapter_13/PostProcess/PostProcess.rfx b/third_party/gles2_book/Chapter_13/PostProcess/PostProcess.rfx index d8e7047..d8e7047 100644 --- a/third_party/gles_book_examples/Chapter_13/PostProcess/PostProcess.rfx +++ b/third_party/gles2_book/Chapter_13/PostProcess/PostProcess.rfx diff --git a/third_party/gles_book_examples/Chapter_13/PostProcess/ScreenAlignedQuad.3ds b/third_party/gles2_book/Chapter_13/PostProcess/ScreenAlignedQuad.3ds Binary files differindex 619124b..619124b 100644 --- a/third_party/gles_book_examples/Chapter_13/PostProcess/ScreenAlignedQuad.3ds +++ b/third_party/gles2_book/Chapter_13/PostProcess/ScreenAlignedQuad.3ds diff --git a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/Checker.rfx b/third_party/gles2_book/Chapter_13/ProceduralTextures/Checker.rfx index 3da57a8..3da57a8 100644 --- a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/Checker.rfx +++ b/third_party/gles2_book/Chapter_13/ProceduralTextures/Checker.rfx diff --git a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/CheckerAA.rfx b/third_party/gles2_book/Chapter_13/ProceduralTextures/CheckerAA.rfx index 6f73d7e..6f73d7e 100644 --- a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/CheckerAA.rfx +++ b/third_party/gles2_book/Chapter_13/ProceduralTextures/CheckerAA.rfx diff --git a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/ProceduralTextures.rfx b/third_party/gles2_book/Chapter_13/ProceduralTextures/ProceduralTextures.rfx index f60300f..f60300f 100644 --- a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/ProceduralTextures.rfx +++ b/third_party/gles2_book/Chapter_13/ProceduralTextures/ProceduralTextures.rfx diff --git a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/ScreenAlignedQuad.3ds b/third_party/gles2_book/Chapter_13/ProceduralTextures/ScreenAlignedQuad.3ds Binary files differindex 619124b..619124b 100644 --- a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/ScreenAlignedQuad.3ds +++ b/third_party/gles2_book/Chapter_13/ProceduralTextures/ScreenAlignedQuad.3ds diff --git a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.fs b/third_party/gles2_book/Chapter_13/ProceduralTextures/checker.fs index 305eb46..305eb46 100644 --- a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.fs +++ b/third_party/gles2_book/Chapter_13/ProceduralTextures/checker.fs diff --git a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.tiff b/third_party/gles2_book/Chapter_13/ProceduralTextures/checker.tiff Binary files differindex 767b030..767b030 100644 --- a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.tiff +++ b/third_party/gles2_book/Chapter_13/ProceduralTextures/checker.tiff diff --git a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.vs b/third_party/gles2_book/Chapter_13/ProceduralTextures/checker.vs index 88375ba..88375ba 100644 --- a/third_party/gles_book_examples/Chapter_13/ProceduralTextures/checker.vs +++ b/third_party/gles2_book/Chapter_13/ProceduralTextures/checker.vs diff --git a/third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Corona.tga b/third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Corona.tga Binary files differindex 19dba88..19dba88 100644 --- a/third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Corona.tga +++ b/third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Corona.tga diff --git a/third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/ProjectiveSpotlight.rfx b/third_party/gles2_book/Chapter_13/ProjectiveSpotlight/ProjectiveSpotlight.rfx index 12f85f6..12f85f6 100644 --- a/third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/ProjectiveSpotlight.rfx +++ b/third_party/gles2_book/Chapter_13/ProjectiveSpotlight/ProjectiveSpotlight.rfx diff --git a/third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Terrain.3ds b/third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Terrain.3ds Binary files differindex a46d787..a46d787 100644 --- a/third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Terrain.3ds +++ b/third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Terrain.3ds diff --git a/third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Terrain.tga b/third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Terrain.tga Binary files differindex 47d5117..47d5117 100644 --- a/third_party/gles_book_examples/Chapter_13/ProjectiveSpotlight/Terrain.tga +++ b/third_party/gles2_book/Chapter_13/ProjectiveSpotlight/Terrain.tga diff --git a/third_party/gles_book_examples/Chapter_15/Hello_Triangle_KD/Hello_Triangle_KD.c b/third_party/gles2_book/Chapter_15/Hello_Triangle_KD/Hello_Triangle_KD.c index 8477159..8477159 100644 --- a/third_party/gles_book_examples/Chapter_15/Hello_Triangle_KD/Hello_Triangle_KD.c +++ b/third_party/gles2_book/Chapter_15/Hello_Triangle_KD/Hello_Triangle_KD.c diff --git a/third_party/gles_book_examples/Chapter_2/Hello_Triangle/Hello_Triangle.c b/third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c index 6021f687..6021f687 100644 --- a/third_party/gles_book_examples/Chapter_2/Hello_Triangle/Hello_Triangle.c +++ b/third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.c diff --git a/third_party/gles_book_examples/Chapter_2/Hello_Triangle/Hello_Triangle.h b/third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h index 4e90d2f..4e90d2f 100644 --- a/third_party/gles_book_examples/Chapter_2/Hello_Triangle/Hello_Triangle.h +++ b/third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h diff --git a/third_party/gles_book_examples/Chapter_8/Simple_VertexShader/Simple_VertexShader.c b/third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c index ad6f188..ad6f188 100644 --- a/third_party/gles_book_examples/Chapter_8/Simple_VertexShader/Simple_VertexShader.c +++ b/third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.c diff --git a/third_party/gles_book_examples/Chapter_8/Simple_VertexShader/Simple_VertexShader.h b/third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.h index e3c8832..e3c8832 100644 --- a/third_party/gles_book_examples/Chapter_8/Simple_VertexShader/Simple_VertexShader.h +++ b/third_party/gles2_book/Chapter_8/Simple_VertexShader/Simple_VertexShader.h diff --git a/third_party/gles_book_examples/Chapter_9/MipMap2D/MipMap2D.c b/third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c index 47c2a563..47c2a563 100644 --- a/third_party/gles_book_examples/Chapter_9/MipMap2D/MipMap2D.c +++ b/third_party/gles2_book/Chapter_9/MipMap2D/MipMap2D.c diff --git a/third_party/gles_book_examples/Chapter_9/Simple_Texture2D/Simple_Texture2D.c b/third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c index 03d2a6c..03d2a6c 100644 --- a/third_party/gles_book_examples/Chapter_9/Simple_Texture2D/Simple_Texture2D.c +++ b/third_party/gles2_book/Chapter_9/Simple_Texture2D/Simple_Texture2D.c diff --git a/third_party/gles_book_examples/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c b/third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c index 691801f..691801f 100644 --- a/third_party/gles_book_examples/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c +++ b/third_party/gles2_book/Chapter_9/Simple_TextureCubemap/Simple_TextureCubemap.c diff --git a/third_party/gles_book_examples/Chapter_9/TextureWrap/TextureWrap.c b/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c index 2083819..2083819 100644 --- a/third_party/gles_book_examples/Chapter_9/TextureWrap/TextureWrap.c +++ b/third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c diff --git a/third_party/gles_book_examples/Common/Include/esUtil.h b/third_party/gles2_book/Common/Include/esUtil.h index a1a72c4..a1a72c4 100644 --- a/third_party/gles_book_examples/Common/Include/esUtil.h +++ b/third_party/gles2_book/Common/Include/esUtil.h diff --git a/third_party/gles_book_examples/Common/Include/esUtil_win.h b/third_party/gles2_book/Common/Include/esUtil_win.h index d7e4104..d7e4104 100644 --- a/third_party/gles_book_examples/Common/Include/esUtil_win.h +++ b/third_party/gles2_book/Common/Include/esUtil_win.h diff --git a/third_party/gles_book_examples/Common/Source/Win32/esUtil_TGA.c b/third_party/gles2_book/Common/Source/Win32/esUtil_TGA.c index 86a1f320..86a1f320 100644 --- a/third_party/gles_book_examples/Common/Source/Win32/esUtil_TGA.c +++ b/third_party/gles2_book/Common/Source/Win32/esUtil_TGA.c diff --git a/third_party/gles_book_examples/Common/Source/esShader.c b/third_party/gles2_book/Common/Source/esShader.c index 1e5c5e6..1e5c5e6 100644 --- a/third_party/gles_book_examples/Common/Source/esShader.c +++ b/third_party/gles2_book/Common/Source/esShader.c diff --git a/third_party/gles_book_examples/Common/Source/esShapes.c b/third_party/gles2_book/Common/Source/esShapes.c index ddb75c7..ddb75c7 100644 --- a/third_party/gles_book_examples/Common/Source/esShapes.c +++ b/third_party/gles2_book/Common/Source/esShapes.c diff --git a/third_party/gles_book_examples/Common/Source/esTransform.c b/third_party/gles2_book/Common/Source/esTransform.c index 91eef80..91eef80 100644 --- a/third_party/gles_book_examples/Common/Source/esTransform.c +++ b/third_party/gles2_book/Common/Source/esTransform.c diff --git a/third_party/gles_book_examples/Common/Source/esUtil.c b/third_party/gles2_book/Common/Source/esUtil.c index 7a9c9c5..7a9c9c5 100644 --- a/third_party/gles_book_examples/Common/Source/esUtil.c +++ b/third_party/gles2_book/Common/Source/esUtil.c diff --git a/third_party/gles_book_examples/README.TXT b/third_party/gles2_book/README.TXT index aeeac05..aeeac05 100644 --- a/third_party/gles_book_examples/README.TXT +++ b/third_party/gles2_book/README.TXT diff --git a/third_party/gles_book_examples/README.chromium b/third_party/gles2_book/README.chromium index 38aaad8..38aaad8 100644 --- a/third_party/gles_book_examples/README.chromium +++ b/third_party/gles2_book/README.chromium diff --git a/third_party/gles_book_examples/gles_book_examples.gyp b/third_party/gles2_book/gles_book_examples.gyp index 96a6673..96a6673 100644 --- a/third_party/gles_book_examples/gles_book_examples.gyp +++ b/third_party/gles2_book/gles_book_examples.gyp |