Temporarily disable the GPU program cache.

We should give the app layer more control over the cache before we enable it, to save on memory usage in Chrome. BUG=angleproject:1897 Change-Id: I532c05c3042cb0a2d9c62f362f25d6064042ca2c Reviewed-on: https://chromium-review.googlesource.com/558370 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Temporarily disable the GPU program cache.
a5822b8a · Jamie Madill · Commit Bot · 27a60631 · a5822b8a · a5822b8a
Commit a5822b8a authored Jun 30, 2017 by Jamie Madill Committed by Commit Bot Jul 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 9 deletions

Constants.h src/libANGLE/Constants.h +9 -6

Display.cpp src/libANGLE/Display.cpp +5 -3

No files found.
--- a/src/libANGLE/Constants.h
+++ b/src/libANGLE/Constants.h
@@ -15,12 +15,15 @@ namespace gl
 {
 // The size to set for the program cache for default and low-end device cases.
-#if !defined(ANGLE_PLATFORM_ANDROID)
+// Temporarily disabled to prevent double memory use in Chrome.
-const size_t kDefaultMaxProgramCacheMemoryBytes = 6 * 1024 * 1024;
+// TODO(jmadill): Re-enable once we have memory cache control.
-#else
+//#if !defined(ANGLE_PLATFORM_ANDROID)
-const size_t kDefaultMaxProgramCacheMemoryBytes = 2 * 1024 * 1024;
+// const size_t kDefaultMaxProgramCacheMemoryBytes = 6 * 1024 * 1024;
-const size_t kLowEndMaxProgramCacheMemoryBytes  = 512 * 1024;
+//#else
-#endif
+// const size_t kDefaultMaxProgramCacheMemoryBytes = 2 * 1024 * 1024;
+// const size_t kLowEndMaxProgramCacheMemoryBytes  = 512 * 1024;
+//#endif
+const size_t kDefaultMaxProgramCacheMemoryBytes = 0;
 enum
 {

--- a/src/libANGLE/Display.cpp
+++ b/src/libANGLE/Display.cpp
@@ -741,9 +741,11 @@ Error Display::createContext(const Config *configuration,
        shareTextures = mTextureManager;
    }
-    gl::Context *context = new gl::Context(mImplementation, configuration, shareContext,
+    // Memory cache temporarily disabled to prevent double memory use in Chrome.
-                                           shareTextures, &mMemoryProgramCache, attribs,
+    // TODO(jmadill): Re-enable once we have memory cache control.
-                                           mDisplayExtensions, isRobustResourceInitEnabled());
+    gl::Context *context =
+        new gl::Context(mImplementation, configuration, shareContext, shareTextures, nullptr,
+                        attribs, mDisplayExtensions, isRobustResourceInitEnabled());
    ASSERT(context != nullptr);
    mContextSet.insert(context);