Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Side by Side Diff: webkit/common/gpu/webgraphicscontext3d_in_process_impl.h

Issue 16737007: Make it possible to switch between two different versions of ANGLE. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ 5 #ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
6 #define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ 6 #define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/containers/hash_tables.h" 12 #include "base/containers/hash_tables.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" 14 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
15 #include "third_party/WebKit/public/platform/WebString.h" 15 #include "third_party/WebKit/public/platform/WebString.h"
16
17 #if defined(ANGLE_DX11)
18 #include "third_party/angle_dx11/include/GLSLANG/ShaderLang.h"
19 #else
16 #include "third_party/angle/include/GLSLANG/ShaderLang.h" 20 #include "third_party/angle/include/GLSLANG/ShaderLang.h"
21 #endif
22
17 #include "ui/gfx/native_widget_types.h" 23 #include "ui/gfx/native_widget_types.h"
18 #include "webkit/common/gpu/webkit_gpu_export.h" 24 #include "webkit/common/gpu/webkit_gpu_export.h"
19 25
20 namespace gfx { 26 namespace gfx {
21 class GLContext; 27 class GLContext;
22 class GLSurface; 28 class GLSurface;
23 class GLShareGroup; 29 class GLShareGroup;
24 } 30 }
25 31
26 using WebKit::WGC3Dbyte; 32 using WebKit::WGC3Dbyte;
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 ShaderSourceMap shader_source_map_; 569 ShaderSourceMap shader_source_map_;
564 570
565 ShHandle fragment_compiler_; 571 ShHandle fragment_compiler_;
566 ShHandle vertex_compiler_; 572 ShHandle vertex_compiler_;
567 }; 573 };
568 574
569 } // namespace gpu 575 } // namespace gpu
570 } // namespace webkit 576 } // namespace webkit
571 577
572 #endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ 578 #endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_
OLDNEW
« content/DEPS ('K') | « webkit/DEPS ('k') | webkit/common/gpu/webkit_gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698