diff options
author | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 23:39:57 +0000 |
---|---|---|
committer | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 23:39:57 +0000 |
commit | 4e3f0ab69737fa199e544cd11726583d84944d65 (patch) | |
tree | f96c62b72cc5df1f58ac544a960a1b1f0abb038e | |
parent | 6e771985c39613c83dfa6d7e8dbfc8ecfdaa8660 (diff) | |
download | chromium_src-4e3f0ab69737fa199e544cd11726583d84944d65.zip chromium_src-4e3f0ab69737fa199e544cd11726583d84944d65.tar.gz chromium_src-4e3f0ab69737fa199e544cd11726583d84944d65.tar.bz2 |
Make target running GLES2 autogen script.
Also lays groundwork for rebuilding Pepper OpenGL ES bindings as part of the build.
BUG=none
TEST=run "make ppapi_gles_bindings" or "make ppapi_gles_implementation".
Review URL: http://codereview.chromium.org/5212006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73222 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-x | gpu/command_buffer/build_gles2_cmd_buffer.py | 25 | ||||
-rw-r--r-- | ppapi/ppapi_gl.gypi | 25 | ||||
-rw-r--r-- | webkit/glue/webkit_glue.gypi | 29 |
3 files changed, 73 insertions, 6 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index 522be5e..93b13ea 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -5400,28 +5400,41 @@ def main(argv): parser.add_option( "--alternate-mode", type="choice", choices=("ppapi", "chrome_ppapi"), - help="generate files for other projects. \"ppapi\" must be run from the " - "directory containing the ppapi directory, and will generate ppapi " - "bindings. \"chrome_ppapi\" must be run from chrome src directory and " - "will generate chrome plumbing for ppapi.") + help="generate files for other projects. \"ppapi\" will generate ppapi " + "bindings. \"chrome_ppapi\" generate chrome implementation for ppapi.") + parser.add_option( + "--output-dir", + help="base directory for resulting files, under chrome/src. default is " + "empty. Use this if you want the result stored under gen.") parser.add_option( "-v", "--verbose", action="store_true", help="prints more output.") (options, args) = parser.parse_args(args=argv) + # This script lives under gpu/command_buffer, cd to base directory. + os.chdir(os.path.dirname(__file__) + "/../..") + gen = GLGenerator(options.verbose) gen.ParseGLH("common/GLES2/gl2.h") + # Support generating files under gen/ + if options.output_dir != None: + os.chdir(options.output_dir) + if options.alternate_mode == "ppapi": - gen.WritePepperGLES2Interface("ppapi/c/dev/ppb_opengles_dev.h") - gen.WriteGLES2ToPPAPIBridge("ppapi/lib/gl/gles2/gles2.c") + # To trigger this action, do "make ppapi_gles_bindings" + os.chdir("ppapi"); + gen.WritePepperGLES2Interface("c/dev/ppb_opengles_dev.h") + gen.WriteGLES2ToPPAPIBridge("lib/gl/gles2/gles2.c") elif options.alternate_mode == "chrome_ppapi": + # To trigger this action, do "make ppapi_gles_implementation" gen.WritePepperGLES2Implementation( "webkit/plugins/ppapi/ppb_opengles_impl.cc") else: + os.chdir("gpu/command_buffer") gen.WriteCommandIds("common/gles2_cmd_ids_autogen.h") gen.WriteFormat("common/gles2_cmd_format_autogen.h") gen.WriteFormatTest("common/gles2_cmd_format_test_autogen.h") diff --git a/ppapi/ppapi_gl.gypi b/ppapi/ppapi_gl.gypi index 7af9694..4f2b16c 100644 --- a/ppapi/ppapi_gl.gypi +++ b/ppapi/ppapi_gl.gypi @@ -62,5 +62,30 @@ 'lib/gl/gles2/gles2.c', ], }, + { + 'target_name': 'ppapi_gles_bindings', + 'type': 'none', + 'suppress_wildcard': 1, + 'actions': [ + { + 'action_name': 'generate_ppapi_gles_bindings', + 'variables': { + 'gles_script': '<(DEPTH)/gpu/command_buffer/build_gles2_cmd_buffer.py', + }, + 'inputs': [ + '<(gles_script)', + ], + 'outputs': [ + 'c/dev/ppb_opengles_dev.h', + 'lib/gl/gles2/gles2.c', + ], + 'action': [ + 'python', + '<(gles_script)', + '--alternate-mode=ppapi' + ], + 'message': 'Generating Pepper OpenGL ES bindings', + }], + }, ], } diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 31744a0..3333035 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -153,6 +153,35 @@ ], }, { + 'target_name': 'ppapi_gles_implementation', + 'type': 'none', + 'suppress_wildcard': 1, + 'conditions': [ + ['enable_gpu==1', { + 'actions': [ + { + 'action_name': 'generate_ppapi_gles_implementation', + 'variables': { + 'gles_script': '<(DEPTH)/gpu/command_buffer/build_gles2_cmd_buffer.py', + }, + 'inputs': [ + '<(gles_script)', + ], + 'outputs': [ + '<(DEPTH)/webkit/plugins/ppapi/ppb_opengles_impl.cc', + ], + 'action': [ + 'python', + '<(gles_script)', + '--alternate-mode=chrome_ppapi' + ], + 'message': 'Generating Pepper OpenGL ES implementation', + } + ], + }], + ], + }, + { 'target_name': 'glue', 'type': '<(library)', 'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09', |