summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Pulling in newer gyp which fixes link after copy problem.bradnelson@google.com2009-10-163-3/+3
| | | | | | | | | | | Updating LIBRARY_PREFIX -> SHARED_LIB_PREFIX to reflect changed convention. BUG=None TEST=None Review URL: http://codereview.chromium.org/283014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29302 0039d316-1c4b-4281-b951-d872f2087c98
* all.sln to o3d_all.slngman@google.com2009-10-161-4/+9
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29300 0039d316-1c4b-4281-b951-d872f2087c98
* This moves the Cg libs into a library directory under the product dir,gspencer@google.com2009-10-156-6/+30
| | | | | | | | | | | | | and fixes the locations in the executable so that unit tests run correctly. Also, removes explicit references to Cg.framework from plugin and converter gyp files, since they already rely on cg_libs, and that should be sufficient. Review URL: http://codereview.chromium.org/276049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29199 0039d316-1c4b-4281-b951-d872f2087c98
* Missing file from last checkinggman@google.com2009-10-151-0/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29161 0039d316-1c4b-4281-b951-d872f2087c98
* Adding hard_dependency to cg_libs, to make sure the copy happens before thebradnelson@google.com2009-10-151-0/+1
| | | | | | | | | | | | | link stage. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/273067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29151 0039d316-1c4b-4281-b951-d872f2087c98
* Fix clearing render targets in D3D if theregman@google.com2009-10-157-20/+186
| | | | | | | | | | | | | is no associated depth buffer. There's something I don't get here. I thought the dimensions of the depth-stencil and the render target had to match but apparently they don't? Review URL: http://codereview.chromium.org/270100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29084 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in libX11, which seems to be needed for test_common on linux.bradnelson@google.com2009-10-151-2/+3
| | | | | | | | | | | | | Failing on one trybot. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/264064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29074 0039d316-1c4b-4281-b951-d872f2087c98
* Remove pack from calls to texture.getRenderSurfacegman@google.com2009-10-155-6/+6
| | | | | | | | as that has been deprecated. Review URL: http://codereview.chromium.org/274042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29070 0039d316-1c4b-4281-b951-d872f2087c98
* This updates the GYP revision to the latest one to fixgspencer@google.com2009-10-141-1/+1
| | | | | | | the Linux and Mac builds. Review URL: http://codereview.chromium.org/267108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29052 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes perceptual diff pixel comparison bug and CustomCamera test.kkania@google.com2009-10-142-4/+5
| | | | | | Review URL: http://codereview.chromium.org/270098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28928 0039d316-1c4b-4281-b951-d872f2087c98
* Moved responsibility for creating ring buffer from CommandBuffer to ↵apatrick@google.com2009-10-136-134/+164
| | | | | | | | | | | GPUPluginObject. TEST=none BUG=none Review URL: http://codereview.chromium.org/264041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28858 0039d316-1c4b-4281-b951-d872f2087c98
* This moves our chromium revision forward to catch some changes togspencer@google.com2009-10-131-2/+2
| | | | | | | | base that are needed to make the tree green again. Review URL: http://codereview.chromium.org/267080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28847 0039d316-1c4b-4281-b951-d872f2087c98
* Use ASCII strings for switch names.evan@chromium.org2009-10-134-24/+24
| | | | | | Review URL: http://codereview.chromium.org/270062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28779 0039d316-1c4b-4281-b951-d872f2087c98
* Doesn't run the TestStressDrawShapes test on IE, because selenium/ie is too ↵kkania@google.com2009-10-131-1/+2
| | | | | | | | slow (IE6 5-10 min). Review URL: http://codereview.chromium.org/272034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28766 0039d316-1c4b-4281-b951-d872f2087c98
* This removes the command buffer tests from the non-command buffergspencer@google.com2009-10-132-15/+23
| | | | | | | | builds because they fail with the current version of nacl, and Al is busy making command buffer code that doesn't use nacl anyhow. Review URL: http://codereview.chromium.org/266057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28765 0039d316-1c4b-4281-b951-d872f2087c98
* Make the bubble demo use the command buffer structs.gman@google.com2009-10-123-375/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please chime in on how you would like this changed. Issues *) should I delete the old nacl setup code? Basically I commented out the old NaCl initialization code and then copied the initialization code from big_test. My understanding is whatever the old way was is no longer current. If I don't delete the old code should I go through the trouble of separating the common code "bubble_demo" from the setup code? I'd prefer to just leave it as is and let someone who knows the nacl stuff better to fix it. *) How do I make it build correctly and also for gyp? Also I'm not sure how to build it correctly. The build.scons works but I get warnings like: scons: warning: Two different environments were specified for target cross\buffer_sync_proxy.obj, but they appear to have the same action: $CXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $CXXFLAGS $CCFLAGS $_CCCOMCOM File "C:\src\o3d_spud\o3d\site_scons\site_tools\component_builders.py", line 249, in ComponentLibrary Review URL: http://codereview.chromium.org/251052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28757 0039d316-1c4b-4281-b951-d872f2087c98
* Add a DLOG error to the command buffer and removegman@google.com2009-10-128-69/+173
| | | | | | | | | | | | | | | | | a little of the macro magic. Also, fix the build. Renderer_cb was missing some functions. I seems like it would be really good if we could add something like this to the non-debug version because developers need an easy way to check for errors. Maybe these errors can go to the chrome error console or something, at least in chrome. Review URL: http://codereview.chromium.org/267061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28753 0039d316-1c4b-4281-b951-d872f2087c98
* Changes assertMatrix to call get_eval per matrix instead of per every value ↵kkania@google.com2009-10-122-8/+10
| | | | | | | | in the matrix, in order to fix RotateModel test on ie6. Review URL: http://codereview.chromium.org/271062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28746 0039d316-1c4b-4281-b951-d872f2087c98
* More gypbuild infrustructure.gman@google.com2009-10-121-21/+95
| | | | | | | | | | | | | No idea if this is the best structure or the correct options but I have to start somewhere. If you have better ideas speakup or start editing :-D If there is a way to get gpy to list the targets please tell me so I can call it. Review URL: http://codereview.chromium.org/242068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28744 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for canvas.drawBitmapgman@google.com2009-10-124-6/+9
| | | | | | Review URL: http://codereview.chromium.org/269055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28741 0039d316-1c4b-4281-b951-d872f2087c98
* Separated CommandBuffer and GPUProcessor into separate static library so O3D ↵apatrick@google.com2009-10-121-32/+38
| | | | | | | | | | | can link against it in the interim. TEST=none BUG=none Review URL: http://codereview.chromium.org/255098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28740 0039d316-1c4b-4281-b951-d872f2087c98
* Drop redundant CommandLine::Terminate.evan@chromium.org2009-10-123-3/+3
| | | | | | | | | We had two functions that did the same thing. Though Terminate came first, I think Reset better conveys the intent. Review URL: http://codereview.chromium.org/267047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28708 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes (again) the rendering problem we have with zero-heightgspencer@google.com2009-10-091-0/+5
| | | | | | | | | | | | | window resizes from Firefox. It puts back the explicit window resize, but doesn't do it if the window is zero width or height. This seems to fix the problem without causing resize problems in the beach demo. TESTED=ran beach demo, 2d, and render-mode examples, in separate tabs and checked to make sure that background tabs didn't draw over foreground tabs (all in Firefox). Review URL: http://codereview.chromium.org/267041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28610 0039d316-1c4b-4281-b951-d872f2087c98
* This rolls back V8 to the version we had previously.gspencer@google.com2009-10-091-1/+1
| | | | | | | | | | | I had originally rolled this forward to match what Chrome was using (r3030 of v8), but using that version of v8 stops us from rendering for some reason. I'm rolling this back so we can render again, but we'll have to figure out what broke our rendering before we can roll v8 forward. Review URL: http://codereview.chromium.org/271039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28608 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-01-17 05:58:50 +0000