summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Pull in latest Nixysa for newer npapi.h.maf@google.com2009-10-091-1/+1
| | | | | | Review URL: http://codereview.chromium.org/270038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28582 0039d316-1c4b-4281-b951-d872f2087c98
* Adds support for recovering when a running test completes but killed the ↵kkania@google.com2009-10-095-417/+442
| | | | | | | | browser window. Before only test hangs were gracefully handled. Better timeouts for tests. Adds short delay between selenium commands for IE, to fix StressWindow test and others. Review URL: http://codereview.chromium.org/266031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28563 0039d316-1c4b-4281-b951-d872f2087c98
* This rearranges where the renderer variable is set so that GYPgspencer@google.com2009-10-083-58/+25
| | | | | | | doesn't complain when we're part of the Chrome build. Review URL: http://codereview.chromium.org/267025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28483 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes the rendering issue in Firefox by ignoring zero heightgspencer@google.com2009-10-081-5/+0
| | | | | | | | | | | | | | | | | resize requests from Firefox. When the fullscreen stuff was redone (r26489), we removed a WM_SIZE handler that would call the plugin's "Resize" API, and moved it into NPP_SetWindow, but at the same time a SetWindowPos call was also added that would take the window size as gospel and set it, but only if we're not in fullscreen mode. Turns out that this is not necessary because the Resize API already checks to see if we're in full-screen mode, and handles the spurious zero height messages properly too. So I just took out the explicit SetWindowPos. Review URL: http://codereview.chromium.org/268022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28482 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes the build by making all the sub-packagegspencer@google.com2009-10-081-3/+3
| | | | | | | | revision numbers be the same as the revisions called for by the Chrome DEPS file at the same rev as chomium_rev. Review URL: http://codereview.chromium.org/265049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28477 0039d316-1c4b-4281-b951-d872f2087c98
* Update DEPS to newer Chrome rev to fix Windows build.maf@google.com2009-10-081-4/+3
| | | | | | Review URL: http://codereview.chromium.org/261032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28462 0039d316-1c4b-4281-b951-d872f2087c98
* Update DEPS to pull in 10.4 fixes.maf@google.com2009-10-081-3/+3
| | | | | | Review URL: http://codereview.chromium.org/261030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28459 0039d316-1c4b-4281-b951-d872f2087c98
* Drastically improves selenium testing performance with IE by using ids for ↵kkania@google.com2009-10-082-23/+28
| | | | | | | | input elements. Review URL: http://codereview.chromium.org/271023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28421 0039d316-1c4b-4281-b951-d872f2087c98
* Turning on trybots for o3d.bradnelson@google.com2009-10-071-1/+1
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/268007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28314 0039d316-1c4b-4281-b951-d872f2087c98
* This updates us to the latest gyp revision, which fixes the Linuxbradnelson@google.com2009-10-062-12/+1
| | | | | | | | | build, and also removes a hack that was put in to get around Linux Gyp's old odd behavior. Review URL: http://codereview.chromium.org/260023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28188 0039d316-1c4b-4281-b951-d872f2087c98
* Further doc improvements for Line_.closestPointToRay() based onkbr@google.com2009-10-061-11/+10
| | | | | | | | comments in http://codereview.chromium.org/251097 . Review URL: http://codereview.chromium.org/243111 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28181 0039d316-1c4b-4281-b951-d872f2087c98
* This makes some changes to the o3d tree in preparationgspencer@google.com2009-10-0617-845/+819
| | | | | | | | | | | | | | | | | | | | | | | | for landing in Chrome. The biggest pieces here are moving some of the third party dependencies back into o3d/third_party because they need to be distinct from the chrome versions of the same packages, and because O3D is the only one using the dependency. (NPAPI in particular). Also the plugin gyp file is now modified so that it can handle being part of both a chrome developer tree and an o3d developer tree (in the latter case, it generates the plugin and installer, in the former it does not) BE AWARE that this change will change the main solution/xcodebuild file from "build/all" to be "build/o3d", but rebuilding from gyp files will NOT remove the old "build/all" one, so you might be tricked into opening the wrong one. Review URL: http://codereview.chromium.org/256081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28169 0039d316-1c4b-4281-b951-d872f2087c98
* Fx a GCC GYP release build problem. GCC (in release mode) wants to see a ↵maf@google.com2009-10-061-4/+6
| | | | | | | | test for the same object being passed into the override on operator =. This causing a compiler warning when this got invoked via std::vector::push_back. Review URL: http://codereview.chromium.org/257068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28164 0039d316-1c4b-4281-b951-d872f2087c98
* Improved documentation for the derivation of Line_.closestPointToRay().kbr@google.com2009-10-061-1/+41
| | | | | | Review URL: http://codereview.chromium.org/251097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28132 0039d316-1c4b-4281-b951-d872f2087c98
* Add comments setting emacs and vim tab width and expansion variables.sgk@google.com2009-10-0625-0/+150
| | | | | | | | BUG=none TEST=successful builds Review URL: http://codereview.chromium.org/256059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28089 0039d316-1c4b-4281-b951-d872f2087c98
* Changed line endings on these files to newline characters. This is an ↵petersont@google.com2009-10-052-494/+494
| | | | | | | | attempt to clear up an inconsistency that brings up an annoying dialog in msvs. Review URL: http://codereview.chromium.org/243062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28056 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes the GL build so it works.gspencer@google.com2009-10-053-2/+15
| | | | | | | Just add "-Drenderer=gl" to the hooks args. Review URL: http://codereview.chromium.org/242145 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28048 0039d316-1c4b-4281-b951-d872f2087c98