summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorfdegans@chromium.org <fdegans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-07 19:07:31 +0000
committerfdegans@chromium.org <fdegans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-07 19:07:31 +0000
commit44abd66280e0ab0a0187c1de911e91f1670aadd1 (patch)
treeee7db1f2c4be55689f0289ee74b32c9a4c623ddd /gpu
parent78c55011d23ed79f9958a040cd230dfa5a9293c2 (diff)
downloadchromium_src-44abd66280e0ab0a0187c1de911e91f1670aadd1.zip
chromium_src-44abd66280e0ab0a0187c1de911e91f1670aadd1.tar.gz
chromium_src-44abd66280e0ab0a0187c1de911e91f1670aadd1.tar.bz2
Fix -Wunused-local-typedefs errors with GCC 4.7+
BUG=321833 Review URL: https://codereview.chromium.org/213693007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rwxr-xr-xgpu/command_buffer/build_gles2_cmd_buffer.py1
-rw-r--r--gpu/command_buffer/client/gles2_implementation_unittest_autogen.h9
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc2
-rw-r--r--gpu/command_buffer/service/memory_program_cache_unittest.cc1
4 files changed, 0 insertions, 13 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 1754704..e585d66 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -5558,7 +5558,6 @@ TEST_F(GLES2ImplementationTest, %(name)s) {
cmds::%(name)s cmd;
};
- typedef cmds::%(name)s::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::%(name)s::Result));
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
index 68c2870..e9696c4 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_unittest_autogen.h
@@ -127,7 +127,6 @@ TEST_F(GLES2ImplementationTest, CheckFramebufferStatus) {
cmds::CheckFramebufferStatus cmd;
};
- typedef cmds::CheckFramebufferStatus::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::CheckFramebufferStatus::Result));
@@ -759,7 +758,6 @@ TEST_F(GLES2ImplementationTest, IsBuffer) {
cmds::IsBuffer cmd;
};
- typedef cmds::IsBuffer::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::IsBuffer::Result));
@@ -779,7 +777,6 @@ TEST_F(GLES2ImplementationTest, IsEnabled) {
cmds::IsEnabled cmd;
};
- typedef cmds::IsEnabled::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::IsEnabled::Result));
@@ -799,7 +796,6 @@ TEST_F(GLES2ImplementationTest, IsFramebuffer) {
cmds::IsFramebuffer cmd;
};
- typedef cmds::IsFramebuffer::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::IsFramebuffer::Result));
@@ -819,7 +815,6 @@ TEST_F(GLES2ImplementationTest, IsProgram) {
cmds::IsProgram cmd;
};
- typedef cmds::IsProgram::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::IsProgram::Result));
@@ -839,7 +834,6 @@ TEST_F(GLES2ImplementationTest, IsRenderbuffer) {
cmds::IsRenderbuffer cmd;
};
- typedef cmds::IsRenderbuffer::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::IsRenderbuffer::Result));
@@ -859,7 +853,6 @@ TEST_F(GLES2ImplementationTest, IsShader) {
cmds::IsShader cmd;
};
- typedef cmds::IsShader::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::IsShader::Result));
@@ -879,7 +872,6 @@ TEST_F(GLES2ImplementationTest, IsTexture) {
cmds::IsTexture cmd;
};
- typedef cmds::IsTexture::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::IsTexture::Result));
@@ -1669,7 +1661,6 @@ TEST_F(GLES2ImplementationTest, IsVertexArrayOES) {
cmds::IsVertexArrayOES cmd;
};
- typedef cmds::IsVertexArrayOES::Result Result;
Cmds expected;
ExpectedMemoryInfo result1 =
GetExpectedResultMemory(sizeof(cmds::IsVertexArrayOES::Result));
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 882a124..206d035 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -1611,7 +1611,6 @@ TEST_F(GLES2DecoderWithShaderTest, GetActiveUniformBadSharedMemoryFails) {
const GLuint kUniformIndex = 1;
const uint32 kBucketId = 123;
GetActiveUniform cmd;
- typedef GetActiveUniform::Result Result;
cmd.Init(client_program_id_, kUniformIndex, kBucketId,
kInvalidSharedMemoryId, shared_memory_offset_);
EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
@@ -1691,7 +1690,6 @@ TEST_F(GLES2DecoderWithShaderTest, GetActiveAttribBadSharedMemoryFails) {
const GLuint kAttribIndex = 1;
const uint32 kBucketId = 123;
GetActiveAttrib cmd;
- typedef GetActiveAttrib::Result Result;
cmd.Init(client_program_id_, kAttribIndex, kBucketId,
kInvalidSharedMemoryId, shared_memory_offset_);
EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc
index 6104534..2db0df5 100644
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc
@@ -481,7 +481,6 @@ TEST_F(MemoryProgramCacheTest, LoadFailOnDifferentMap) {
}
TEST_F(MemoryProgramCacheTest, MemoryProgramCacheEviction) {
- typedef ShaderTranslator::VariableMap VariableMap;
const GLenum kFormat = 1;
const int kProgramId = 10;
const int kBinaryLength = 20;