| 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 8d5edcaea61d08c73810fd60d7c32ea1d2630af9..92c46f9d5503d36d08f9de3bac56cf1c149710ef 100644
|
| --- a/gpu/command_buffer/service/context_state.h
|
| +++ b/gpu/command_buffer/service/context_state.h
|
| @@ -17,6 +17,10 @@
|
| #include "gpu/command_buffer/service/vertex_array_manager.h"
|
| #include "gpu/gpu_export.h"
|
|
|
| +namespace gfx {
|
| +class DirtyTextureState;
|
| +}
|
| +
|
| namespace gpu {
|
| namespace gles2 {
|
|
|
| @@ -98,18 +102,20 @@ struct GPU_EXPORT ContextState {
|
|
|
| void Initialize();
|
|
|
| - void RestoreState() const;
|
| + void RestoreState(const gfx::DirtyTextureState* dirty_texture_state) const;
|
| void InitCapabilities() const;
|
| void InitState() const;
|
|
|
| void RestoreActiveTexture() const;
|
| - void RestoreAllTextureUnitBindings() const;
|
| + void RestoreAllTextureUnitBindings(
|
| + const gfx::DirtyTextureState* dirty_texture_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 gfx::DirtyTextureState* dirty_texture_state) const;
|
|
|
| // Helper for getting cached state.
|
| bool GetStateAsGLint(
|
|
|