diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 22:53:01 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 22:53:01 +0000 |
| commit | c91dc7211289405fe6ca2593fcd209cf9179d46c (patch) | |
| tree | 73a96c65189447187684d09ef16bcad4026ee019 /gpu | |
| parent | dd946bb05f5ec8c5c70f2c7ce6a5ffb8fe6cd4ad (diff) | |
| download | chromium_src-c91dc7211289405fe6ca2593fcd209cf9179d46c.zip chromium_src-c91dc7211289405fe6ca2593fcd209cf9179d46c.tar.gz chromium_src-c91dc7211289405fe6ca2593fcd209cf9179d46c.tar.bz2 | |
Make it possible to switch between two different versions of ANGLE.
One is the existing one and the default with this patch: third_party/angle.
The other is third_party/angle_dx11, which will pulled in via DEPS in another patch.
BUG=247158
TBR=xhwang@chromium.org
Review URL: https://codereview.chromium.org/16737007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/DEPS | 1 | ||||
| -rw-r--r-- | gpu/command_buffer/service/shader_translator.h | 5 | ||||
| -rw-r--r-- | gpu/command_buffer/service/shader_translator_cache.h | 5 | ||||
| -rw-r--r-- | gpu/command_buffer_service.gypi | 2 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 4 |
5 files changed, 14 insertions, 3 deletions
@@ -1,6 +1,7 @@ include_rules = [ "+native_client/src/include", "+third_party/angle", + "+third_party/angle_dx11", "+third_party/amd", "+third_party/re2", "+third_party/smhasher", diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h index 32097e2..dda9556 100644 --- a/gpu/command_buffer/service/shader_translator.h +++ b/gpu/command_buffer/service/shader_translator.h @@ -13,7 +13,12 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "gpu/gpu_export.h" + +#if defined(ANGLE_DX11) +#include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h" +#else #include "third_party/angle/include/GLSLANG/ShaderLang.h" +#endif namespace gpu { namespace gles2 { diff --git a/gpu/command_buffer/service/shader_translator_cache.h b/gpu/command_buffer/service/shader_translator_cache.h index 1fbf98d..a1057c5 100644 --- a/gpu/command_buffer/service/shader_translator_cache.h +++ b/gpu/command_buffer/service/shader_translator_cache.h @@ -12,7 +12,12 @@ #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "gpu/command_buffer/service/shader_translator.h" + +#if defined(ANGLE_DX11) +#include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h" +#else #include "third_party/angle/include/GLSLANG/ShaderLang.h" +#endif namespace gpu { namespace gles2 { diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi index 87b3999..5ac5388 100644 --- a/gpu/command_buffer_service.gypi +++ b/gpu/command_buffer_service.gypi @@ -18,7 +18,7 @@ '../ui/gl/gl.gyp:gl', '../ui/surface/surface.gyp:surface', '../ui/ui.gyp:ui', - '../third_party/angle/src/build_angle.gyp:translator_glsl', + '<(angle_path)/src/build_angle.gyp:translator_glsl', '../third_party/khronos/khronos.gyp:khronos_headers', '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/smhasher/smhasher.gyp:cityhash', diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index bd6abb0..2a04a37 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -121,7 +121,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '../third_party/angle/src/build_angle.gyp:translator_glsl', + '<(angle_path)/src/build_angle.gyp:translator_glsl', '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', 'command_buffer/command_buffer.gyp:gles2_utils', @@ -248,7 +248,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '../third_party/angle/src/build_angle.gyp:translator_glsl', + '<(angle_path)/src/build_angle.gyp:translator_glsl', '../ui/ui.gyp:ui', 'command_buffer/command_buffer.gyp:gles2_utils', 'command_buffer_client', |