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

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

Issue 262793002: Revert of Optimize GLES2DecoderImpl::ApplyDirtyState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "gpu/command_buffer/common/gles2_cmd_format.h" 7 #include "gpu/command_buffer/common/gles2_cmd_format.h"
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
10 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 10 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
(...skipping 19 matching lines...) Expand all
30 namespace { 30 namespace {
31 void ShaderCacheCb(const std::string& key, const std::string& shader) { 31 void ShaderCacheCb(const std::string& key, const std::string& shader) {
32 } 32 }
33 } // namespace 33 } // namespace
34 34
35 class GLES2DecoderTest1 : public GLES2DecoderTestBase { 35 class GLES2DecoderTest1 : public GLES2DecoderTestBase {
36 public: 36 public:
37 GLES2DecoderTest1() { } 37 GLES2DecoderTest1() { }
38 }; 38 };
39 39
40 INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest1, ::testing::Bool());
41
42 template <> 40 template <>
43 void GLES2DecoderTestBase::SpecializedSetup<cmds::GenerateMipmap, 0>( 41 void GLES2DecoderTestBase::SpecializedSetup<cmds::GenerateMipmap, 0>(
44 bool valid) { 42 bool valid) {
45 DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId); 43 DoBindTexture(GL_TEXTURE_2D, client_texture_id_, kServiceTextureId);
46 DoTexImage2D( 44 DoTexImage2D(
47 GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, 45 GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE,
48 kSharedMemoryId, kSharedMemoryOffset); 46 kSharedMemoryId, kSharedMemoryOffset);
49 if (valid) { 47 if (valid) {
50 EXPECT_CALL(*gl_, GetError()) 48 EXPECT_CALL(*gl_, GetError())
51 .WillOnce(Return(GL_NO_ERROR)) 49 .WillOnce(Return(GL_NO_ERROR))
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 .WillOnce(Return(GL_NO_ERROR)) 271 .WillOnce(Return(GL_NO_ERROR))
274 .RetiresOnSaturation(); 272 .RetiresOnSaturation();
275 } 273 }
276 }; 274 };
277 275
278 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" 276 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"
279 277
280 } // namespace gles2 278 } // namespace gles2
281 } // namespace gpu 279 } // namespace gpu
282 280
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698