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

Side by Side Diff: cc/test/fake_web_graphics_context_3d.cc

Issue 11782020: Refactor so chromium only GL extensions require gl2extchromium.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « cc/resource_provider_unittest.cc ('k') | cc/texture_uploader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 #include "cc/test/fake_web_graphics_context_3d.h" 5 #include "cc/test/fake_web_graphics_context_3d.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "gpu/GLES2/gl2extchromium.h"
11 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
12 #include "third_party/khronos/GLES2/gl2ext.h" 13 #include "third_party/khronos/GLES2/gl2ext.h"
13 14
14 using WebKit::WGC3Dboolean; 15 using WebKit::WGC3Dboolean;
15 using WebKit::WGC3Denum; 16 using WebKit::WGC3Denum;
16 using WebKit::WebGLId; 17 using WebKit::WebGLId;
17 using WebKit::WebGraphicsContext3D; 18 using WebKit::WebGraphicsContext3D;
18 19
19 namespace cc { 20 namespace cc {
20 21
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 } 408 }
408 409
409 WebKit::WebGLId FakeWebGraphicsContext3D::NextTextureId() { 410 WebKit::WebGLId FakeWebGraphicsContext3D::NextTextureId() {
410 WebGLId texture_id = next_texture_id_++; 411 WebGLId texture_id = next_texture_id_++;
411 DCHECK(texture_id < (1 << 16)); 412 DCHECK(texture_id < (1 << 16));
412 texture_id |= context_id_ << 16; 413 texture_id |= context_id_ << 16;
413 return texture_id; 414 return texture_id;
414 } 415 }
415 416
416 } // namespace cc 417 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resource_provider_unittest.cc ('k') | cc/texture_uploader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698