Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(468)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/build_gles2_cmd_buffer.py

Issue 558054: Renamed ParseError -> Error, parse_error -> error, kParseNoError -> kNoError,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/webplugin_delegate_pepper.cc ('k') | gpu/command_buffer/client/cmd_buffer_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/build_gles2_cmd_buffer.py
===================================================================
--- gpu/command_buffer/build_gles2_cmd_buffer.py (revision 37750)
+++ gpu/command_buffer/build_gles2_cmd_buffer.py (working copy)
@@ -1194,7 +1194,7 @@
def WriteServiceImplementation(self, func, file):
"""Writes the service implementation for a command."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
if len(func.GetOriginalArgs()) > 0:
@@ -1206,14 +1206,14 @@
last_arg.WriteGetCode(file)
func.WriteHandlerValidation(file)
func.WriteHandlerImplementation(file)
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
def WriteImmediateServiceImplementation(self, func, file):
"""Writes the service implementation for an immediate version of command."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
last_arg = func.GetLastOriginalArg()
@@ -1224,7 +1224,7 @@
last_arg.WriteGetCode(file)
func.WriteHandlerValidation(file)
func.WriteHandlerImplementation(file)
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
@@ -1258,7 +1258,7 @@
num_invalid_values = arg.GetNumInvalidValues()
for value_index in range(0, num_invalid_values):
arg_strings = []
- parse_result = "kParseNoError"
+ parse_result = "kNoError"
count = 0
for arg in func.GetOriginalArgs():
if count == arg_index:
@@ -1303,7 +1303,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s);
- EXPECT_EQ(parse_error::kParseNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
"""
self.WriteValidUnitTest(func, file, valid_test)
@@ -1314,7 +1314,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s);
- EXPECT_EQ(parse_error::%(parse_result)s, ExecuteCmd(cmd));
+ EXPECT_EQ(error::%(parse_result)s, ExecuteCmd(cmd));
}
"""
self.WriteInvalidUnitTest(func, file, invalid_test)
@@ -1653,14 +1653,14 @@
def WriteHandlerImplementation (self, func, file):
"""Overrriden from TypeHandler."""
file.Write(" if (!GenGLObjects<GL%sHelper>(n, %s)) {\n"
- " return parse_error::kParseInvalidArguments;\n"
+ " return error::kInvalidArguments;\n"
" }\n" %
(func.name, func.GetLastOriginalArg().name))
def WriteImmediateHandlerImplementation(self, func, file):
"""Overrriden from TypeHandler."""
file.Write(" if (!GenGLObjects<GL%sHelper>(n, %s)) {\n"
- " return parse_error::kParseInvalidArguments;\n"
+ " return error::kInvalidArguments;\n"
" }\n" %
(func.original_name, func.GetLastOriginalArg().name))
@@ -1685,7 +1685,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s);
- EXPECT_EQ(parse_error::kParseNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
}
"""
@@ -1697,7 +1697,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s);
- EXPECT_EQ(parse_error::kParseInvalidArguments, ExecuteCmd(cmd));
+ EXPECT_EQ(error::kInvalidArguments, ExecuteCmd(cmd));
}
"""
self.WriteValidUnitTest(func, file, invalid_test, {
@@ -1714,7 +1714,7 @@
GLuint temp = kNewClientId;
SpecializedSetup<%(name)s, 0>();
cmd.Init(1, &temp);
- EXPECT_EQ(parse_error::kParseNoError,
+ EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
}
@@ -1726,7 +1726,7 @@
%(name)s& cmd = *GetImmediateAs<%(name)s>();
SpecializedSetup<%(name)s, 0>();
cmd.Init(1, &client_%(resource_name)s_id_);
- EXPECT_EQ(parse_error::kParseInvalidArguments,
+ EXPECT_EQ(error::kInvalidArguments,
ExecuteImmediateCmd(cmd, sizeof(&client_%(resource_name)s_id_)));
}
"""
@@ -1850,7 +1850,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s%(comma)skNewClientId);
- EXPECT_EQ(parse_error::kParseNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GetServiceId(kNewClientId), kNewServiceId);
}
"""
@@ -1866,7 +1866,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s%(comma)skNewClientId);
- EXPECT_EQ(parse_error::kParseNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
"""
self.WriteInvalidUnitTest(func, file, invalid_test, {
@@ -1915,7 +1915,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s);
- EXPECT_EQ(parse_error::kParseNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GetServiceId(kNewClientId), 0u);
}
"""
@@ -1932,7 +1932,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s);
- EXPECT_EQ(parse_error::kParseNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
"""
self.WriteValidUnitTest(func, file, invalid_test)
@@ -1948,7 +1948,7 @@
%(name)s& cmd = *GetImmediateAs<%(name)s>();
SpecializedSetup<%(name)s, 0>();
cmd.Init(1, &client_%(resource_name)s_id_);
- EXPECT_EQ(parse_error::kParseNoError,
+ EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(client_%(resource_name)s_id_)));
EXPECT_EQ(GetServiceId(kNewClientId), 0u);
}
@@ -1966,7 +1966,7 @@
SpecializedSetup<%(name)s, 0>();
GLuint temp = kInvalidClientId;
cmd.Init(1, &temp);
- EXPECT_EQ(parse_error::kParseNoError,
+ EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
}
"""
@@ -2103,7 +2103,7 @@
def WriteServiceImplementation(self, func, file):
"""Overrriden from TypeHandler."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
last_arg = func.GetLastOriginalArg()
@@ -2119,7 +2119,7 @@
file.Write(" c.params_shm_id, c.params_shm_offset, params_size);\n")
func.WriteHandlerValidation(file)
func.WriteHandlerImplementation(file)
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
@@ -2161,7 +2161,7 @@
SpecializedSetup<%(name)s, 0>();
%(data_type)s temp[%(data_count)s] = { 0, };
cmd.Init(%(gl_args)s, &temp[0]);
- EXPECT_EQ(parse_error::kParseNoError,
+ EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
}
"""
@@ -2187,7 +2187,7 @@
SpecializedSetup<%(name)s, 0>();
%(data_type)s temp[%(data_count)s] = { 0, };
cmd.Init(%(all_but_last_args)s, &temp[0]);
- EXPECT_EQ(parse_error::%(parse_result)s,
+ EXPECT_EQ(error::%(parse_result)s,
ExecuteImmediateCmd(cmd, sizeof(temp)));
}
"""
@@ -2332,7 +2332,7 @@
SpecializedSetup<%(name)s, 0>();
%(data_type)s temp[%(data_count)s * 2] = { 0, };
cmd.Init(%(gl_args)s, &temp[0]);
- EXPECT_EQ(parse_error::kParseNoError,
+ EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(temp)));
}
"""
@@ -2358,7 +2358,7 @@
SpecializedSetup<%(name)s, 0>();
%(data_type)s temp[%(data_count)s * 2] = { 0, };
cmd.Init(%(all_but_last_args)s, &temp[0]);
- EXPECT_EQ(parse_error::%(parse_result)s,
+ EXPECT_EQ(error::%(parse_result)s,
ExecuteImmediateCmd(cmd, sizeof(temp)));
}
"""
@@ -2506,7 +2506,7 @@
def WriteServiceImplementation(self, func, file):
"""Overrriden from TypeHandler."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
last_arg = func.GetLastOriginalArg()
@@ -2525,14 +2525,14 @@
file.Write(" String name_str(name, name_size);\n")
file.Write(" %s(%s, name_str.c_str());\n" %
(func.GetGLFunctionName(), arg_string))
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
def WriteImmediateServiceImplementation(self, func, file):
"""Overrriden from TypeHandler."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
last_arg = func.GetLastOriginalArg()
@@ -2550,7 +2550,7 @@
file.Write(" String name_str(name, name_size);\n")
file.Write(" %s(%s, name_str.c_str());\n" %
(func.GetGLFunctionName(), arg_string))
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
@@ -2687,7 +2687,7 @@
def WriteServiceImplementation(self, func, file):
"""Overrriden from TypeHandler."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
last_arg = func.GetLastOriginalArg()
@@ -2710,14 +2710,14 @@
file.Write(" String name_str(name, name_size);\n")
file.Write(" *location = %s(%s, name_str.c_str());\n" %
(func.GetGLFunctionName(), arg_string))
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
def WriteImmediateServiceImplementation(self, func, file):
"""Overrriden from TypeHandler."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
last_arg = func.GetLastOriginalArg()
@@ -2739,7 +2739,7 @@
file.Write(" String name_str(name, name_size);\n")
file.Write(" *location = %s(%s, name_str.c_str());\n" %
(func.GetGLFunctionName(), arg_string))
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
@@ -2864,7 +2864,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s%(comma)sshared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(parse_error::kParseNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
"""
comma = ""
@@ -2880,7 +2880,7 @@
SpecializedSetup<%(name)s, 0>();
%(name)s cmd;
cmd.Init(%(args)s%(comma)sshared_memory_id_, shared_memory_offset_);
- EXPECT_EQ(parse_error::%(parse_result)s, ExecuteCmd(cmd));
+ EXPECT_EQ(error::%(parse_result)s, ExecuteCmd(cmd));
}
"""
self.WriteInvalidUnitTest(func, file, invalid_test, {
@@ -2890,7 +2890,7 @@
def WriteServiceImplementation(self, func, file):
"""Overrriden from TypeHandler."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
args = func.GetOriginalArgs()
@@ -2904,7 +2904,7 @@
func.WriteHandlerValidation(file)
file.Write(" *result_dst = %s(%s);\n" %
(func.GetGLFunctionName(), func.MakeOriginalArgString("")))
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
@@ -2948,7 +2948,7 @@
def WriteServiceImplementation(self, func, file):
"""Overrriden from TypeHandler."""
file.Write(
- "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+ "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
file.Write(
" uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
args = func.GetOriginalArgs()
@@ -2964,7 +2964,7 @@
" length = GetSharedMemoryAs<GLsizei*>(\n"
" size_shm_id, size_shm_offset, sizeof(*length));\n"
" if (!length) {\n"
- " return parse_error::kParseOutOfBounds;\n"
+ " return error::kOutOfBounds;\n"
" }\n"
" }\n")
dest_arg = args[-1]
@@ -2979,7 +2979,7 @@
arg.WriteValidationCode(file)
func.WriteValidationCode(file)
func.WriteHandlerImplementation(file)
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write("}\n")
file.Write("\n")
@@ -3071,7 +3071,7 @@
def WriteValidationCode(self, file):
file.Write(" if (!Validate%s(%s)) {\n" % (self.local_type, self.name))
file.Write(" SetGLError(%s);\n" % self.gl_error)
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write(" }\n")
def GetValidArg(self, offset, index):
@@ -3100,8 +3100,8 @@
num_invalid = len(invalid)
if index >= num_invalid:
index = num_invalid - 1
- return (invalid[index], "kParseNoError")
- return ("---ERROR1---", "kParseNoError")
+ return (invalid[index], "kNoError")
+ return ("---ERROR1---", "kNoError")
class EnumArgument(EnumBaseArgument):
@@ -3156,7 +3156,7 @@
def WriteValidationCode(self, file):
"""Overridden from Argument."""
file.Write(" if (%s == NULL) {\n" % self.name)
- file.Write(" return parse_error::kParseOutOfBounds;\n")
+ file.Write(" return error::kOutOfBounds;\n")
file.Write(" }\n")
def GetImmediateVersion(self):
@@ -3189,10 +3189,10 @@
def GetInvalidArg(self, offset, index):
"""Overridden from Argument."""
if index == 0:
- return ("kInvalidSharedMemoryId, 0", "kParseOutOfBounds")
+ return ("kInvalidSharedMemoryId, 0", "kOutOfBounds")
else:
return ("shared_memory_id_, kInvalidSharedMemoryOffset",
- "kParseOutOfBounds")
+ "kOutOfBounds")
def AddCmdArgs(self, args):
"""Overridden from Argument."""
@@ -3220,7 +3220,7 @@
def WriteValidationCode(self, file):
"""Overridden from Argument."""
file.Write(" if (%s == NULL) {\n" % self.name)
- file.Write(" return parse_error::kParseOutOfBounds;\n")
+ file.Write(" return error::kOutOfBounds;\n")
file.Write(" }\n")
def GetImmediateVersion(self):
@@ -3258,7 +3258,7 @@
file.Write(" if (!id_manager_->GetServiceId(c.%s, &%s)) {\n" %
(self.name, self.name))
file.Write(" SetGLError(GL_INVALID_VALUE);\n")
- file.Write(" return parse_error::kParseNoError;\n")
+ file.Write(" return error::kNoError;\n")
file.Write(" }\n")
def GetValidArg(self, offset, index):
@@ -3837,7 +3837,7 @@
def WriteServiceUtilsHeader(self, filename):
"""Writes the gles2 auto generated utility header."""
file = CHeaderWriter(filename)
- for enum in _ENUM_LISTS:
+ for enum in sorted(_ENUM_LISTS.keys()):
file.Write("bool Validate%s%s(GLenum value);\n" % (_ENUM_LISTS[enum]['type'], enum))
file.Write("\n")
file.Close()
@@ -3845,7 +3845,7 @@
def WriteServiceUtilsImplementation(self, filename):
"""Writes the gles2 auto generated utility implementation."""
file = CHeaderWriter(filename)
- for enum in _ENUM_LISTS:
+ for enum in sorted(_ENUM_LISTS.keys()):
file.Write("bool Validate%s%s(GLenum value) {\n" % (_ENUM_LISTS[enum]['type'], enum))
file.Write(" switch (value) {\n")
for value in _ENUM_LISTS[enum]['valid']:
« no previous file with comments | « chrome/renderer/webplugin_delegate_pepper.cc ('k') | gpu/command_buffer/client/cmd_buffer_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698