summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Make gyp build get idl files from only one location.gman@google.com2009-11-042-58/+27
| | | | | | Review URL: http://codereview.chromium.org/346043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30896 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for build.gman@google.com2009-11-041-1/+1
| | | | | | | | | | The if was wrong. If the jscompiler exists we DON'T want the non-compiled files. Review URL: http://codereview.chromium.org/342108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30895 0039d316-1c4b-4281-b951-d872f2087c98
* Change build to only have one place to listgman@google.com2009-11-037-378/+239
| | | | | | | | | o3djs files and build / selenium to use compiled o3djs libs. Review URL: http://codereview.chromium.org/353017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30838 0039d316-1c4b-4281-b951-d872f2087c98
* Switch gypbuild to use devenv instead of msbuild.gman@google.com2009-11-031-3/+9
| | | | | | | | | | devenv is significantly faster. For an up to date build (ie, a build that shouldn't build anything) devenv is 2.5x faster. Review URL: http://codereview.chromium.org/340038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30806 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Add support for loading environment variables at plugin start-up from ↵tschmelcher@chromium.org2009-11-034-0/+148
| | | | | | | | | | | a file on disk. This lets us set any needed environment variables in a cross-browser way (i.e., without trying to modify the browsers' program launcher scripts to set variables for us). This is needed on some 64-bit systems where an environment variable has to be set in order for MESA to know where to find its GPU drivers. BUG=none TEST=built, created envvars file, and put something in it; verified that it was set successfully Review URL: http://codereview.chromium.org/340044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30799 0039d316-1c4b-4281-b951-d872f2087c98
* Put back some scons files that the docs build parses, but rename themgspencer@google.com2009-11-034-8/+163
| | | | | | | | | with ".manifest", since we no longer have a scons build. We should probably change the code that parses these to be simpler someday. Review URL: http://codereview.chromium.org/341073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30774 0039d316-1c4b-4281-b951-d872f2087c98
* This change kills the SCons build, since we have switched completelygspencer@google.com2009-11-0234-5520/+106
| | | | | | | | | over to GYP. It also copies the contents of DEPS_gyp to DEPS, and removes the DEPS_gyp file. Review URL: http://codereview.chromium.org/354011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30729 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for GL unit_tests.gman@google.com2009-10-293-7/+7
| | | | | | | | | | | | | | | | | | Apparently there are issues with making a window off screen. We were creating a 512/512 window -1000 pixels off the screen. This worked before but recently it stopped working on my (gman) machine. I checked by building the release build 0.1.42.3 and that version fails as well where as it used to work. I don't know what changed on my machine. Also added CS_OWNDC in several places. Review URL: http://codereview.chromium.org/339057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30413 0039d316-1c4b-4281-b951-d872f2087c98
* Change from absolute paths to relative paths to allow tests,etc. to be ↵kkania@google.com2009-10-283-114/+113
| | | | | | | | | located in any directory, as long as the directory structure is correct. Original review at: http://codereview.chromium.org/344013. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30377 0039d316-1c4b-4281-b951-d872f2087c98
* Splits the command buffers into common commandsgman@google.com2009-10-2817-196/+488
| | | | | | | | | | | | and specific commands. Common are things like Noop, SetToken, Jump, Gosub, return. Specific are O3D etc... Review URL: http://codereview.chromium.org/329046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30365 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 30359 - Change from absolute paths to relative paths to allow ↵kkania@google.com2009-10-283-112/+114
| | | | | | | | | | | tests,etc. to be located in any directory, as long as the directory structure is maintained. Review URL: http://codereview.chromium.org/344013 TBR=kkania@google.com Review URL: http://codereview.chromium.org/345013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30362 0039d316-1c4b-4281-b951-d872f2087c98
* Change from absolute paths to relative paths to allow tests,etc. to be ↵kkania@google.com2009-10-283-114/+112
| | | | | | | | located in any directory, as long as the directory structure is maintained. Review URL: http://codereview.chromium.org/344013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30359 0039d316-1c4b-4281-b951-d872f2087c98
* Mapping third_party/makeself for the GYP build as well.vangelis@google.com2009-10-281-0/+3
| | | | | | Review URL: http://codereview.chromium.org/342009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30353 0039d316-1c4b-4281-b951-d872f2087c98
* Add --clean support to gypbuild.gman@google.com2009-10-281-90/+185
| | | | | | | | Also, re-arranged code to have a class per platform. Review URL: http://codereview.chromium.org/341009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30292 0039d316-1c4b-4281-b951-d872f2087c98
* Adding mapping for third_party/makeself. This is to complete checkin of ↵vangelis@google.com2009-10-271-0/+3
| | | | | | | | http://codereview.appspot.com/132050 Review URL: http://codereview.chromium.org/333016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30275 0039d316-1c4b-4281-b951-d872f2087c98
* Adding support for windows safari. This requires registering the o3d plugin ↵vangelis@google.com2009-10-273-3/+17
| | | | | | | | | with firefox (via registry entries) and adding Safari to the list of supported User Agents. Review URL: http://codereview.chromium.org/326001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30274 0039d316-1c4b-4281-b951-d872f2087c98
* Adding the o3d-internal include path before the others so that if ↵vangelis@google.com2009-10-272-0/+4
| | | | | | | | | o3d-internal is there it will be picked up first. This is how scons was setup. This is important for initializing swiftshader. Review URL: http://codereview.chromium.org/331002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30235 0039d316-1c4b-4281-b951-d872f2087c98
* GPUPluginObject has methods to query its current window size.apatrick@google.com2009-10-273-0/+96
| | | | | | | | | | GPUPluginObject sends event to client process when its window is resized. TEST=none BUG=none Review URL: http://codereview.chromium.org/344001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30223 0039d316-1c4b-4281-b951-d872f2087c98
* Update o3d_code_rev from 154 to 157, to get the new bitmap-draw-image ↵kkania@google.com2009-10-273-3/+3
| | | | | | | | reference image. Review URL: http://codereview.chromium.org/333051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30221 0039d316-1c4b-4281-b951-d872f2087c98
* move all O3D specific command buffer stuff to command_buffer::o3dgman@google.com2009-10-2649-643/+690
| | | | | | | | | namespace. That's so I can add command_buffer::xxx namespace for different command buffer. Review URL: http://codereview.chromium.org/332036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30118 0039d316-1c4b-4281-b951-d872f2087c98
* Pulling in latest gyp.bradnelson@google.com2009-10-262-2/+2
| | | | | | | | | | BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/337028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30083 0039d316-1c4b-4281-b951-d872f2087c98
* Adjusted timeouts for a couple failing tests; switched from umount to ↵kkania@google.com2009-10-264-57/+51
| | | | | | | | hdiutil detach to solve some unmounting problems seen on Tiger. Review URL: http://codereview.chromium.org/332030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30077 0039d316-1c4b-4281-b951-d872f2087c98
* Adding lib path to glew to invocation of converter.bradnelson@google.com2009-10-241-1/+5
| | | | | | | | | | | | This seems to be needed for 64-bit. BUG=None TEST=None TBR=gman Review URL: http://codereview.chromium.org/328021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30013 0039d316-1c4b-4281-b951-d872f2087c98
* Fix beach demo strafe.gman@google.com2009-10-241-1/+1
| | | | | | Review URL: http://codereview.chromium.org/328019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29974 0039d316-1c4b-4281-b951-d872f2087c98
* Change gpybuild to use o3d_all if o3d-internal existsgman@google.com2009-10-231-3/+61
| | | | | | | | | and o3d if it does not. Also updates solutions if they don't match the current version of visual studio. Review URL: http://codereview.chromium.org/303011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29931 0039d316-1c4b-4281-b951-d872f2087c98
* Remove waterdemo samples from build as they havegman@google.com2009-10-231-9/+0
| | | | | | | | been removed from svn Review URL: http://codereview.chromium.org/319004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29925 0039d316-1c4b-4281-b951-d872f2087c98
* TBR=apatrickgman@google.com2009-10-231-2/+2
| | | | | | | | | | | | | | | Fix for OSX and last libs.gyp change No idea why but mac gyp gets an error with those 2 mac settings set to all_dependent_settings instead of direct_dependent_settings. This fix only makes gyp actually build the xcodeproj files. It doesn't actually make the builds work. Review URL: http://codereview.chromium.org/328005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29885 0039d316-1c4b-4281-b951-d872f2087c98
* Trying to fix the build. gman taking over.apatrick@google.com2009-10-234-11/+12
| | | | | | Review URL: http://codereview.chromium.org/329002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29855 0039d316-1c4b-4281-b951-d872f2087c98
* Use scoped_array (not scoped_ptr) with new[].kuchhal@chromium.org2009-10-231-1/+1
| | | | | | | | | BUG=24266 TEST=No functional change so make sure nothing changes. Review URL: http://codereview.chromium.org/307045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29843 0039d316-1c4b-4281-b951-d872f2087c98
* fixed include order issues for osx I introducedgman@google.com2009-10-222-5/+8
| | | | | | | | with last change. Review URL: http://codereview.chromium.org/327002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29838 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes to get renderer=cb cb_service=gl to compilegman@google.com2009-10-2248-881/+1168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Switching on svn trybot submit.bradnelson@google.com2009-10-221-0/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29813 0039d316-1c4b-4281-b951-d872f2087c98
* Added CommandBuffer::GetStatus so remote processes can query whether the ↵apatrick@google.com2009-10-228-74/+246
| | | | | | | | | | | | | plugin has a window handle. Refactored GPUPluginObject so its CommandBuffer and GPUProcessor can be mocked. Added some new tests using these mock objects. TEST=none BUG=none Review URL: http://codereview.chromium.org/309005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29811 0039d316-1c4b-4281-b951-d872f2087c98
* Fix O3D release binary. Turns out that with current tools we always need ↵maf@google.com2009-10-211-1/+1
| | | | | | | | GCC_SYMBOLS_PRIVATE_EXTERN set to 'NO', or the plugin gets over-stripped and broken. Review URL: http://codereview.chromium.org/300046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29736 0039d316-1c4b-4281-b951-d872f2087c98
* Forcibly remove all plugin files.kkania@google.com2009-10-212-6/+9
| | | | | | Review URL: http://codereview.chromium.org/313007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29659 0039d316-1c4b-4281-b951-d872f2087c98
* Split the selenium browser name into the browser name and browser path for ↵kkania@google.com2009-10-211-3/+6
| | | | | | the main.py selenium test runner. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29653 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bad identation bug.kkania@google.com2009-10-211-2/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29595 0039d316-1c4b-4281-b951-d872f2087c98
* Remove browser installation from lab test runner. This will now happen ↵kkania@google.com2009-10-211-60/+34
| | | | | | | | during machine preparation. Review URL: http://codereview.chromium.org/307014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29593 0039d316-1c4b-4281-b951-d872f2087c98
* Move registering o3d_host.dll to selenium.gyp becausegman@google.com2009-10-203-25/+87
| | | | | | | | | | | | | | | you shouldn't have to register the dll just because you built it. Then, make registering o3d_host.dll and selenium_ie only happen if you are running as admin. This makes it so you can build the O3D without turning of UAC or running as admin. Only if you want to run seleniun_ie do you need to be admin. Review URL: http://codereview.chromium.org/307012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29573 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bugs in rendergraph.jsgman@google.com2009-10-201-2/+2
| | | | | | | | DrawPassInfo.destroy was not correctly deleting things. Review URL: http://codereview.chromium.org/297016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29567 0039d316-1c4b-4281-b951-d872f2087c98
* Remove +x bit from files that shouldn't have it.evan@chromium.org2009-10-201-0/+0
| | | | | | Review URL: http://codereview.chromium.org/307007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29548 0039d316-1c4b-4281-b951-d872f2087c98
* Removed workaround for Chrome 1.0 from o3djs library.apatrick@google.com2009-10-1911-121/+81
| | | | | | | | Fix big causing Canvas sample to crash. Review URL: http://codereview.chromium.org/303008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29477 0039d316-1c4b-4281-b951-d872f2087c98
* Removes O3D plugin files with root privileges on Mac and Linux.kkania@google.com2009-10-191-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29476 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes path of ChangeResolution.kkania@google.com2009-10-191-1/+1
| | | | | | Review URL: http://codereview.chromium.org/297012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29465 0039d316-1c4b-4281-b951-d872f2087c98
* Forgot to commit a file.apatrick@google.com2009-10-191-0/+8
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29456 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed gpu_plugin to build in the Chrome tree.apatrick@google.com2009-10-194-28/+48
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/302009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29455 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes bug so that now if changing screen resolution fails, the tests fail.kkania@google.com2009-10-191-1/+1
| | | | | | Review URL: http://codereview.chromium.org/294007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29441 0039d316-1c4b-4281-b951-d872f2087c98
* Changes code header comments to match typical C++ header.kkania@google.com2009-10-191-5/+31
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29432 0039d316-1c4b-4281-b951-d872f2087c98
* Changed O3D to use CommandBuffer in-process. Still not connecting to the GPU ↵apatrick@google.com2009-10-1979-6559/+1607
| | | | | | | | | | | | | | | | | | | | | plugin. I removed all the NaCl dependencies. Synchronous messages are now sent by NPAPI. Removed BufferSyncInterface and replaced it with CommandBuffer. CommandBufferHelper now uses NPAPI. Changed some unsigned ints to int32s because NPAPI doesn't support unsigned int. There are now two subclasses of RendererCB. RendererCBLocal is for use with an in-process CommandBuffer. RendererCBRemote is for use with an out-of-process CommandBuffer. I'm going to rearrange the locations of the source files under gpu_plugin next. CommandBuffer and GPUProcessor probably belong in the command_buffer_service library now. np_utils and system_services should be standalone libraries. TEST=none BUG=none Review URL: http://codereview.chromium.org/266068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29429 0039d316-1c4b-4281-b951-d872f2087c98
* Relocate some of the lab testing scripts.kkania@google.com2009-10-1911-1/+1635
| | | | | | Review URL: http://codereview.chromium.org/302006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29422 0039d316-1c4b-4281-b951-d872f2087c98