summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Force inclusion of build/common.gypi for all chromium gyp files.yaar@chromium.org2009-09-154-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Why: Simpler build code. If everybody includes it, it should be included automatically. Why now: The webkit chromium builds need it be specified, since can't default to build/common.gypi. What was done: 1. build/common.gypi's contents were moved to a new file build/gyp_chromium.gypi 2. tools/gyp/gyp_chromium was moved to build/gyp_chromium and made to automatically include build/gyp_chromium.gypi. 3. lots of gyp files were fixed to not refer to build/common.gypi any more. 4. o3d which also builds independently of chrome, was fixed to have a gyp_o3d that includes gyp_chromium.gypi too. 5. build/common.gypi was left empty, because there are some external projects that still refer to it. Things that are left to do after this patch is in: 1. The following external files (in other repositories) need to stop include common.gypi ./third_party/hunspell/hunspell.gyp ./third_party/icu/icu.gyp ./v8/tools/gyp/v8.gyp 2. Once nobody refers to common.gypi anymore, delete common.gypi -or- Delete gyp_chromium.gypi and move its content back to common.gypi Tested on mac, win and linux. On win, got a few unit tests errors on chrome bookmarks, which should not be related. I'm running again with clobber to verify. Review URL: http://codereview.chromium.org/206006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26302 0039d316-1c4b-4281-b951-d872f2087c98
* Changes needed for MacOS X 10.4 support.maf@google.com2009-09-151-1/+2
| | | | | | | | Add "support_macosx_10_4" option to common.gypi that causes it to change deployment target, and define a new preprocessor symbol on the Mac build. Setting this flag to true is harmless on non Mac builds and has no effect. Make various changes to source files where they modify their behavior in the presence of the new preprocessor symbol to become 10.4 compatible. Review URL: http://codereview.chromium.org/201122 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26285 0039d316-1c4b-4281-b951-d872f2087c98
* This updated the GYP deps file to the last known good revision of Chrome,gspencer@google.com2009-09-154-17/+17
| | | | | | | | and all the associated third party packages. Review URL: http://codereview.chromium.org/203077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26283 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/176026rlp@google.com2009-09-155-92/+323
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26273 0039d316-1c4b-4281-b951-d872f2087c98
* Made gyp file for command buffer libraries.apatrick@google.com2009-09-1522-44/+265
| | | | | | | | | | | | | | Gyp build works on Windows. Mac and linux won't work yet. Fixed some warnings. Switched from dxerr.lib to dxerr9.lib. Implemented a Texture::SetRect case for DXT compressed textures. Fixed division by zero for zero stride vertex buffers. TEST=none BUG=none Review URL: http://codereview.chromium.org/200127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26271 0039d316-1c4b-4281-b951-d872f2087c98
* Bump O3D DEPS revision to 147 to get Cg 2.2 (also gspencer's pdiff CL).tschmelcher@google.com2009-09-111-1/+1
| | | | | | Review URL: http://codereview.chromium.org/196093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26026 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Ship libCg on 32-bit Debian systems too, since nvidia-cg-toolkit ↵tschmelcher@google.com2009-09-113-2/+6
| | | | | | | | doesn't seem to like to use the latest version. Cg 2.2 fixes some Linux bugs, so it's worth ensuring that it's used on all systems. Review URL: http://codereview.chromium.org/194081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26003 0039d316-1c4b-4281-b951-d872f2087c98
* Guess at getting linux build to work.gman@google.com2009-09-102-15/+9
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25948 0039d316-1c4b-4281-b951-d872f2087c98
* A bunch of jscompiler fixes including updating togman@google.com2009-09-1010-25/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the latest jscompiler. There were a few issues. For some reason o3djs.math.matrix4 was not working in ff3.0 when compiled. I spent about 8 hours trying to reproduce the issue in a small case but had no luck. I finally just tried changing original code and it work. In the process of trying to figure that out I got the latest jscompiler and found there were a bunch of other problems with our js code which are now fixed. Also found out I was incorrectly striping @o3dparameter tags from our code in build_docs.py Also, I learned that properties of objects are strings when returned in an "in" statement as in for (key in object) key is a string regardless of what each key is in object. Review URL: http://codereview.chromium.org/200089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25944 0039d316-1c4b-4281-b951-d872f2087c98
* Add an Info.plist flag to force the software renderer.maf@google.com2009-09-102-16/+44
| | | | | | Review URL: http://codereview.chromium.org/199087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25937 0039d316-1c4b-4281-b951-d872f2087c98
* Turning off auto upload for o3d trybots for now.bradnelson@google.com2009-09-101-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25936 0039d316-1c4b-4281-b951-d872f2087c98
* Switching on tryserver pointed at nacl trymaster as a test.bradnelson@google.com2009-09-101-1/+4
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25912 0039d316-1c4b-4281-b951-d872f2087c98
* missed onegman@google.com2009-09-091-0/+7
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25815 0039d316-1c4b-4281-b951-d872f2087c98
* Make more stuff private in renderergman@google.com2009-09-093-37/+47
| | | | | | Review URL: http://codereview.chromium.org/199066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25805 0039d316-1c4b-4281-b951-d872f2087c98
* Check for value overlow in buffer.ccgman@google.com2009-09-091-0/+7
| | | | | | | | http://b/issue?id=2106717 Review URL: http://codereview.chromium.org/194059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25804 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes some warnings in the Linux release build.bradnelson@google.com2009-09-093-16/+20
| | | | | | Review URL: http://codereview.chromium.org/194061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25802 0039d316-1c4b-4281-b951-d872f2087c98
* minor change of render_surface_test.ccgman@google.com2009-09-091-0/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25774 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for mac/linux unit_testgman@google.com2009-09-091-0/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25772 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented shared memory as an NPObject. Using NPObject method to expose ↵apatrick@google.com2009-09-0918-124/+546
| | | | | | | | | | | | mapping function rather than NPAPI change. Note that shared memory objects currently lose identity when they cross a process boundary. If an object is sent across a boundary and back, there are now two objects representing the same handle in a single process. This can be fixed. TEST=none BUG=none Review URL: http://codereview.chromium.org/194049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25749 0039d316-1c4b-4281-b951-d872f2087c98
* Change the params for the 2d and googleIO samples to cope with slight ↵maf@google.com2009-09-081-2/+2
| | | | | | | | rendering difference on Mac. Review URL: http://codereview.chromium.org/200048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25667 0039d316-1c4b-4281-b951-d872f2087c98
* Add scripts to automatically build installer and disk image in GYP build. maf@google.com2009-09-085-2/+178
| | | | | | | | Fix compile error in serializer.cc Don't force rebuild of idl files. Review URL: http://codereview.chromium.org/195023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25642 0039d316-1c4b-4281-b951-d872f2087c98
* This makes selenium in Firefox work on the Mac.gspencer@google.com2009-09-084-8/+152
| | | | | | Review URL: http://codereview.chromium.org/201046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25639 0039d316-1c4b-4281-b951-d872f2087c98
* Replaced BaseNPObject with DefaultNPObject because...apatrick@google.com2009-09-0827-657/+535
| | | | | | | | | | | | | | DefaultNPObject can derive from bases other than NPObject, allowing concrete NPObjects to choose their own NPObject subclass. DefaultNPObject does not rely on virtual functions. See change to NPGetClass in np_class.h. Removed count() from MockNPObject because I discovered gmock checks that no mock objects exist after a test completes anyway. TEST=none BUG=none Review URL: http://codereview.chromium.org/196032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25632 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
* remove bad trailing commagman@google.com2009-09-041-2/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25547 0039d316-1c4b-4281-b951-d872f2087c98
* Since loading textures from a file request isgman@google.com2009-09-041-8/+15
| | | | | | | | deprecated update the docs to match. Review URL: http://codereview.chromium.org/198033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25542 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bug in Texture2D::Set and TextureCUBE::Setgman@google.com2009-09-041-2/+7
| | | | | | Review URL: http://codereview.chromium.org/198032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25539 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
* Switch to chrome gmock. gman@google.com2009-09-041-1/+2
| | | | | | | | | | I build this on osx and it worked so it should be find on Windows. Windows is not currently using gmock so it should still work there as well. Review URL: http://codereview.chromium.org/194030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25526 0039d316-1c4b-4281-b951-d872f2087c98
* Add check for offset + number_of_bytes overflowgman@google.com2009-09-041-2/+4
| | | | | | | | | | | | | | | | | | | | to UPDATE_TEXTURE2D and UPDATE_TEXTURE2D_RECT IMC messages. This was moved from issue 199008 beacuse codereview.chromium.org was giving bogus errors C:\src\o3d_outside_pc\o3d>gcl upload fix Upload server: codereview.chromium.org (change with -s/--server) Email [gman@google.com]: Password for gman@google.com: Saving authentication cookies to C:\Documents and Settings\gman\.codereview_upload_cookies Issue creation errors: {'user': ["You (Gman@google.com) don't own this issue (199008)"]} Review URL: http://codereview.chromium.org/192030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25524 0039d316-1c4b-4281-b951-d872f2087c98
* Adding a no-binary path to the o3dConvertergman@google.com2009-09-046-67/+449
| | | | | | | | | | | | | | | | and deserializer. This CL still creates a o3dtgz file, it's just that buffers, skins and curves are stored in JSON instead of binary. I'm not sure how useful this is but it seemed like a possible short cut to testing out some stuff. Another CL will add some flag so there is no gzipped tar file, just the json. Review URL: http://codereview.chromium.org/189003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25523 0039d316-1c4b-4281-b951-d872f2087c98
* Make O3D always clear the backbuffer one way or gman@google.com2009-09-0410-88/+186
| | | | | | | | | | | | | | another. The issue is that given that we are using DISCARD on D3D and on GL we are only drawing to the visible portion of the O3D area, the state of the backbuffer is undefined. This change should make it consistent across platforms. Review URL: http://codereview.chromium.org/201013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25522 0039d316-1c4b-4281-b951-d872f2087c98
* This adds in targets for selenium and updated several other problems,gspencer@google.com2009-09-0422-365/+878
| | | | | | | | | | | including some problems with the samples and idl generation. Selenium targets launch selenium on all platforms, but the tests don't pass anywhere but Windows yet because the plugin isn't found. I'll work on that next. Review URL: http://codereview.chromium.org/197014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25467 0039d316-1c4b-4281-b951-d872f2087c98
* Fix _H__ to correct _H_gman@google.com2009-09-0420-60/+60
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25419 0039d316-1c4b-4281-b951-d872f2087c98
* Exracted CommandBuffer class from GPUPluginObject.apatrick@google.com2009-09-039-120/+314
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/200005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25348 0039d316-1c4b-4281-b951-d872f2087c98
* Change Mac O3D executable name (the actual name of the binary inside the ↵maf@google.com2009-09-032-15/+15
| | | | | | | | | | bundle) to O3D, not o3d. This matches the name it gets in the GYP build and enabled them to share an Info.plist file (also changed in this CL in the same way). Add include dir for the Breakpad header to scons, so it can cope with us #including "Breakpad.h" as required by the GYP build, rather than <Breakpad/Breakpad.h>. Review URL: http://codereview.chromium.org/200002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25339 0039d316-1c4b-4281-b951-d872f2087c98
* Make Convertor project compile in GCC - fixes release-build only compiler ↵maf@google.com2009-09-032-219/+219
| | | | | | | | errors. Review URL: http://codereview.chromium.org/197003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25333 0039d316-1c4b-4281-b951-d872f2087c98
* Fix other things blocking the Mac GYP release build from completing.maf@google.com2009-09-032-1/+5
| | | | | | Review URL: http://codereview.chromium.org/194005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25332 0039d316-1c4b-4281-b951-d872f2087c98
* Generates a class hierarchy using graphviz "dot", thegman@google.com2009-09-035-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same tool that doxygen uses. This is not ready for primetime but I had already looked at this and it didn't look to hard so I stuck it in. With this CL nothing will happen unless graphviz is added to third_party/graphviz/files but I wanted to at least check in what has to happen so that if someone else wants to finish it they can. Basically jsdoctoolkit generates a .dot file that lists the inheritance, that is passed to dot which creates a png and a map file for a client side image map. To actually use it online would require inserting the map file into an html file, probably using EZT or python. Otherwise, to be useful we'd need to split the template into ParamMatrix4 and its derived classes, Param and its derived classes. RenderNode and its derived classes, ParamObject and its derived classes and then finally everything not covered by the above. Otherwise the chart is too big. http://www/~gman/images/class_hierarchy.png To be honest though, given it's just a tree a simple HTML page could also do this without the graphing. Just a simple -NamedObject | +-Param | +--ParamFloat | +--ParamInteger etc. Nearly as simple would be to save the data to JSON and graph it in JavaScript live in the browser using canvas or O3D. That would be a lot smaller than the 9meg for the binary parts of graphviz Review URL: http://codereview.chromium.org/174384 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25315 0039d316-1c4b-4281-b951-d872f2087c98
* Adding uninstall.sh script to be included in self-extracting archive. This ↵nmaxwell@google.com2009-09-032-2/+127
| | | | | | | | will get called within the setup.sh script to uninstall previous versions of O3D. Can also be manually invoked by a user directly to remove files. Review URL: http://codereview.chromium.org/171128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25297 0039d316-1c4b-4281-b951-d872f2087c98
* Get Mac GYP build compiling.maf@google.com2009-09-037-143/+154
| | | | | | Review URL: http://codereview.chromium.org/172119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25292 0039d316-1c4b-4281-b951-d872f2087c98
* This changes the selenium driver script to not be so scons-specific, andgspencer@google.com2009-09-033-34/+79
| | | | | | | | | | | | | | | | 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
* Fixing GYP build. Warning generated by this code was treated as error at ↵vangelis@google.com2009-09-031-1/+1
| | | | | | | | compile time. Review URL: http://codereview.chromium.org/197002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25287 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds the createRawDataFromDataURL function to o3d.Pack. The functionmstrydom@google.com2009-09-0213-2/+506
| | | | | | | | | | takes as input a data URL, decodes the data, and returns the raw data in a RawData object. If the data URL has an invalid format, an error message is displayed. Currently only data URL's encoded in base64 are supported. The mime type is ignored. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25252 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing mac and linux buildvangelis@google.com2009-09-022-4/+6
| | | | | | Review URL: http://codereview.chromium.org/186020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25247 0039d316-1c4b-4281-b951-d872f2087c98
* Wrote tests for GPUPluginObject::OpenCommandBuffer.apatrick@google.com2009-09-0214-58/+498
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/188015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25244 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for accidental early commit reviewed at URL below.apatrick@google.com2009-09-026-6/+91
| | | | | | | | | | http://codereview.chromium.org/177060 TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25203 0039d316-1c4b-4281-b951-d872f2087c98
* Beginnings of direct manipulator support in o3djs library. Addedkbr@google.com2009-09-024-5/+1202
| | | | | | | | | | | | | Translate1 manipulator, which implements dragging along a line, and helper and base classes. This is a work in progress; feedback appreciated. Fixed problem in recently changed documentation in primitives.js. Minor documentation cleanup in primitives.html. Review URL: http://codereview.chromium.org/178044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25152 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing path in call to version_info.pybradnelson@google.com2009-09-021-1/+1
| | | | | | | | | | BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/185004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25150 0039d316-1c4b-4281-b951-d872f2087c98
* GPU plugin object can create a command buffer via a V8 extension in Chromium ↵apatrick@google.com2009-09-0235-962/+1707
| | | | | | | | | | | | and return it via NPAPI. Introduced NPBrowser class to abstract functions provided by browser to plugin, including Chromium extensions. NPBrowser is stubbed for tests. TEST=none BUG=none Review URL: http://codereview.chromium.org/177060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25135 0039d316-1c4b-4281-b951-d872f2087c98