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

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

Issue 1013463003: Update from https://crrev.com/320931 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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
Index: gpu/command_buffer/service/memory_program_cache.cc
diff --git a/gpu/command_buffer/service/memory_program_cache.cc b/gpu/command_buffer/service/memory_program_cache.cc
index 16509e5ee3a182b0bd26329bdea4fd35afc43690..cf3b0ca7d8d12d1478bebf4f8be1f7311b4efd2d 100644
--- a/gpu/command_buffer/service/memory_program_cache.cc
+++ b/gpu/command_buffer/service/memory_program_cache.cc
@@ -174,6 +174,8 @@ ProgramCache::ProgramLoadResult MemoryProgramCache::LoadLinkedProgram(
Shader* shader_a,
Shader* shader_b,
const LocationMap* bind_attrib_location_map,
+ const std::vector<std::string>& transform_feedback_varyings,
+ GLenum transform_feedback_buffer_mode,
const ShaderCacheCallback& shader_callback) {
char a_sha[kHashLength];
char b_sha[kHashLength];
@@ -188,6 +190,8 @@ ProgramCache::ProgramLoadResult MemoryProgramCache::LoadLinkedProgram(
ComputeProgramHash(a_sha,
b_sha,
bind_attrib_location_map,
+ transform_feedback_varyings,
+ transform_feedback_buffer_mode,
sha);
const std::string sha_string(sha, kHashLength);
@@ -234,6 +238,8 @@ void MemoryProgramCache::SaveLinkedProgram(
const Shader* shader_a,
const Shader* shader_b,
const LocationMap* bind_attrib_location_map,
+ const std::vector<std::string>& transform_feedback_varyings,
+ GLenum transform_feedback_buffer_mode,
const ShaderCacheCallback& shader_callback) {
GLenum format;
GLsizei length = 0;
@@ -262,6 +268,8 @@ void MemoryProgramCache::SaveLinkedProgram(
ComputeProgramHash(a_sha,
b_sha,
bind_attrib_location_map,
+ transform_feedback_varyings,
+ transform_feedback_buffer_mode,
sha);
const std::string sha_string(sha, sizeof(sha));
« no previous file with comments | « gpu/command_buffer/service/memory_program_cache.h ('k') | gpu/command_buffer/service/memory_program_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698