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 /content/browser/gpu/gpu_internals_ui.cc | |
| 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 'content/browser/gpu/gpu_internals_ui.cc')
| -rw-r--r-- | content/browser/gpu/gpu_internals_ui.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index 4c1d355..9785248 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc @@ -29,7 +29,13 @@ #include "gpu/config/gpu_feature_type.h" #include "gpu/config/gpu_info.h" #include "grit/content_resources.h" + + +#if defined(ANGLE_DX11) +#include "third_party/angle_dx11/src/common/version.h" +#else #include "third_party/angle/src/common/version.h" +#endif namespace content { namespace { |