| Index: gpu/command_buffer/client/gles2_implementation.h
|
| diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h
|
| index bacb582e907e946bb6f3292e02bd7ea6f585facd..9f8a7a2516af3493c03346d2424ba723027705ed 100644
|
| --- a/gpu/command_buffer/client/gles2_implementation.h
|
| +++ b/gpu/command_buffer/client/gles2_implementation.h
|
| @@ -20,6 +20,7 @@
|
| #include "gpu/command_buffer/client/gles2_cmd_helper.h"
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "gpu/command_buffer/client/gpu_memory_buffer_tracker.h"
|
| +#include "gpu/command_buffer/client/mapped_memory.h"
|
| #include "gpu/command_buffer/client/query_tracker.h"
|
| #include "gpu/command_buffer/client/ref_counted.h"
|
| #include "gpu/command_buffer/client/ring_buffer.h"
|
| @@ -98,7 +99,6 @@ struct GLUniformDefinitionCHROMIUM;
|
| namespace gpu {
|
|
|
| class GpuControl;
|
| -class MappedMemoryManager;
|
| class ScopedTransferBufferPtr;
|
| class TransferBufferInterface;
|
|
|
| @@ -115,6 +115,9 @@ class VertexArrayObjectManager;
|
| // shared memory and synchronization issues.
|
| class GLES2_IMPL_EXPORT GLES2Implementation : public GLES2Interface {
|
| public:
|
| + enum MappedMemoryLimit {
|
| + kNoLimit = MappedMemoryManager::kNoLimit,
|
| + };
|
| class ErrorMessageCallback {
|
| public:
|
| virtual ~ErrorMessageCallback() { }
|
| @@ -184,7 +187,8 @@ class GLES2_IMPL_EXPORT GLES2Implementation : public GLES2Interface {
|
| bool Initialize(
|
| unsigned int starting_transfer_buffer_size,
|
| unsigned int min_transfer_buffer_size,
|
| - unsigned int max_transfer_buffer_size);
|
| + unsigned int max_transfer_buffer_size,
|
| + unsigned int mapped_memory_limit);
|
|
|
| // The GLES2CmdHelper being used by this GLES2Implementation. You can use
|
| // this to issue cmds at a lower level for certain kinds of optimization.
|
| @@ -215,7 +219,6 @@ class GLES2_IMPL_EXPORT GLES2Implementation : public GLES2Interface {
|
| GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
|
| GLint* size, GLenum* type, char* name);
|
|
|
| - void SetSharedMemoryChunkSizeMultiple(unsigned int multiple);
|
|
|
| void FreeUnusedSharedMemory();
|
| void FreeEverything();
|
|
|