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/tests | |
| 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/tests')
| -rw-r--r-- | o3d/tests/common/mac/testing_common.mm | 1 | ||||
| -rw-r--r-- | o3d/tests/tests.gyp | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/o3d/tests/common/mac/testing_common.mm b/o3d/tests/common/mac/testing_common.mm index c00ef34..0d2a2e0 100644 --- a/o3d/tests/common/mac/testing_common.mm +++ b/o3d/tests/common/mac/testing_common.mm @@ -33,6 +33,7 @@ // Contains macintosh-specific code for setting up the Client object // used in the unit tests. +#include <GL/glew.h> #include <OpenGL/OpenGL.h> #include <OpenGL/gl.h> #include <OpenGL/glu.h> diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp index 1aef0cc..8942228 100644 --- a/o3d/tests/tests.gyp +++ b/o3d/tests/tests.gyp @@ -221,6 +221,13 @@ }, }, ], + ['OS == "win" and (renderer == "gl" or cb_service == "gl")', + { + 'dependencies': [ + '../build/libs.gyp:gl_libs', + ], + }, + ], ['OS == "linux"', { 'sources': [ |