| Index: gpu/command_buffer/service/buffer_manager.h
|
| diff --git a/gpu/command_buffer/service/buffer_manager.h b/gpu/command_buffer/service/buffer_manager.h
|
| index 2778a7328b97d001fc4a486af12fd67cd2f682f6..31683bdc2ef6360cb0117e713b24da45d2000351 100644
|
| --- a/gpu/command_buffer/service/buffer_manager.h
|
| +++ b/gpu/command_buffer/service/buffer_manager.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_
|
| #define GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_
|
|
|
| +#include <stdarg.h>
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| @@ -318,14 +319,14 @@ class GPU_EXPORT BufferManager : public base::trace_event::MemoryDumpProvider {
|
| bool RequestBufferAccess(ErrorState* error_state,
|
| Buffer* buffer,
|
| const char* func_name,
|
| - const char* message_tag);
|
| + const char* error_message_format, ...);
|
| // Generates INVALID_OPERATION if offset + size is out of range.
|
| bool RequestBufferAccess(ErrorState* error_state,
|
| Buffer* buffer,
|
| GLintptr offset,
|
| GLsizeiptr size,
|
| const char* func_name,
|
| - const char* message_tag);
|
| + const char* error_message);
|
| // Returns false and generates INVALID_OPERATION if buffer at binding |ii|
|
| // doesn't exist, is mapped, or smaller than |variable_sizes[ii]| * |count|.
|
| // Return true otherwise.
|
| @@ -394,6 +395,14 @@ class GPU_EXPORT BufferManager : public base::trace_event::MemoryDumpProvider {
|
| void IncreaseMappedBufferCount();
|
| void DecreaseMappedBufferCount();
|
|
|
| + // Same as public RequestBufferAccess taking similar arguments, but
|
| + // allows caller to assemble the va_list.
|
| + bool RequestBufferAccessV(ErrorState* error_state,
|
| + Buffer* buffer,
|
| + const char* func_name,
|
| + const char* error_message_format,
|
| + va_list varargs);
|
| +
|
| std::unique_ptr<MemoryTypeTracker> memory_type_tracker_;
|
| MemoryTracker* memory_tracker_;
|
| scoped_refptr<FeatureInfo> feature_info_;
|
|
|