summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 19:50:36 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 19:50:36 +0000
commit0f52f46ccb8cf43f21e63fbb16c0789f7d37ebce (patch)
treecd08110e55b56dd859dcb6c493bd04b0ead85bd8 /gpu
parent4e5a0f44b14b674f4b1c29bdce9416c1c7379a08 (diff)
downloadchromium_src-0f52f46ccb8cf43f21e63fbb16c0789f7d37ebce.zip
chromium_src-0f52f46ccb8cf43f21e63fbb16c0789f7d37ebce.tar.gz
chromium_src-0f52f46ccb8cf43f21e63fbb16c0789f7d37ebce.tar.bz2
Add OVERRIDE to gpu/ and gl/.
BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8486016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/common/id_allocator.h23
-rw-r--r--gpu/command_buffer/service/command_buffer_service.h30
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h16
-rw-r--r--gpu/command_buffer/service/gpu_scheduler.h8
-rw-r--r--gpu/command_buffer/service/shader_translator.h12
5 files changed, 46 insertions, 43 deletions
diff --git a/gpu/command_buffer/common/id_allocator.h b/gpu/command_buffer/common/id_allocator.h
index 56220b2..de2d658 100644
--- a/gpu/command_buffer/common/id_allocator.h
+++ b/gpu/command_buffer/common/id_allocator.h
@@ -9,6 +9,9 @@
#include <set>
#include <utility>
+
+#include "base/compiler_specific.h"
+
#include "../common/types.h"
namespace gpu {
@@ -46,11 +49,11 @@ class IdAllocator : public IdAllocatorInterface {
virtual ~IdAllocator();
// Implement IdAllocatorInterface.
- virtual ResourceId AllocateID();
- virtual ResourceId AllocateIDAtOrAbove(ResourceId desired_id);
- virtual bool MarkAsUsed(ResourceId id);
- virtual void FreeID(ResourceId id);
- virtual bool InUse(ResourceId id) const;
+ virtual ResourceId AllocateID() OVERRIDE;
+ virtual ResourceId AllocateIDAtOrAbove(ResourceId desired_id) OVERRIDE;
+ virtual bool MarkAsUsed(ResourceId id) OVERRIDE;
+ virtual void FreeID(ResourceId id) OVERRIDE;
+ virtual bool InUse(ResourceId id) const OVERRIDE;
private:
// TODO(gman): This would work much better with ranges or a hash table.
@@ -78,11 +81,11 @@ class NonReusedIdAllocator : public IdAllocatorInterface {
virtual ~NonReusedIdAllocator();
// Implement IdAllocatorInterface.
- virtual ResourceId AllocateID();
- virtual ResourceId AllocateIDAtOrAbove(ResourceId desired_id);
- virtual bool MarkAsUsed(ResourceId id);
- virtual void FreeID(ResourceId id);
- virtual bool InUse(ResourceId id) const;
+ virtual ResourceId AllocateID() OVERRIDE;
+ virtual ResourceId AllocateIDAtOrAbove(ResourceId desired_id) OVERRIDE;
+ virtual bool MarkAsUsed(ResourceId id) OVERRIDE;
+ virtual void FreeID(ResourceId id) OVERRIDE;
+ virtual bool InUse(ResourceId id) const OVERRIDE;
private:
ResourceId last_id_;
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h
index c388e9f..75ca7ca1 100644
--- a/gpu/command_buffer/service/command_buffer_service.h
+++ b/gpu/command_buffer/service/command_buffer_service.h
@@ -25,23 +25,23 @@ class CommandBufferService : public CommandBuffer {
virtual ~CommandBufferService();
// CommandBuffer implementation:
- virtual bool Initialize(int32 size);
- virtual bool Initialize(base::SharedMemory* buffer, int32 size);
- virtual Buffer GetRingBuffer();
- virtual State GetState();
- virtual State GetLastState();
- virtual void Flush(int32 put_offset);
- virtual State FlushSync(int32 put_offset, int32 last_known_get);
- virtual void SetGetOffset(int32 get_offset);
- virtual int32 CreateTransferBuffer(size_t size, int32 id_request);
+ virtual bool Initialize(int32 size) OVERRIDE;
+ virtual bool Initialize(base::SharedMemory* buffer, int32 size) OVERRIDE;
+ virtual Buffer GetRingBuffer() OVERRIDE;
+ virtual State GetState() OVERRIDE;
+ virtual State GetLastState() OVERRIDE;
+ virtual void Flush(int32 put_offset) OVERRIDE;
+ virtual State FlushSync(int32 put_offset, int32 last_known_get) OVERRIDE;
+ virtual void SetGetOffset(int32 get_offset) OVERRIDE;
+ virtual int32 CreateTransferBuffer(size_t size, int32 id_request) OVERRIDE;
virtual int32 RegisterTransferBuffer(base::SharedMemory* shared_memory,
size_t size,
- int32 id_request);
- virtual void DestroyTransferBuffer(int32 id);
- virtual Buffer GetTransferBuffer(int32 handle);
- virtual void SetToken(int32 token);
- virtual void SetParseError(error::Error error);
- virtual void SetContextLostReason(error::ContextLostReason);
+ int32 id_request) OVERRIDE;
+ virtual void DestroyTransferBuffer(int32 id) OVERRIDE;
+ virtual Buffer GetTransferBuffer(int32 handle) OVERRIDE;
+ virtual void SetToken(int32 token) OVERRIDE;
+ virtual void SetParseError(error::Error error) OVERRIDE;
+ virtual void SetContextLostReason(error::ContextLostReason) OVERRIDE;
// Sets a callback that is called whenever the put offset is changed. When
// called with sync==true, the callback must not return until some progress
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index 3cb5eab..f98aea4 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -142,8 +142,8 @@ class GLES2DecoderTestBase : public testing::Test {
engine_->ClearSharedMemory();
}
- virtual void SetUp();
- virtual void TearDown();
+ virtual void SetUp() OVERRIDE;
+ virtual void TearDown() OVERRIDE;
template <typename T>
error::Error ExecuteCmd(const T& cmd) {
@@ -406,7 +406,7 @@ class GLES2DecoderTestBase : public testing::Test {
virtual ~MockCommandBufferEngine() {
}
- virtual Buffer GetSharedMemoryBuffer(int32 shm_id) {
+ virtual Buffer GetSharedMemoryBuffer(int32 shm_id) OVERRIDE {
return shm_id == kSharedMemoryId ? valid_buffer_ : invalid_buffer_;
}
@@ -414,18 +414,18 @@ class GLES2DecoderTestBase : public testing::Test {
memset(data_.get(), kInitialMemoryValue, kSharedBufferSize);
}
- virtual void set_token(int32 token) {
+ virtual void set_token(int32 token) OVERRIDE {
DCHECK(false);
}
// Overridden from CommandBufferEngine.
- virtual bool SetGetOffset(int32 offset) {
+ virtual bool SetGetOffset(int32 offset) OVERRIDE {
DCHECK(false);
return false;
}
// Overridden from CommandBufferEngine.
- virtual int32 GetGetOffset() {
+ virtual int32 GetGetOffset() OVERRIDE {
DCHECK(false);
return 0;
}
@@ -447,8 +447,8 @@ class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase {
}
protected:
- virtual void SetUp();
- virtual void TearDown();
+ virtual void SetUp() OVERRIDE;
+ virtual void TearDown() OVERRIDE;
};
diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h
index 5c7cfe0..a8a2d7f 100644
--- a/gpu/command_buffer/service/gpu_scheduler.h
+++ b/gpu/command_buffer/service/gpu_scheduler.h
@@ -49,10 +49,10 @@ class GpuScheduler
void SetScheduledCallback(Callback0::Type* scheduled_callback);
// Implementation of CommandBufferEngine.
- virtual Buffer GetSharedMemoryBuffer(int32 shm_id);
- virtual void set_token(int32 token);
- virtual bool SetGetOffset(int32 offset);
- virtual int32 GetGetOffset();
+ virtual Buffer GetSharedMemoryBuffer(int32 shm_id) OVERRIDE;
+ virtual void set_token(int32 token) OVERRIDE;
+ virtual bool SetGetOffset(int32 offset) OVERRIDE;
+ virtual int32 GetGetOffset() OVERRIDE;
void SetCommandProcessedCallback(Callback0::Type* callback);
diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h
index 9f5e766..af132b9 100644
--- a/gpu/command_buffer/service/shader_translator.h
+++ b/gpu/command_buffer/service/shader_translator.h
@@ -83,18 +83,18 @@ class ShaderTranslator : public ShaderTranslatorInterface {
ShShaderSpec shader_spec,
const ShBuiltInResources* resources,
GlslImplementationType glsl_implementation_type,
- GlslBuiltInFunctionBehavior glsl_built_in_function_behavior);
+ GlslBuiltInFunctionBehavior glsl_built_in_function_behavior) OVERRIDE;
// Overridden from ShaderTranslatorInterface.
- virtual bool Translate(const char* shader);
+ virtual bool Translate(const char* shader) OVERRIDE;
// Overridden from ShaderTranslatorInterface.
- virtual const char* translated_shader() const;
- virtual const char* info_log() const;
+ virtual const char* translated_shader() const OVERRIDE;
+ virtual const char* info_log() const OVERRIDE;
// Overridden from ShaderTranslatorInterface.
- virtual const VariableMap& attrib_map() const;
- virtual const VariableMap& uniform_map() const;
+ virtual const VariableMap& attrib_map() const OVERRIDE;
+ virtual const VariableMap& uniform_map() const OVERRIDE;
private:
void ClearResults();