summaryrefslogtreecommitdiffstats
path: root/o3d/tests/build.scons
Commit message (Collapse)AuthorAgeFilesLines
* Mac: Undo the change in r44662 to use npo3dautoplugin for the default Mac ↵tschmelcher@chromium.org2010-05-111-1/+1
| | | | | | | | | | | bundle name and instead return to using "O3D". TEST=built with default name and with an overridden name, on Mac BUG=none Review URL: http://codereview.chromium.org/2027004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46957 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Use the plugin_npapi_filename variable to choose the bundle name ↵tschmelcher@chromium.org2010-04-151-1/+1
| | | | | | | | | | | (rather than the static "O3D" name) so that differently branded versions can co-exist. This also changes the default name from O3D.plugin to npo3dautoplugin.plugin to harmonize it with the other platforms. TEST=built & tested a rebranded plugin and non-rebranded plugin on Mac BUG=none Review URL: http://codereview.chromium.org/1585034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44662 0039d316-1c4b-4281-b951-d872f2087c98
* Changed O3D to use CommandBuffer in-process. Still not connecting to the GPU ↵apatrick@google.com2009-10-191-15/+0
| | | | | | | | | | | | | | | | | | | | | 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
* Fixing the path passed for the perceptual diff program so it'll be found.gspencer@google.com2009-09-051-1/+1
| | | | | | Review URL: http://codereview.chromium.org/199038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25557 0039d316-1c4b-4281-b951-d872f2087c98
* Enable gmock on windows scons buildgman@google.com2009-09-041-27/+12
| | | | | | | | | I made these changes and build both test-dbg-d3d and dbg-cb and no errors. Review URL: http://codereview.chromium.org/199033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25537 0039d316-1c4b-4281-b951-d872f2087c98
* This changes the selenium driver script to not be so scons-specific, andgspencer@google.com2009-09-031-2/+21
| | | | | | | | | | | | | | | | makes it so that it will self-locate some of the things it needs (for instance, it no longer needs to have PYTHONPATH env var set correctly -- it'll find the third party dir relative to itself and add gflags to the path). As part of this, it now copies the selenium tests into the artifacts directory so it can run them out of that directory instead of from the source dir. This is so that we can use the product dir as the root of the http server, since in GYP all three platforms have different locations for their output, and different working directories during the build. Review URL: http://codereview.chromium.org/180074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25288 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in render surfaces for command buffers. Fixing SetRect as well.rlp@google.com2009-08-281-0/+1
| | | | | | Review URL: http://codereview.chromium.org/160401 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24825 0039d316-1c4b-4281-b951-d872f2087c98
* Change selenium to run the samples from the artifactsgman@google.com2009-08-171-0/+3
| | | | | | | | | | | | | | | directory. Note: There is the issue that the scons build does not have the correct dependencies to make sure the samples get copied to the artifacts before selenium runs. If that's a 1 line fix then let's add it. Otherwise we can fix that in the gyp build? Review URL: http://codereview.chromium.org/172008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23565 0039d316-1c4b-4281-b951-d872f2087c98
* Add UpdateTexure2DRect to IMCgman@google.com2009-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | Also refactored IMC for to be more safe and easy to use. It still needs: *) structures/wrappers for message responces *) Some of the error checking could probably be moved out of the inidivdual message processing functions *) Need some constants or wrappers for the handles so a message isn't pulling things out of handles by magic numbers. Review URL: http://codereview.chromium.org/165266 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22987 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds client.toDataURL which gets the contentsgman@google.com2009-08-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the client area as a data url (which is a base64 encoded string of a png file) data urls are part of the HTML5 standard and supported by firefox, safari and chrome. http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#dom-canvas-todataurl That means you can now do this var dataURL = client.toDataURL(); // make an IMG tag display the screenshot someImgTag.src = dataURL; // use the IMG tag to draw into a canvas someCanvasContext.drawImage(someImageTag, ...); It also means there is no need for the test builds anymore "test-dbg-d3d", "test-opt-d3d" etc as toDataURL is part of the public API and can therefore always be used to take screenshots in any build. I updated the selenium code to use it. There are a few issues: 1) The GL version has the same limitations as taking a screenshot before. Namely that the client area must be on screen. We need to fix this. 2) We need to add support for origin-clean. See https://tracker.corp.google.com/story/show/180334 Review URL: http://codereview.chromium.org/164130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22869 0039d316-1c4b-4281-b951-d872f2087c98
* Removed manual setting of iexplore.exe path on 64-bit Windows duringkbr@google.com2009-08-071-0/+1
| | | | | | | | | | | | | | | Selenium runs. The new version of Selenium interprets this as a command to override the path to mshta.exe, which runs the Selenium driver, but this driver does not run in iexplore.exe due to limitations on IE's supported command line length. The current version of Selenium seems to have solved the issue of running the tests within 64-bit IE; with this change O3D runs within Selenium on Vista 64, but only with UAC off. Also updated dependencies for selenium_ie target to ensure o3d_host.dll is built. Review URL: http://codereview.chromium.org/165139 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22766 0039d316-1c4b-4281-b951-d872f2087c98
* A step in exposing Bitmap to JavaScript.gman@google.com2009-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | The plan is to make pack.createBitmapFromRawData return an array of bitmaps. 1 bitmap if it's a standard 2d image 6 bitmaps if it's a cubemap N bitmaps if it's a volume map. The bitmaps will have a semantic so you can look at them and tell they were from a volumemap, a cubemap or a 2d image. On the way I'm attempting to clean up the code. Moving stuff out of Bitmap the did not belong there and Refactoring Bitmap so there are less If Format = stuff. Review URL: http://codereview.chromium.org/164034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22583 0039d316-1c4b-4281-b951-d872f2087c98
* Add SetRect to Texture2d and TextureCUBEgman@google.com2009-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally I was going to replace Lock/Unlock with only SetRect (and maybe GetRect) and I did that. But then as I was going through the code things started not being so cool. The JavaScript texture.SetRect where as before it allocated no memory, now it needed to allocate a temporary buffer just to be able to write the texture. DrawImage also would have have required copying the original texture out using GetRect, then modifying it, then copying it back even in D3D or it would have required a temporary buffer. That's what happens under the hood in the GL implementation of Texture2D but why should D3D suffer because of the of GL? Or maybe it's a reasonable compomise the D3D should go slower so that GL isn't twice as slow as it it could be? So, I left Lock/Unlock and added SetRect as well. This CL should help the video guys and we can decide if we want to get rid of Lock/Unlock later. SetRect is really only there because trying to make GL act like D3D makes GL slow since we had to get a copy of the texture from GL before Locking. SetRect, since it is not exposing the original data doesn't need to do that. So, now there are both. If need to read (and write) to the texture use Lock. If you only need to write use SetRect. I also fixed Lock/Unlock so they return a pitch which is required for D3D. While I did that I made Lock/Unlock private so you have to use the TextureXXXLockHelpers to access the data. I didn't do the command buffer versions. I also added stubs for texture tests. We need to add more tests. I feel like a lot of clean up needs to happen. It seesm like Bitmap should be split into Bitmap2D BitmapCUBE BitmapVolume Possibly. And maybe BitmapCube should effectively just be typedef Bitmap2D BitmapCUBE[6] and BitmapVolume would be std::vector<Bitmap2D> Then we wouldn't need face and volume versions of various functions. You'd just get the face or the slice Bitma2D and then use the 2D functions. We should decide if that's what we want before pushing a new release. Otherwise we should remove bitmap.idl from idl_scons.lst and the one sample And ship without exposing Bitmap until we are sure they API we are exposing is the one we want. Review URL: http://codereview.chromium.org/159725 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22332 0039d316-1c4b-4281-b951-d872f2087c98
* Asynchronous tick now uses NPN_PluginAsyncCall.URL streaming callbacks are ↵apatrick@google.com2009-08-031-2/+22
| | | | | | | | now also asynchronous.Implemented NPN_PluginAsyncCall for IE.Allowed WM_PAINT handler to be reentered because it no longer calls into the browser (except to schedule an asynchronous tick if none is pending).Fixed a bug where the EventManager would crash if an event callback called cleanUp on the client.Cleanup destroys all the packs. Doing this in NPP_Destroy seems to make Chrome timeout and fail to load the next page.Tar and GZ decoding happens on a new thread. Review URL: http://codereview.chromium.org/155733 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22305 0039d316-1c4b-4281-b951-d872f2087c98
* Changes to upgrade to public version of seleniumgman@google.com2009-07-271-1/+1
| | | | | | | | | | | | | | Pulls in new selenium (selenium_rc) and removes old selenium (java, py) dependencies also removes doxygen dependency This is dependent on this CL http://codereview.appspot.com/96131 Review URL: http://codereview.chromium.org/160089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21712 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for linuxgman@google.com2009-07-241-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21523 0039d316-1c4b-4281-b951-d872f2087c98
* Prep for moving Camera Info out of Params into JSONgman@google.com2009-07-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I thought it was best to give you what I have so far for your input and code review instead of giving you everything all at once. This CL implements JSONObject which has a mechanism for adding stuff to be serialized as JSON to the serialization code. Since JSONObject is a serialization only object it seemed okay to put Serialize code inside. I opted to pre-declare JSONFloat and JSONOptionalFloat because I felt it made the code more error free. I had made it were you could just have JSONFloat and then with RegisterJSONValue you'd pass in optional or not but this way, declaring the field in a class makes it more explicit. CameraInfo is the first class that uses it. I'm not set on exactly how it is serialized. Whether it's as "object: { ... }" inside the "properties" section or whether it should have its own section. I think I won't know what until I actually write the deserialization code. That's not imporant for this CL This code, even if checked it, is not used yet as the import code, collada.cc, is not yet creating any of these objects. That's in another CL if you want to take a look http://codereview.chromium.org/160007 That CL will have to have lots of o3djs changes, corresponding sample changes and corresponding selenium test changes. Review URL: http://codereview.chromium.org/160008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21515 0039d316-1c4b-4281-b951-d872f2087c98
* Added primitives to IMC-based MessageQueue to allow clients,kbr@google.com2009-07-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | rather than O3D, to allocate and register shared memory segments. This is required in order to work in Protected Mode Internet Explorer on Windows Vista and later. Fixed preexisting bugs in MessageQueue related to shared memory mapping failures and corruption of concurrent incoming messages. Added the MessageQueue unit tests and Chrome's ConditionVariable class to the build. These tests required restructuring and multithreading. Wrote simple framework which detects test failures and timeouts in child threads and reports them to the main thread. Restructured existing MessageQueue tests. Added unit test for Register/UnregisterSharedMemory and stress test for above concurrency bug. Buganizer ID: 1997023. Review URL: http://codereview.chromium.org/155947 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21426 0039d316-1c4b-4281-b951-d872f2087c98
* Update the archiving for Hive runs to work from Buildbot. Remove deadlock ↵thomaslewis@google.com2009-07-151-3/+5
| | | | | | | | from Selenium tests if no free ports are available. Review URL: http://codereview.chromium.org/149596 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20741 0039d316-1c4b-4281-b951-d872f2087c98
* Add ClientInfogman@google.com2009-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows an app to ask a few things from the client. 1) How many objects the client is tracking. This is useful for a quick way to check that you're freeing resources. While the developer could use client.objects.length or client.packs[ii].objects.length that wouldend up creating hundreds of thousands of NPObjects. 2) Check if the software renderer is being used 3) Check the approximate amount of memory used by textures. Again, they could compute this with client.getObjectsByClassName('o3d.Texture') but it seemed like it might be useful. I say approximate because I would have to dig down into the indivdual renderers to get better info since a NPOT card will use more memory but it didn't seem worth it. 4) check the approximate amount of memory used by hardware buffers. Review URL: http://codereview.chromium.org/155276 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20334 0039d316-1c4b-4281-b951-d872f2087c98
* Add o3djs.DestinationBuffer to converter.gman@google.com2009-07-071-5/+6
| | | | | | | | | I named it o3djs.DestinationBuffer because it has nothing to do with O3D. It's purely part of our sample serialization example. Review URL: http://codereview.chromium.org/149236 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20013 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in most of the unit tests. This adds 406 of our unit testsgspencer@google.com2009-07-011-6/+6
| | | | | | | | | into the gyp build. 21 of them fail, but that is only because they don't have test input yet -- I haven't added the build code that copies the test inputs into the build dir yet. Review URL: http://codereview.chromium.org/147129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19778 0039d316-1c4b-4281-b951-d872f2087c98
* Code to load the software renderer and initialize it. Code to force the ↵apatrick@google.com2009-06-231-1/+16
| | | | | | | | software renderer enabled with registry entry even if hardware is capable. Build scripts copy the software renderer dll to the plugin directory on an intall build. Review URL: http://codereview.chromium.org/147039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19070 0039d316-1c4b-4281-b951-d872f2087c98
* Allow o3d selenium tests to run on the Mac if a hermetic versioncrogers@google.com2009-06-161-28/+61
| | | | | | | | of Firefox is not part of the source tree. Selenium will try to find a version of Firefox in /Applications and use that one Review URL: http://codereview.chromium.org/126231 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18539 0039d316-1c4b-4281-b951-d872f2087c98
* Reconstructing thomaslewis' change 118477.bradnelson@google.com2009-06-101-1/+1
| | | | | | | | | | | I'm submitting this now to get more things working on the continuous build. BUG=None TEST=None TBR=thomaslewis git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18080 0039d316-1c4b-4281-b951-d872f2087c98
* Changing an access on os.environ to a get (so things don't complain onbradnelson@google.com2009-06-101-4/+1
| | | | | | | | mac/linux if DXSDK_DIR is not set). Review URL: http://codereview.chromium.org/119388 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18025 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/118473petersont@chromium.org2009-06-091-1/+4
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17998 0039d316-1c4b-4281-b951-d872f2087c98
* Fix QA code to work from svn.thomaslewis@google.com2009-06-091-2/+4
| | | | | | Review URL: http://codereview.chromium.org/118442 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17958 0039d316-1c4b-4281-b951-d872f2087c98
* This is the O3D source tree's initial commit to the Chromium tree. It gspencer@google.com2009-05-271-0/+706
is not built or referenced at all by the chrome build yet, and doesn't yet build in it's new home. We'll change that shortly. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17035 0039d316-1c4b-4281-b951-d872f2087c98