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

Unified Diff: gpu/command_buffer/service/program_manager.h

Issue 6242006: Fix for gl programs. An unsuccessful link should report... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/program_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/program_manager.h
===================================================================
--- gpu/command_buffer/service/program_manager.h (revision 71466)
+++ gpu/command_buffer/service/program_manager.h (working copy)
@@ -75,9 +75,6 @@
return sampler_indices_;
}
- // Resets the program after an unsuccessful link.
- void Reset();
-
// Updates the program info after a successful link.
void Update();
@@ -131,6 +128,10 @@
return valid_;
}
+ void ClearLinkStatus() {
+ link_status_ = false;
+ }
+
bool AttachShader(ShaderManager* manager, ShaderManager::ShaderInfo* info);
void DetachShader(ShaderManager* manager, ShaderManager::ShaderInfo* info);
@@ -169,6 +170,9 @@
service_id_ = 0;
}
+ // Resets the program.
+ void Reset();
+
const UniformInfo* AddUniformInfo(
GLsizei size, GLenum type, GLint location, const std::string& name);
@@ -205,9 +209,12 @@
// Shaders by type of shader.
ShaderManager::ShaderInfo::Ref attached_shaders_[kMaxAttachedShaders];
- // This is true if glLinkProgram was successful.
+ // This is true if glLinkProgram was successful at least once.
bool valid_;
+ // This is true if glLinkProgram was successful last time it was called.
+ bool link_status_;
+
// Log info
std::string log_info_;
};
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/program_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698