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

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

Issue 2744363002: Clear shader disk cache after glProgramBinary failure. (Closed)
Patch Set: Remove singleton and clean up init Created 3 years, 9 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
« no previous file with comments | « gpu/command_buffer/service/memory_program_cache.cc ('k') | gpu/ipc/host/shader_disk_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/memory_program_cache_unittest.cc
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc
index b6e157730c3b71b3a6970e36de4b962599d1fbb3..61726ed969b87ace34f9af2e1383d1e044d73f0f 100644
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc
@@ -10,6 +10,7 @@
#include <memory>
#include "base/bind.h"
+#include "gpu/command_buffer/common/activity_flags.h"
#include "gpu/command_buffer/common/gles2_cmd_format.h"
#include "gpu/command_buffer/service/gl_utils.h"
#include "gpu/command_buffer/service/gpu_service_test.h"
@@ -77,8 +78,10 @@ class MemoryProgramCacheTest : public GpuServiceTest {
static const GLuint kFragmentShaderServiceId = 100;
MemoryProgramCacheTest()
- : cache_(new MemoryProgramCache(kCacheSizeBytes, kDisableGpuDiskCache,
- kDisableCachingForTransformFeedback)),
+ : cache_(new MemoryProgramCache(kCacheSizeBytes,
+ kDisableGpuDiskCache,
+ kDisableCachingForTransformFeedback,
+ &activity_flags_)),
shader_manager_(nullptr),
vertex_shader_(nullptr),
fragment_shader_(nullptr),
@@ -186,6 +189,7 @@ class MemoryProgramCacheTest : public GpuServiceTest {
.WillOnce(SetArgPointee<2>(GL_FALSE));
}
+ GpuProcessActivityFlags activity_flags_;
std::unique_ptr<MemoryProgramCache> cache_;
ShaderManager shader_manager_;
Shader* vertex_shader_;
@@ -551,8 +555,8 @@ TEST_F(MemoryProgramCacheTest, LoadFailIfTransformFeedbackCachingDisabled) {
// Forcibly reset the program cache so we can disable caching of
// programs which include transform feedback varyings.
- cache_.reset(new MemoryProgramCache(
- kCacheSizeBytes, kDisableGpuDiskCache, true));
+ cache_.reset(new MemoryProgramCache(kCacheSizeBytes, kDisableGpuDiskCache,
+ true, &activity_flags_));
varyings_.push_back("test");
cache_->SaveLinkedProgram(kProgramId,
vertex_shader_,
« no previous file with comments | « gpu/command_buffer/service/memory_program_cache.cc ('k') | gpu/ipc/host/shader_disk_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698