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

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

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/memory_program_cache.h" 5 #include "gpu/command_buffer/service/memory_program_cache.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "gpu/command_buffer/common/gles2_cmd_format.h" 8 #include "gpu/command_buffer/common/gles2_cmd_format.h"
9 #include "gpu/command_buffer/service/gl_utils.h" 9 #include "gpu/command_buffer/service/gl_utils.h"
10 #include "gpu/command_buffer/service/gpu_service_test.h" 10 #include "gpu/command_buffer/service/gpu_service_test.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void ShaderCacheCb(const std::string& key, const std::string& shader) { 79 void ShaderCacheCb(const std::string& key, const std::string& shader) {
80 shader_cache_count_++; 80 shader_cache_count_++;
81 shader_cache_shader_ = shader; 81 shader_cache_shader_ = shader;
82 } 82 }
83 83
84 int32 shader_cache_count() { return shader_cache_count_; } 84 int32 shader_cache_count() { return shader_cache_count_; }
85 const std::string& shader_cache_shader() { return shader_cache_shader_; } 85 const std::string& shader_cache_shader() { return shader_cache_shader_; }
86 86
87 protected: 87 protected:
88 void SetUp() override { 88 void SetUp() override {
89 GpuServiceTest::SetUp(); 89 GpuServiceTest::SetUpWithGLVersion("3.0", "GL_ARB_get_program_binary");
90 90
91 vertex_shader_ = shader_manager_.CreateShader(kVertexShaderClientId, 91 vertex_shader_ = shader_manager_.CreateShader(kVertexShaderClientId,
92 kVertexShaderServiceId, 92 kVertexShaderServiceId,
93 GL_VERTEX_SHADER); 93 GL_VERTEX_SHADER);
94 fragment_shader_ = shader_manager_.CreateShader( 94 fragment_shader_ = shader_manager_.CreateShader(
95 kFragmentShaderClientId, 95 kFragmentShaderClientId,
96 kFragmentShaderServiceId, 96 kFragmentShaderServiceId,
97 GL_FRAGMENT_SHADER); 97 GL_FRAGMENT_SHADER);
98 ASSERT_TRUE(vertex_shader_ != NULL); 98 ASSERT_TRUE(vertex_shader_ != NULL);
99 ASSERT_TRUE(fragment_shader_ != NULL); 99 ASSERT_TRUE(fragment_shader_ != NULL);
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 NULL, 622 NULL,
623 fragment_shader_, 623 fragment_shader_,
624 NULL, 624 NULL,
625 NULL, 625 NULL,
626 base::Bind(&MemoryProgramCacheTest::ShaderCacheCb, 626 base::Bind(&MemoryProgramCacheTest::ShaderCacheCb,
627 base::Unretained(this)))); 627 base::Unretained(this))));
628 } 628 }
629 629
630 } // namespace gles2 630 } // namespace gles2
631 } // namespace gpu 631 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/mailbox_manager_unittest.cc ('k') | gpu/command_buffer/service/memory_tracking.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698