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 902aca01ef122f59a3007247ac804caac991ad21..4af8a39962ce52fd40d000679581be3dab85b221 100755 |
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py |
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py |
@@ -4851,7 +4851,8 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) { |
"occlusion_query_EXT", "CHROMIUM_image", |
"CHROMIUM_copy_texture", |
"CHROMIUM_pixel_transfer_buffer_object"] |
- if func.IsCoreGLFunction() or func.GetInfo("extension") in extensions: |
+ if func.IsCoreGLFunction() or func.GetInfo("extension") in extensions or \ |
+ func.GetInfo("extension_flag") == "chromium_framebuffer_multisample": |
piman
2015/09/14 21:17:12
Can you just add the proper 'extension': line to t
Peng
2015/09/15 15:07:30
Done.
|
f.write("MojoGLES2MakeCurrent(context_);"); |
func_return = "gl" + func.original_name + "(" + \ |
func.MakeOriginalArgString("") + ");" |
@@ -10438,6 +10439,7 @@ class MojoGLES2Impl : public gpu::gles2::GLES2Interface { |
#include "base/logging.h" |
#include "third_party/mojo/src/mojo/public/c/gles2/chromium_copy_texture.h" |
+#include "third_party/mojo/src/mojo/public/c/gles2/chromium_framebuffer_multisample.h" |
#include "third_party/mojo/src/mojo/public/c/gles2/chromium_image.h" |
#include "third_party/mojo/src/mojo/public/c/gles2/chromium_miscellaneous.h" |
#include "third_party/mojo/src/mojo/public/c/gles2/chromium_pixel_transfer_buffer_object.h" |
@@ -10868,7 +10870,8 @@ const size_t GLES2Util::enum_to_string_table_len_ = |
"""Provides the GL implementation for mojo for a particular extension""" |
with CWriter(filename) as f: |
for func in self.original_functions: |
- if func.GetInfo("extension") != extension: |
+ if func.GetInfo("extension") != extension and \ |
+ func.GetInfo("extension_flag") != extension: |
continue |
f.write("VISIT_GL_CALL(%s, %s, (%s), (%s))\n" % |
(func.name, func.return_type, |
@@ -11012,6 +11015,9 @@ def main(argv): |
gen.WriteMojoGLCallVisitorForExtension( |
mojo_gles2_prefix + "_chromium_pixel_transfer_buffer_object_autogen.h", |
"CHROMIUM_pixel_transfer_buffer_object") |
+ gen.WriteMojoGLCallVisitorForExtension( |
+ mojo_gles2_prefix + "_chromium_framebuffer_multisample_autogen.h", |
+ "chromium_framebuffer_multisample") |
Format(gen.generated_cpp_filenames) |