diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 21:50:45 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 21:50:45 +0000 |
| commit | 3094c2a91ec28e469b35025ac535279a6d7b765f (patch) | |
| tree | 40c84c847de7e1a034a95c6fb00e63f7a571bb13 /gpu | |
| parent | fe534f020d93a61ed8b51dd16b121b6855642807 (diff) | |
| download | chromium_src-3094c2a91ec28e469b35025ac535279a6d7b765f.zip chromium_src-3094c2a91ec28e469b35025ac535279a6d7b765f.tar.gz chromium_src-3094c2a91ec28e469b35025ac535279a6d7b765f.tar.bz2 | |
Changed angleproject to angle due to name change.
Review URL: http://codereview.chromium.org/1712020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/DEPS | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 2 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 14 |
3 files changed, 9 insertions, 9 deletions
@@ -1,6 +1,6 @@ include_rules = [ "+webkit/glue/plugins", - "+third_party/angleproject", + "+third_party/angle", "+third_party/npapi", "+../command_buffer", "+../client", diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index fc9032a..b54c16c 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -35,7 +35,7 @@ // as soon as translator is ready. //#define GLES2_GPU_SERVICE_TRANSLATE_SHADER #if defined(GLES2_GPU_SERVICE_TRANSLATE_SHADER) -#include "third_party/angleproject/include/GLSLANG/ShaderLang.h" +#include "third_party/angle/include/GLSLANG/ShaderLang.h" #endif // GLES2_GPU_SERVICE_TRANSLATE_SHADER #if !defined(GL_DEPTH24_STENCIL8) diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index d8adaba..64490bf 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -293,13 +293,13 @@ ], #TODO(alokp): Remove os-conditional when translator_glsl starts #compiling on all platforms. - #['OS == "win"', - # { - # 'dependencies': [ - # '../third_party/angleproject/src/build_angle.gyp:translator_glsl', - # ], - # }, - #], + ['OS == "win"', + { + 'dependencies': [ + '../third_party/angle/src/build_angle.gyp:translator_glsl', + ], + }, + ], ], }, { |