summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/client/gles2_implementation.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h
index 7404e90..b5ed282 100644
--- a/gpu/command_buffer/client/gles2_implementation.h
+++ b/gpu/command_buffer/client/gles2_implementation.h
@@ -110,6 +110,12 @@ namespace gles2 {
class ImageFactory;
class VertexArrayObjectManager;
+class GLES2ImplementationErrorMessageCallback {
+ public:
+ virtual ~GLES2ImplementationErrorMessageCallback() { }
+ virtual void OnErrorMessage(const char* msg, int id) = 0;
+};
+
// This class emulates GLES2 over command buffers. It can be used by a client
// program so that the program does not need deal with shared memory and command
// buffer management. See gl2_lib.h. Note that there is a performance gain to
@@ -123,11 +129,6 @@ class GLES2_IMPL_EXPORT GLES2Implementation
enum MappedMemoryLimit {
kNoLimit = MappedMemoryManager::kNoLimit,
};
- class ErrorMessageCallback {
- public:
- virtual ~ErrorMessageCallback() { }
- virtual void OnErrorMessage(const char* msg, int id) = 0;
- };
// Stores GL state that never changes.
struct GLES2_IMPL_EXPORT GLStaticState {
@@ -249,7 +250,8 @@ class GLES2_IMPL_EXPORT GLES2Implementation
virtual void SendManagedMemoryStats(const ManagedMemoryStats& stats)
OVERRIDE;
- void SetErrorMessageCallback(ErrorMessageCallback* callback) {
+ void SetErrorMessageCallback(
+ GLES2ImplementationErrorMessageCallback* callback) {
error_message_callback_ = callback;
}
@@ -769,7 +771,7 @@ class GLES2_IMPL_EXPORT GLES2Implementation
scoped_ptr<GpuMemoryBufferTracker> gpu_memory_buffer_tracker_;
- ErrorMessageCallback* error_message_callback_;
+ GLES2ImplementationErrorMessageCallback* error_message_callback_;
scoped_ptr<std::string> current_trace_name_;