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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 10381137: Don't enable occlusion query on Linux with Intel drivers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 .RetiresOnSaturation(); 289 .RetiresOnSaturation();
290 290
291 EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE)) 291 EXPECT_CALL(*gl_, Enable(GL_VERTEX_PROGRAM_POINT_SIZE))
292 .Times(1) 292 .Times(1)
293 .RetiresOnSaturation(); 293 .RetiresOnSaturation();
294 294
295 EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE)) 295 EXPECT_CALL(*gl_, Enable(GL_POINT_SPRITE))
296 .Times(1) 296 .Times(1)
297 .RetiresOnSaturation(); 297 .RetiresOnSaturation();
298 298
299 #if defined(OS_MACOSX)
300 EXPECT_CALL(*gl_, GetString(GL_VENDOR))
301 .Times(1)
302 .RetiresOnSaturation();
303 #endif
304
305 EXPECT_CALL(*gl_, Viewport( 299 EXPECT_CALL(*gl_, Viewport(
306 kViewportX, kViewportY, kViewportWidth, kViewportHeight)) 300 kViewportX, kViewportY, kViewportWidth, kViewportHeight))
307 .Times(1) 301 .Times(1)
308 .RetiresOnSaturation(); 302 .RetiresOnSaturation();
309 303
310 static GLint max_viewport_dims[] = { 304 static GLint max_viewport_dims[] = {
311 kMaxViewportWidth, 305 kMaxViewportWidth,
312 kMaxViewportHeight 306 kMaxViewportHeight
313 }; 307 };
314 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_VIEWPORT_DIMS, _)) 308 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_VIEWPORT_DIMS, _))
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 num_vertices, buffer_id, GL_NO_ERROR); 1311 num_vertices, buffer_id, GL_NO_ERROR);
1318 } 1312 }
1319 1313
1320 void GLES2DecoderWithShaderTestBase::SetUp() { 1314 void GLES2DecoderWithShaderTestBase::SetUp() {
1321 GLES2DecoderTestBase::SetUp(); 1315 GLES2DecoderTestBase::SetUp();
1322 SetupDefaultProgram(); 1316 SetupDefaultProgram();
1323 } 1317 }
1324 1318
1325 } // namespace gles2 1319 } // namespace gles2
1326 } // namespace gpu 1320 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698