chromium/src
0
Fork 0
Code Activity

Revert 73222 - Make target running GLES2 autogen script.

Browse Source 
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

TBR=neb@chromium.org

This change was causing just building to create merge conflicts in
clean repos.  Either these targets shouldn't be part of standard build
targets like "chrome" or "unit_tests", or we shouldn't have build targets 
which generate output into the working tree...

Review URL: http://codereview.chromium.org/6461001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74161 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
gavinp@chromium.org
2011-02-08 20:19:25 +00:00
parent a771dc3feb
commit 35e9ba80f1
3 changed files with 2 additions and 71 deletions

19
gpu/command_buffer/build_gles2_cmd_buffer.py

@ -5482,34 +5482,20 @@ def main(argv):
"bindings. \"chrome_ppapi\" generate chrome implementation for ppapi. "
"\"chrome_ppapi_proxy\" will generate the glue for the chrome IPC ppapi"
"proxy.")
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":
# 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")
gen.WritePepperGLES2Interface("ppapi/c/dev/ppb_opengles_dev.h")
gen.WriteGLES2ToPPAPIBridge("ppapi/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")
@ -5518,7 +5504,6 @@ def main(argv):
"ppapi/proxy/ppb_opengles2_proxy.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")

25
ppapi/ppapi_gl.gypi

@ -62,30 +62,5 @@
'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',
}],
},
],
}

29
webkit/glue/webkit_glue.gypi

@ -152,35 +152,6 @@
'conditions': [
],
},
{
'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)',