diff options
author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 18:54:41 +0000 |
---|---|---|
committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-14 18:54:41 +0000 |
commit | e518616f8e5f78485c144591d2c78da6bf2ad175 (patch) | |
tree | a1cf7d34b42610e8851e96144a713bfa927ef185 /gpu/command_buffer/build_gles2_cmd_buffer.py | |
parent | 3014c2191c848afd47e9528deea70e54708ea0aa (diff) | |
download | chromium_src-e518616f8e5f78485c144591d2c78da6bf2ad175.zip chromium_src-e518616f8e5f78485c144591d2c78da6bf2ad175.tar.gz chromium_src-e518616f8e5f78485c144591d2c78da6bf2ad175.tar.bz2 |
Changes required to get glValidateProgram to work
correctly.
TEST=unit tests and conformance tests.
BUG=none
Review URL: http://codereview.chromium.org/2725006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/build_gles2_cmd_buffer.py')
-rwxr-xr-x | gpu/command_buffer/build_gles2_cmd_buffer.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index acea9d3..1b7df40 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -1196,8 +1196,7 @@ _FUNCTION_INFO = { }, 'GetProgramInfoLog': { 'type': 'STRn', - 'get_len_func': 'glGetProgramiv', - 'get_len_enum': 'GL_INFO_LOG_LENGTH', + 'expectation': False, }, 'GetRenderbufferParameteriv': { 'type': 'GETn', @@ -3747,7 +3746,7 @@ TEST_F(%(test_name)s, %(name)sValidArgs) { 'args': '%s, kBucketId' % args[0].GetValidArg(0, 0), 'expect_len_code': '', } - if get_len_func[0:2] == 'gl': + if get_len_func and get_len_func[0:2] == 'gl': sub['expect_len_code'] = ( " EXPECT_CALL(*gl_, %s(%s, %s, _))\n" " .WillOnce(SetArgumentPointee<2>(strlen(kInfo) + 1));") % ( |