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

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

Issue 1498033003: Implement SamplerManager in the command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed problem zmo@ pointed out Created 5 years 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
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 #include <vector> 9 #include <vector>
10 10
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 : 0)) 307 : 0))
308 .Times(1) 308 .Times(1)
309 .RetiresOnSaturation(); 309 .RetiresOnSaturation();
310 EXPECT_CALL( 310 EXPECT_CALL(
311 *gl_, 311 *gl_,
312 BindTexture( 312 BindTexture(
313 GL_TEXTURE_2D, 313 GL_TEXTURE_2D,
314 use_default_textures ? TestHelper::kServiceDefaultTexture2dId : 0)) 314 use_default_textures ? TestHelper::kServiceDefaultTexture2dId : 0))
315 .Times(1) 315 .Times(1)
316 .RetiresOnSaturation(); 316 .RetiresOnSaturation();
317
318 if (group_->feature_info()->feature_flags().enable_samplers) {
319 EXPECT_CALL(*gl_,
320 BindSampler(tt, 0))
321 .Times(1)
322 .RetiresOnSaturation();
323 }
317 } 324 }
318 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0)) 325 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0))
319 .Times(1) 326 .Times(1)
320 .RetiresOnSaturation(); 327 .RetiresOnSaturation();
321 328
322 EXPECT_CALL(*gl_, BindFramebufferEXT(GL_FRAMEBUFFER, 0)) 329 EXPECT_CALL(*gl_, BindFramebufferEXT(GL_FRAMEBUFFER, 0))
323 .Times(1) 330 .Times(1)
324 .RetiresOnSaturation(); 331 .RetiresOnSaturation();
325 EXPECT_CALL(*gl_, GetIntegerv(GL_ALPHA_BITS, _)) 332 EXPECT_CALL(*gl_, GetIntegerv(GL_ALPHA_BITS, _))
326 .WillOnce(SetArgumentPointee<1>(normalized_init.has_alpha ? 8 : 0)) 333 .WillOnce(SetArgumentPointee<1>(normalized_init.has_alpha ? 8 : 0))
(...skipping 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after
1906 SetupDefaultProgram(); 1913 SetupDefaultProgram();
1907 } 1914 }
1908 1915
1909 // Include the auto-generated part of this file. We split this because it means 1916 // Include the auto-generated part of this file. We split this because it means
1910 // we can easily edit the non-auto generated parts right here in this file 1917 // we can easily edit the non-auto generated parts right here in this file
1911 // instead of having to edit some template or the code generator. 1918 // instead of having to edit some template or the code generator.
1912 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 1919 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
1913 1920
1914 } // namespace gles2 1921 } // namespace gles2
1915 } // namespace gpu 1922 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698