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

Side by Side Diff: gpu/command_buffer/tests/gl_texture_mailbox_unittests.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 | « gpu/command_buffer/tests/gl_query_unittests.cc ('k') | third_party/khronos/GLES2/gl2ext.h » ('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 (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 #include <GLES2/gl2.h> 5 #include <GLES2/gl2.h>
6 #include <GLES2/gl2ext.h> 6 #include <GLES2/gl2ext.h>
7 #include <GLES2/gl2extchromium.h>
7 8
8 #include "gpu/command_buffer/service/mailbox_manager.h" 9 #include "gpu/command_buffer/service/mailbox_manager.h"
9 #include "gpu/command_buffer/tests/gl_manager.h" 10 #include "gpu/command_buffer/tests/gl_manager.h"
10 #include "testing/gmock/include/gmock/gmock.h" 11 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/gl/gl_share_group.h" 13 #include "ui/gl/gl_share_group.h"
13 14
14 namespace gpu { 15 namespace gpu {
15 16
16 namespace { 17 namespace {
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 glConsumeTextureCHROMIUM(GL_TEXTURE_2D, invalid_mailbox); 155 glConsumeTextureCHROMIUM(GL_TEXTURE_2D, invalid_mailbox);
155 EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError()); 156 EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
156 157
157 // Ensure level 0 is still intact after glConsumeTextureCHROMIUM fails. 158 // Ensure level 0 is still intact after glConsumeTextureCHROMIUM fails.
158 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError()); 159 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
159 EXPECT_EQ(source_pixel, ReadTexel(tex, 0, 0)); 160 EXPECT_EQ(source_pixel, ReadTexel(tex, 0, 0));
160 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError()); 161 EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
161 } 162 }
162 } // namespace gpu 163 } // namespace gpu
163 164
OLDNEW
« no previous file with comments | « gpu/command_buffer/tests/gl_query_unittests.cc ('k') | third_party/khronos/GLES2/gl2ext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698