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

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

Issue 1505343003: Updating texture validation to account for sampler objects in ES3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed DCHECK that was causing bots to fail 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/common/sync_token.h" 5 #include "gpu/command_buffer/common/sync_token.h"
6 #include "gpu/command_buffer/service/feature_info.h" 6 #include "gpu/command_buffer/service/feature_info.h"
7 #include "gpu/command_buffer/service/gpu_service_test.h" 7 #include "gpu/command_buffer/service/gpu_service_test.h"
8 #include "gpu/command_buffer/service/mailbox_manager_impl.h" 8 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
9 #include "gpu/command_buffer/service/mailbox_manager_sync.h" 9 #include "gpu/command_buffer/service/mailbox_manager_sync.h"
10 #include "gpu/command_buffer/service/texture_manager.h" 10 #include "gpu/command_buffer/service/texture_manager.h"
(...skipping 28 matching lines...) Expand all
39 virtual void SetUpWithSynchronizer() { 39 virtual void SetUpWithSynchronizer() {
40 GpuServiceTest::SetUp(); 40 GpuServiceTest::SetUp();
41 feature_info_ = new FeatureInfo; 41 feature_info_ = new FeatureInfo;
42 manager_ = new MailboxManagerSync(); 42 manager_ = new MailboxManagerSync();
43 DCHECK(manager_->UsesSync()); 43 DCHECK(manager_->UsesSync());
44 } 44 }
45 45
46 void TearDown() override { GpuServiceTest::TearDown(); } 46 void TearDown() override { GpuServiceTest::TearDown(); }
47 47
48 Texture* CreateTexture() { 48 Texture* CreateTexture() {
49 return new Texture(1); 49 return new Texture(1, false);
50 } 50 }
51 51
52 void SetTarget(Texture* texture, GLenum target, GLuint max_level) { 52 void SetTarget(Texture* texture, GLenum target, GLuint max_level) {
53 texture->SetTarget(NULL, target, max_level); 53 texture->SetTarget(NULL, target, max_level);
54 } 54 }
55 55
56 void SetLevelInfo(Texture* texture, 56 void SetLevelInfo(Texture* texture,
57 GLenum target, 57 GLenum target,
58 GLint level, 58 GLint level,
59 GLenum internal_format, 59 GLenum internal_format,
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 DestroyTexture(texture2); 687 DestroyTexture(texture2);
688 DestroyTexture(new_texture); 688 DestroyTexture(new_texture);
689 } 689 }
690 690
691 // TODO: Texture::level_infos_[][].size() 691 // TODO: Texture::level_infos_[][].size()
692 692
693 // TODO: unsupported targets and formats 693 // TODO: unsupported targets and formats
694 694
695 } // namespace gles2 695 } // namespace gles2
696 } // namespace gpu 696 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698