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

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

Issue 2410343002: [Reland] Add gl tests to make sure when a buffer is unmapped, all access path generates an INVALID_… (Closed)
Patch Set: Skip the test if context creation fails. Created 4 years, 2 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/program_manager.cc
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc
index 5e9f13934bfd2b57b96358ae809388580d80bdc6..042951c2551169fe1b870fa85ffa02623b21a195 100644
--- a/gpu/command_buffer/service/program_manager.cc
+++ b/gpu/command_buffer/service/program_manager.cc
@@ -339,6 +339,7 @@ Program::Program(ProgramManager* manager, GLuint service_id)
link_status_(false),
uniforms_cleared_(false),
transform_feedback_buffer_mode_(GL_NONE),
+ effective_transform_feedback_buffer_mode_(GL_NONE),
fragment_output_type_mask_(0u),
fragment_output_written_mask_(0u) {
DCHECK(manager_);
@@ -694,6 +695,9 @@ void Program::Update() {
UpdateVertexInputBaseTypes();
UpdateUniformBlockSizeInfo();
+ effective_transform_feedback_buffer_mode_ = transform_feedback_buffer_mode_;
+ effective_transform_feedback_varyings_ = transform_feedback_varyings_;
+
valid_ = true;
}
@@ -1326,8 +1330,8 @@ bool Program::Link(ShaderManager* manager,
attached_shaders_[0].get(),
attached_shaders_[1].get(),
&bind_attrib_location_map_,
- transform_feedback_varyings_,
- transform_feedback_buffer_mode_,
+ effective_transform_feedback_varyings_,
+ effective_transform_feedback_buffer_mode_,
shader_callback);
}
UMA_HISTOGRAM_CUSTOM_COUNTS(
« no previous file with comments | « gpu/command_buffer/service/program_manager.h ('k') | gpu/command_buffer/service/program_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698