diff options
author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 22:57:44 +0000 |
---|---|---|
committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 22:57:44 +0000 |
commit | 2c1639589b5932b565c9d420cb79b56a4212a706 (patch) | |
tree | d74cd853d4753f9c19e5d50ad58d156a33417806 /o3d/plugin | |
parent | 2e29d9243d84374d861a86252a2923cba9e49941 (diff) | |
download | chromium_src-2c1639589b5932b565c9d420cb79b56a4212a706.zip chromium_src-2c1639589b5932b565c9d420cb79b56a4212a706.tar.gz chromium_src-2c1639589b5932b565c9d420cb79b56a4212a706.tar.bz2 |
Fixes to get renderer=cb cb_service=gl to compile
again.
I was working on spliting some of the command buffer
code in preparation for GL command buffers so those
changes are in there as well. I didn't realize the
gl command buffers were broken.
I'm planning on sharing some of the command buffer
code and commands so I thought about making the
command buffers into 2 parts. The first N (256?)
commands are common commands. Noop, SetToken, Jump
Gosub. Those will be handled by common code.
After that come the O3D or GL command buffer
commands. I'm not sure that's a good idea but
there is a significant amount of code in managing
tokens and parsing etc and it seems like it would
be nice to share it until/if we delete the O3D
command buffers.
Note: You'll see that SetToken is hardcoded to 1.
I plan to fix that in the next CL when I split
the command into shared vs specific.
Review URL: http://codereview.chromium.org/307043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
-rw-r--r-- | o3d/plugin/plugin.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 819f2dd..78b29c3 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -95,7 +95,7 @@ ], }, ], - ['renderer == "gl"', + ['renderer == "gl" or cb_service == "gl"', { 'dependencies': [ '../build/libs.gyp:gl_libs', |