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

Unified Diff: gpu/command_buffer/service/query_manager_unittest.cc

Issue 1871613002: Compute GpuDriverBugWorkarounds only one time in the GPU process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/query_manager_unittest.cc
diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc
index 8f61ff22bd606af859e2ab3bfcc4e5985b91917d..dfe901133588a9aa1023eb47d649a016b6897027 100644
--- a/gpu/command_buffer/service/query_manager_unittest.cc
+++ b/gpu/command_buffer/service/query_manager_unittest.cc
@@ -46,6 +46,7 @@ class QueryManagerTest : public GpuServiceTest {
protected:
void SetUp() override {
+ GpuDriverBugWorkarounds::Initialize(gpu_driver_bug_workarounds_);
GpuServiceTest::SetUpWithGLVersion("3.2",
"GL_ARB_occlusion_query, "
"GL_ARB_timer_query");
@@ -68,7 +69,8 @@ class QueryManagerTest : public GpuServiceTest {
gl_.get(), extension_expectations);
EXPECT_CALL(*decoder_.get(), GetGLContext())
.WillRepeatedly(Return(GetGLContext()));
- scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> feature_info(
+ new FeatureInfo(gpu_driver_bug_workarounds_));
feature_info->InitializeForTesting();
manager_.reset(new QueryManager(decoder_.get(), feature_info.get()));
}
@@ -508,7 +510,8 @@ TEST_F(QueryManagerTest, ARBOcclusionQuery2) {
TestHelper::SetupFeatureInfoInitExpectations(
gl_.get(),
"GL_ARB_occlusion_query2");
- scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> feature_info(
+ new FeatureInfo(gpu_driver_bug_workarounds_));
feature_info->InitializeForTesting();
scoped_ptr<QueryManager> manager(
new QueryManager(decoder_.get(), feature_info.get()));
@@ -542,7 +545,8 @@ TEST_F(QueryManagerTest, ARBOcclusionQuery) {
TestHelper::SetupFeatureInfoInitExpectations(
gl_.get(),
"GL_ARB_occlusion_query");
- scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> feature_info(
+ new FeatureInfo(gpu_driver_bug_workarounds_));
feature_info->InitializeForTesting();
scoped_ptr<QueryManager> manager(
new QueryManager(decoder_.get(), feature_info.get()));
@@ -575,7 +579,8 @@ TEST_F(QueryManagerTest, ARBOcclusionPauseResume) {
TestHelper::SetupFeatureInfoInitExpectations(
gl_.get(),
"GL_ARB_occlusion_query");
- scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> feature_info(
+ new FeatureInfo(gpu_driver_bug_workarounds_));
feature_info->InitializeForTesting();
scoped_ptr<QueryManager> manager(
new QueryManager(decoder_.get(), feature_info.get()));
@@ -918,7 +923,9 @@ TEST_F(QueryManagerTest, GetErrorQuery) {
const base::subtle::Atomic32 kSubmitCount = 123;
TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), "");
- scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> feature_info(
+ new FeatureInfo(gpu_driver_bug_workarounds_));
+
feature_info->InitializeForTesting();
scoped_ptr<QueryManager> manager(
new QueryManager(decoder_.get(), feature_info.get()));

Powered by Google App Engine
This is Rietveld 408576698