summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Workaround for Chromium bug.apatrick@google.com2009-10-021-21/+36
| | | | | | | | http://code.google.com/p/chromium/issues/detail?id=23694 Review URL: http://codereview.chromium.org/259027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27915 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing build.apatrick@google.com2009-10-021-1/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27871 0039d316-1c4b-4281-b951-d872f2087c98
* Replaced SharedMemory::Map method with NPN_MapMemory.apatrick@google.com2009-10-0227-332/+211
| | | | | | | | | | | | | Moved responsibility for mapping ring buffer into GPUProcessor. Removed SharedMemory::SetInt32 and SetFloat. Implemented GetWindowNPObject in WebKitNHPBrowser. TEST=none BUG=none Review URL: http://codereview.chromium.org/246069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27867 0039d316-1c4b-4281-b951-d872f2087c98
* Add the GL ES 2.0 header files.gman@google.com2009-10-013-0/+919
| | | | | | | | | Not sure this is the best place for them but we can move them later. Review URL: http://codereview.chromium.org/256031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27800 0039d316-1c4b-4281-b951-d872f2087c98
* Implement fullscreen on Linux. No "Press Esc" message yet though. Also it's ↵tschmelcher@google.com2009-10-018-43/+279
| | | | | | | | | | DISPLAY_MODE_DEFAULT only for now (mode switching is evil anyways ;) ). Small bit of code cleanup in renderer.h. TESTED=entered and exited fullscreen; tested leaving with Esc, Alt+F4, click on region, and right-click on taskbare -> Close; all with both Compiz on and off, on gHardy. Review URL: http://codereview.chromium.org/258004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27732 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes the comments in the bitmap example to match reality,gspencer@google.com2009-10-011-25/+37
| | | | | | | and tweaks some values. Review URL: http://codereview.chromium.org/242087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27693 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bug where test runner was creating result without setting verbose level.kkania@google.com2009-09-301-1/+1
| | | | | | Review URL: http://codereview.chromium.org/242086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27670 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing compilation error.apatrick@google.com2009-09-301-6/+6
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/249042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27665 0039d316-1c4b-4281-b951-d872f2087c98
* Added 32-bit float textures to command buffers, also changed the ↵petersont@google.com2009-09-306-20/+55
| | | | | | | | texture::Format enum to be more like Texture::Format in o3d. Review URL: http://codereview.chromium.org/227011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27644 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes the Linux GYP build, fixing a number of (ahem!) problemsbradnelson@google.com2009-09-3019-80/+88
| | | | | | | | | | | | in command buffer code. Watch those signed/unsigned comparisons! Also, introduced an "invalid" value for CommandBufferOffset (INVALID_COMMAND_BUFFER_OFFSET) instead of using -1, since it's an unsigned value. Review URL: http://codereview.chromium.org/246038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27635 0039d316-1c4b-4281-b951-d872f2087c98
* Switching asynchronous tick callback in chrome to use the empty data url ↵vangelis@google.com2009-09-301-8/+39
| | | | | | | | method instead of NPN_PluginThreadAsyncCall. NPN_PluginThreadAsyncCall causes Chrome to misbehave including freezing up when closing tabs (http://code.google.com/p/o3d/issues/detail?id=149). Review URL: http://codereview.chromium.org/235059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27634 0039d316-1c4b-4281-b951-d872f2087c98
* Updates o3d_code_rev to 149, to accommadate for new screenshot names.kkania@google.com2009-09-301-1/+1
| | | | | | Review URL: http://codereview.chromium.org/246049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27628 0039d316-1c4b-4281-b951-d872f2087c98
* Modified output format to be accepted by Pulse. Updated DEPS to include ↵kkania@google.com2009-09-294-57/+65
| | | | | | | | newer revision from googlecode, which has screenshot name changes. Review URL: http://codereview.chromium.org/235041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27545 0039d316-1c4b-4281-b951-d872f2087c98
* Add osx support to gypbuildgman@google.com2009-09-292-6/+49
| | | | | | | | | | | Step 1. It builds on OSX and I guessed on linux Will try that next. Also will start adding place holders for options next Review URL: http://codereview.chromium.org/251034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27542 0039d316-1c4b-4281-b951-d872f2087c98
* Adds "gypbuild" command so developer does not have togman@google.com2009-09-292-0/+88
| | | | | | | | | | | know the details of how to build and run tests on every platform. This is just the initial checkin with lots of TODOs Review URL: http://codereview.chromium.org/248030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27521 0039d316-1c4b-4281-b951-d872f2087c98
* Quick fix for skinning translation bug.gman@google.com2009-09-293-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | We weren't binding the transform of the skin to the base so the transform was getting applied twice and also the math was wrong in skinning. This is the shortest change to make this work but it is arguably not the *correct* change. The correct change would be to make the import code create Skin separate from ParamArray and SkinEval so that you can use the same Skin data multiple times in the same scene. I don't know enough about collada to know if that's possible to setup in collada but the way the code is structured currently it seems to assume it is even though the code does support this correctly. That would take some work to fix and require samples and it seems unlikely people will run into that issue so this smaller fix seems good enough for now. Review URL: http://codereview.chromium.org/235046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27447 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing some things that are failing in the linux o3d gyp build.bradnelson@google.com2009-09-292-1/+10
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/209025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27442 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing signed/unsigned mismatch warning showing up in gyp build.bradnelson@google.com2009-09-281-2/+2
| | | | | | | | | | BUG=None TEST=None TBR=gman Review URL: http://codereview.chromium.org/248026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27431 0039d316-1c4b-4281-b951-d872f2087c98
* Diabolic hackery to work around differing NPAPI headers and definitions ↵apatrick@google.com2009-09-2815-23/+60
| | | | | | | | | | | between Chromium and O3D. TEST=none BUG=none Review URL: http://codereview.chromium.org/242042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27430 0039d316-1c4b-4281-b951-d872f2087c98
* Moving tryserver.bradnelson@google.com2009-09-281-2/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27401 0039d316-1c4b-4281-b951-d872f2087c98
* More work in Command Buffersgman@google.com2009-09-2657-2303/+2265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I think/hope this is the last big CL for this. *) Moved GAPIInterface enums to cmd_buffer_format.h The reason is you should not have to include CODE to make data. The fact that the enums were in GAPIInterface, a class, meant you had to include code if you wanted to make a command buffer. *) Typed arguments where I could. So for example Draw takes PrimitiveType instead of uint32. CreateVertexBuffer takes a ResourceId *) Renamed enums etc to match style guide. *) Moved BitFields into specific commands *) renamed arguments from id to type_id. Review URL: http://codereview.chromium.org/234002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27322 0039d316-1c4b-4281-b951-d872f2087c98
* Fix to allow NOOP to work again.gman@google.com2009-09-261-4/+23
| | | | | | Review URL: http://codereview.chromium.org/222017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27321 0039d316-1c4b-4281-b951-d872f2087c98