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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/build_gles2_cmd_buffer.py

Issue 262793002: Revert of Optimize GLES2DecoderImpl::ApplyDirtyState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 | « no previous file | gpu/command_buffer/service/context_state.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
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index a3e167436e3e1a1c409389984ef8e1745fa75148..7105edf4cbba65287f84f4e57e366b2cc43b3ab5 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -78,7 +78,8 @@
{'name': 'polygon_offset_fill'},
{'name': 'sample_alpha_to_coverage'},
{'name': 'sample_coverage'},
- {'name': 'scissor_test'},
+ {'name': 'scissor_test',
+ 'state_flag': 'framebuffer_state_.clear_state_dirty'},
{'name': 'stencil_test',
'state_flag': 'framebuffer_state_.clear_state_dirty'},
]
@@ -108,30 +109,10 @@
'func': 'ColorMask',
'enum': 'GL_COLOR_WRITEMASK',
'states': [
- {
- 'name': 'color_mask_red',
- 'type': 'GLboolean',
- 'default': 'true',
- 'cached': True
- },
- {
- 'name': 'color_mask_green',
- 'type': 'GLboolean',
- 'default': 'true',
- 'cached': True
- },
- {
- 'name': 'color_mask_blue',
- 'type': 'GLboolean',
- 'default': 'true',
- 'cached': True
- },
- {
- 'name': 'color_mask_alpha',
- 'type': 'GLboolean',
- 'default': 'true',
- 'cached': True
- },
+ {'name': 'color_mask_red', 'type': 'GLboolean', 'default': 'true'},
+ {'name': 'color_mask_green', 'type': 'GLboolean', 'default': 'true'},
+ {'name': 'color_mask_blue', 'type': 'GLboolean', 'default': 'true'},
+ {'name': 'color_mask_alpha', 'type': 'GLboolean', 'default': 'true'},
],
'state_flag': 'framebuffer_state_.clear_state_dirty',
},
@@ -281,14 +262,12 @@
'type': 'GLuint',
'enum': 'GL_STENCIL_WRITEMASK',
'default': '0xFFFFFFFFU',
- 'cached': True,
},
{
'name': 'stencil_back_writemask',
'type': 'GLuint',
'enum': 'GL_STENCIL_BACK_WRITEMASK',
'default': '0xFFFFFFFFU',
- 'cached': True,
},
],
},
@@ -432,12 +411,7 @@
'func': 'DepthMask',
'enum': 'GL_DEPTH_WRITEMASK',
'states': [
- {
- 'name': 'depth_mask',
- 'type': 'GLboolean',
- 'default': 'true',
- 'cached': True
- },
+ {'name': 'depth_mask', 'type': 'GLboolean', 'default': 'true'},
],
'state_flag': 'framebuffer_state_.clear_state_dirty',
},
@@ -2622,11 +2596,6 @@
words = SplitWords(input_string)
return Lower(words)
-def CachedStateName(item):
- if item.get('cached', False):
- return 'cached_' + item['name']
- return item['name']
-
class CWriter(object):
"""Writes to a file formatting it for Google's style guidelines."""
@@ -2984,32 +2953,8 @@
def WriteServiceUnitTest(self, func, file):
"""Writes the service unit test for a command."""
-
- if func.name == 'Enable':
- valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
- SetupExpectationsForEnableDisable(%(gl_args)s, true);
- SpecializedSetup<cmds::%(name)s, 0>(true);
- cmds::%(name)s cmd;
- cmd.Init(%(args)s);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-"""
- elif func.name == 'Disable':
- valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
- SetupExpectationsForEnableDisable(%(gl_args)s, false);
- SpecializedSetup<cmds::%(name)s, 0>(true);
- cmds::%(name)s cmd;
- cmd.Init(%(args)s);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- EXPECT_EQ(GL_NO_ERROR, GetGLError());
-}
-"""
- else:
- valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+ valid_test = """
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s));
SpecializedSetup<cmds::%(name)s, 0>(true);
cmds::%(name)s cmd;
@@ -3021,7 +2966,7 @@
self.WriteValidUnitTest(func, file, valid_test)
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
@@ -3293,10 +3238,6 @@
if 'state_flag' in state:
file.Write(" %s = true;\n" % state['state_flag'])
if not func.GetInfo("no_gl"):
- for ndx,item in enumerate(states):
- if item.get('cached', False):
- file.Write(" state_.%s = %s;\n" %
- (CachedStateName(item), args[ndx].name))
file.Write(" %s(%s);\n" %
(func.GetGLFunctionName(), func.MakeOriginalArgString("")))
file.Write(" }\n")
@@ -3311,7 +3252,7 @@
if 'range_checks' in item:
for check_ndx, range_check in enumerate(item['range_checks']):
valid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidValue%(ndx)d_%(check_ndx)d) {
+TEST_F(%(test_name)s, %(name)sInvalidValue%(ndx)d_%(check_ndx)d) {
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
cmd.Init(%(args)s);
@@ -3783,7 +3724,7 @@
if len(func.GetOriginalArgs()) == 1:
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s));
SpecializedSetup<cmds::%(name)s, 0>(true);
cmds::%(name)s cmd;
@@ -3794,7 +3735,7 @@
"""
if func.GetInfo("gen_func"):
valid_test += """
-TEST_P(%(test_name)s, %(name)sValidArgsNewId) {
+TEST_F(%(test_name)s, %(name)sValidArgsNewId) {
EXPECT_CALL(*gl_, %(gl_func_name)s(kNewServiceId));
EXPECT_CALL(*gl_, %(gl_gen_func_name)s(1, _))
.WillOnce(SetArgumentPointee<1>(kNewServiceId));
@@ -3812,7 +3753,7 @@
})
else:
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s));
SpecializedSetup<cmds::%(name)s, 0>(true);
cmds::%(name)s cmd;
@@ -3823,7 +3764,7 @@
"""
if func.GetInfo("gen_func"):
valid_test += """
-TEST_P(%(test_name)s, %(name)sValidArgsNewId) {
+TEST_F(%(test_name)s, %(name)sValidArgsNewId) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(first_gl_arg)s, kNewServiceId));
EXPECT_CALL(*gl_, %(gl_gen_func_name)s(1, _))
.WillOnce(SetArgumentPointee<1>(kNewServiceId));
@@ -3843,7 +3784,7 @@
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
@@ -4030,7 +3971,7 @@
def WriteServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(1, _))
.WillOnce(SetArgumentPointee<1>(kNewServiceId));
GetSharedMemoryAs<GLuint*>()[0] = kNewClientId;
@@ -4046,7 +3987,7 @@
'resource_name': func.GetInfo('resource_type'),
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(_, _)).Times(0);
GetSharedMemoryAs<GLuint*>()[0] = client_%(resource_name)s_id_;
SpecializedSetup<cmds::%(name)s, 0>(false);
@@ -4062,7 +4003,7 @@
def WriteImmediateServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(1, _))
.WillOnce(SetArgumentPointee<1>(kNewServiceId));
cmds::%(name)s* cmd = GetImmediateAs<cmds::%(name)s>();
@@ -4079,7 +4020,7 @@
'resource_name': func.GetInfo('resource_type'),
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(_, _)).Times(0);
cmds::%(name)s* cmd = GetImmediateAs<cmds::%(name)s>();
SpecializedSetup<cmds::%(name)s, 0>(false);
@@ -4196,7 +4137,7 @@
def WriteServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s))
.WillOnce(Return(kNewServiceId));
SpecializedSetup<cmds::%(name)s, 0>(true);
@@ -4215,7 +4156,7 @@
'resource_type': func.name[6:],
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
@@ -4327,7 +4268,7 @@
def WriteServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(
*gl_,
%(gl_func_name)s(1, Pointee(kService%(upper_resource_name)sId)))
@@ -4347,7 +4288,7 @@
'upper_resource_name': func.GetInfo('resource_type'),
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs) {
GetSharedMemoryAs<GLuint*>()[0] = kInvalidClientId;
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
@@ -4360,7 +4301,7 @@
def WriteImmediateServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(
*gl_,
%(gl_func_name)s(1, Pointee(kService%(upper_resource_name)sId)))
@@ -4380,7 +4321,7 @@
'upper_resource_name': func.GetInfo('resource_type'),
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs) {
cmds::%(name)s& cmd = *GetImmediateAs<cmds::%(name)s>();
SpecializedSetup<cmds::%(name)s, 0>(false);
GLuint temp = kInvalidClientId;
@@ -4676,7 +4617,7 @@
def WriteServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, GetError())
.WillOnce(Return(GL_NO_ERROR))
.WillOnce(Return(GL_NO_ERROR))
@@ -4713,7 +4654,7 @@
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s::Result* result =
@@ -4745,7 +4686,7 @@
expected_call = ("EXPECT_CALL(*gl_, %%(gl_func_name)s(%s));" %
", ".join(gl_arg_strings))
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
SpecializedSetup<cmds::%(name)s, 0>(true);
cmds::%(name)s cmd;
cmd.Init(%(args)s);
@@ -4763,7 +4704,7 @@
self.WriteValidUnitTest(func, file, valid_test, extra)
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
@@ -4777,7 +4718,7 @@
def WriteImmediateServiceUnitTest(self, func, file):
"""Writes the service unit test for a command."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
cmds::%(name)s& cmd = *GetImmediateAs<cmds::%(name)s>();
SpecializedSetup<cmds::%(name)s, 0>(true);
%(data_type)s temp[%(data_count)s] = { %(data_value)s, };
@@ -4807,7 +4748,7 @@
self.WriteValidUnitTest(func, file, valid_test, extra)
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
cmds::%(name)s& cmd = *GetImmediateAs<cmds::%(name)s>();
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_any_args)s, _)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
@@ -5008,7 +4949,7 @@
TypeHandler.WriteServiceUnitTest(self, func, file)
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgsCountTooLarge) {
+TEST_F(%(test_name)s, %(name)sValidArgsCountTooLarge) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s));
SpecializedSetup<cmds::%(name)s, 0>(true);
cmds::%(name)s cmd;
@@ -5043,7 +4984,7 @@
def WriteImmediateServiceUnitTest(self, func, file):
"""Overridden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
cmds::%(name)s& cmd = *GetImmediateAs<cmds::%(name)s>();
EXPECT_CALL(
*gl_,
@@ -5074,7 +5015,7 @@
self.WriteValidUnitTest(func, file, valid_test, extra)
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
cmds::%(name)s& cmd = *GetImmediateAs<cmds::%(name)s>();
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_any_args)s, _)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
@@ -5304,7 +5245,7 @@
def WriteServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, %(name)sv(%(local_args)s));
SpecializedSetup<cmds::%(name)s, 0>(true);
cmds::%(name)s cmd;
@@ -5322,7 +5263,7 @@
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
EXPECT_CALL(*gl_, %(name)sv(_, _, _).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
@@ -5513,7 +5454,7 @@
def WriteServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s));
SpecializedSetup<cmds::%(name)s, 0>(true);
cmds::%(name)s cmd;
@@ -5530,7 +5471,7 @@
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
@@ -5543,7 +5484,7 @@
})
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgsBadSharedMemoryId) {
+TEST_F(%(test_name)s, %(name)sInvalidArgsBadSharedMemoryId) {
EXPECT_CALL(*gl_, %(gl_func_name)s(%(gl_args)s)).Times(0);
SpecializedSetup<cmds::%(name)s, 0>(false);
cmds::%(name)s cmd;
@@ -5712,7 +5653,7 @@
def WriteServiceUnitTest(self, func, file):
"""Overrriden from TypeHandler."""
valid_test = """
-TEST_P(%(test_name)s, %(name)sValidArgs) {
+TEST_F(%(test_name)s, %(name)sValidArgs) {
const char* kInfo = "hello";
const uint32 kBucketId = 123;
SpecializedSetup<cmds::%(name)s, 0>(true);
@@ -5752,7 +5693,7 @@
self.WriteValidUnitTest(func, file, valid_test, sub)
invalid_test = """
-TEST_P(%(test_name)s, %(name)sInvalidArgs) {
+TEST_F(%(test_name)s, %(name)sInvalidArgs) {
const uint32 kBucketId = 123;
EXPECT_CALL(*gl_, %(gl_func_name)s(_, _, _, _))
.Times(0);
@@ -7138,44 +7079,13 @@
file.Write(" EnableFlags();\n")
for capability in _CAPABILITY_FLAGS:
file.Write(" bool %s;\n" % capability['name'])
- file.Write(" bool cached_%s;\n" % capability['name'])
file.Write("};\n\n")
for state_name in sorted(_STATES.keys()):
state = _STATES[state_name]
for item in state['states']:
file.Write("%s %s;\n" % (item['type'], item['name']))
- if item.get('cached', False):
- file.Write("%s cached_%s;\n" % (item['type'], item['name']))
file.Write("\n")
-
- file.Write("""
- inline void SetDeviceCapabilityState(GLenum cap, bool enable) {
- switch (cap) {
- """)
- for capability in _CAPABILITY_FLAGS:
- file.Write("""\
- case GL_%s:
- """ % capability['name'].upper())
- file.Write("""\
- if (enable_flags.cached_%(name)s == enable &&
- !ignore_cached_state)
- return;
- enable_flags.cached_%(name)s = enable;
- break;
- """ % capability)
-
- file.Write("""\
- default:
- NOTREACHED();
- return;
- }
- if (enable)
- glEnable(cap);
- else
- glDisable(cap);
- }
- """)
file.Close()
@@ -7245,9 +7155,6 @@
code.append("%s(%s)" %
(capability['name'],
('false', 'true')['default' in capability]))
- code.append("cached_%s(%s)" %
- (capability['name'],
- ('false', 'true')['default' in capability]))
file.Write("ContextState::EnableFlags::EnableFlags()\n : %s {\n}\n" %
",\n ".join(code))
file.Write("\n")
@@ -7257,8 +7164,6 @@
state = _STATES[state_name]
for item in state['states']:
file.Write(" %s = %s;\n" % (item['name'], item['default']))
- if item.get('cached', False):
- file.Write(" cached_%s = %s;\n" % (item['name'], item['default']))
file.Write("}\n")
file.Write("""
@@ -7268,10 +7173,9 @@
for capability in _CAPABILITY_FLAGS:
capability_name = capability['name']
if test_prev:
- file.Write(""" if (prev_state->enable_flags.cached_%s !=
- enable_flags.cached_%s)\n""" %
+ file.Write(" if (prev_state->enable_flags.%s != enable_flags.%s)\n" %
(capability_name, capability_name))
- file.Write(" EnableDisable(GL_%s, enable_flags.cached_%s);\n" %
+ file.Write(" EnableDisable(GL_%s, enable_flags.%s);\n" %
(capability_name.upper(), capability_name))
file.Write(" if (prev_state) {")
@@ -7296,7 +7200,7 @@
file.Write(" if (")
args = []
for place, item in enumerate(group):
- item_name = CachedStateName(item)
+ item_name = item['name']
args.append('%s' % item_name)
if test_prev:
if place > 0:
@@ -7309,22 +7213,20 @@
(state['func'], ('GL_FRONT', 'GL_BACK')[ndx], ", ".join(args)))
elif state['type'] == 'NamedParameter':
for item in state['states']:
- item_name = CachedStateName(item)
-
if 'extension_flag' in item:
file.Write(" if (feature_info_->feature_flags().%s)\n " %
item['extension_flag'])
if test_prev:
file.Write(" if (prev_state->%s != %s)\n" %
- (item_name, item_name))
+ (item['name'], item['name']))
file.Write(" gl%s(%s, %s);\n" %
- (state['func'], item['enum'], item_name))
+ (state['func'], item['enum'], item['name']))
else:
if test_prev:
file.Write(" if (")
args = []
for place, item in enumerate(state['states']):
- item_name = CachedStateName(item)
+ item_name = item['name']
args.append('%s' % item_name)
if test_prev:
if place > 0:
@@ -7427,25 +7329,16 @@
for capability in _CAPABILITY_FLAGS:
file.Write(" case GL_%s:\n" % capability['name'].upper())
if 'state_flag' in capability:
-
- file.Write("""\
- state_.enable_flags.%(name)s = enabled;
- if (state_.enable_flags.cached_%(name)s != enabled
- || state_.ignore_cached_state) {
- %(state_flag)s = true;
- }
- return false;
- """ % capability)
+ file.Write(""" if (state_.enable_flags.%(name)s != enabled) {
+ state_.enable_flags.%(name)s = enabled;
+ %(state_flag)s = true;
+ }
+ return false;
+""" % capability)
else:
- file.Write("""\
- state_.enable_flags.%(name)s = enabled;
- if (state_.enable_flags.cached_%(name)s != enabled
- || state_.ignore_cached_state) {
- state_.enable_flags.cached_%(name)s = enabled;
- return true;
- }
- return false;
- """ % capability)
+ file.Write(""" state_.enable_flags.%(name)s = enabled;
+ return true;
+""" % capability)
file.Write(""" default:
NOTREACHED();
return false;
« no previous file with comments | « no previous file | gpu/command_buffer/service/context_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698