| Index: gpu/command_buffer/service/context_state.cc
|
| diff --git a/gpu/command_buffer/service/context_state.cc b/gpu/command_buffer/service/context_state.cc
|
| index f91e8ccb9b1582e805a0ce9986b3954ba9768d96..da631aa56e333574bfe6bfe97bdeb645b794b7bf 100644
|
| --- a/gpu/command_buffer/service/context_state.cc
|
| +++ b/gpu/command_buffer/service/context_state.cc
|
| @@ -14,6 +14,7 @@
|
| #include "gpu/command_buffer/service/framebuffer_manager.h"
|
| #include "gpu/command_buffer/service/program_manager.h"
|
| #include "gpu/command_buffer/service/renderbuffer_manager.h"
|
| +#include "gpu/command_buffer/service/transform_feedback_manager.h"
|
| #include "ui/gl/gl_bindings.h"
|
| #include "ui/gl/gl_implementation.h"
|
| #include "ui/gl/gl_version_info.h"
|
| @@ -293,6 +294,25 @@ void ContextState::RestoreProgramBindings() const {
|
| glUseProgram(current_program.get() ? current_program->service_id() : 0);
|
| }
|
|
|
| +void ContextState::RestoreTransformFeedbackBindings(
|
| + const ContextState* prev_state) {
|
| + if (!feature_info_->IsES3Capable())
|
| + return;
|
| + if (prev_state) {
|
| + if (prev_state->bound_transform_feedback.get() &&
|
| + prev_state->bound_transform_feedback->active() &&
|
| + !prev_state->bound_transform_feedback->paused()) {
|
| + glPauseTransformFeedback();
|
| + }
|
| + }
|
| + if (bound_transform_feedback.get()) {
|
| + bound_transform_feedback->DoBindTransformFeedback(
|
| + feature_info_->gl_version_info(), GL_TRANSFORM_FEEDBACK);
|
| + } else {
|
| + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
|
| + }
|
| +}
|
| +
|
| void ContextState::RestoreActiveTexture() const {
|
| glActiveTexture(GL_TEXTURE0 + active_texture_unit);
|
| }
|
| @@ -426,6 +446,7 @@ void ContextState::RestoreState(const ContextState* prev_state) {
|
| RestoreBufferBindings();
|
| RestoreRenderbufferBindings();
|
| RestoreProgramBindings();
|
| + RestoreTransformFeedbackBindings(prev_state);
|
| RestoreGlobalState(prev_state);
|
| }
|
|
|
| @@ -528,6 +549,9 @@ void ContextState::RemoveBoundBuffer(Buffer* buffer) {
|
| if (bound_uniform_buffer.get() == buffer) {
|
| bound_uniform_buffer = nullptr;
|
| }
|
| + if (default_transform_feedback.get()) {
|
| + default_transform_feedback->RemoveBoundBuffer(buffer);
|
| + }
|
| }
|
|
|
| void ContextState::UnbindTexture(TextureRef* texture) {
|
|
|