| Index: gpu/command_buffer/service/context_state.h
|
| diff --git a/gpu/command_buffer/service/context_state.h b/gpu/command_buffer/service/context_state.h
|
| index b0eeb7b6a1c4952ca5ce1de88800dc3d2a807441..c2479cba2137996bf278057050697c2cab2ba4dd 100644
|
| --- a/gpu/command_buffer/service/context_state.h
|
| +++ b/gpu/command_buffer/service/context_state.h
|
| @@ -98,18 +98,19 @@ struct GPU_EXPORT ContextState {
|
|
|
| void Initialize();
|
|
|
| - void RestoreState() const;
|
| + void RestoreState(const ContextState* prev_state) const;
|
| void InitCapabilities() const;
|
| void InitState() const;
|
|
|
| void RestoreActiveTexture() const;
|
| - void RestoreAllTextureUnitBindings() const;
|
| + void RestoreAllTextureUnitBindings(const ContextState* prev_state) const;
|
| void RestoreAttribute(GLuint index) const;
|
| void RestoreBufferBindings() const;
|
| void RestoreGlobalState() const;
|
| void RestoreProgramBindings() const;
|
| void RestoreRenderbufferBindings() const;
|
| - void RestoreTextureUnitBindings(GLuint unit) const;
|
| + void RestoreTextureUnitBindings(
|
| + GLuint unit, const ContextState* prev_state) const;
|
|
|
| // Helper for getting cached state.
|
| bool GetStateAsGLint(
|
|
|