summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Recomitting 31676 with fix.apatrick@google.com2009-11-11154-857/+842
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31692 0039d316-1c4b-4281-b951-d872f2087c98
* Copying swiftshader over if available.bradnelson@google.com2009-11-111-1/+16
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/384035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31690 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 31676.apatrick@google.com2009-11-11154-840/+856
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31682 0039d316-1c4b-4281-b951-d872f2087c98
* Reorganized command buffer and GPU plugin code into following structure:apatrick@google.com2009-11-11154-856/+840
| | | | | | | | | | | | gpu/gpu.gyp gpu/command_buffer/... gpu/gpu_plugin/... gpu/np_utils/... And fixed up paths and header sentry macros. Also merged command_buffer.gyp into gpu.gyp. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31676 0039d316-1c4b-4281-b951-d872f2087c98
* linux: 64-bitpiman@google.com2009-11-1110-28/+86
| | | | | | | | | | | This CL enables a 64-bit of linux. Set target_arch='x64' in the gyp defines to enable. - fixes a few 64-bit issues - fixes some linux build issues on scons vs make - add rules to build 64-bit version Review URL: http://codereview.chromium.org/371078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31642 0039d316-1c4b-4281-b951-d872f2087c98
* Moved platform specific out of platform directories. This is the Chrome ↵apatrick@google.com2009-11-1099-265/+265
| | | | | | | | convention. Review URL: http://codereview.chromium.org/372077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31570 0039d316-1c4b-4281-b951-d872f2087c98
* Switched from NPObject shared memory wrapper to Chrome shared memory in ↵apatrick@google.com2009-11-1050-781/+695
| | | | | | | | | | | preparation for moving from NPAPI to Chrome IPC for synchronous messages. Started work on an O3D configuration that will use Pepper 3D to connect to a remote GPU plugin. This is not building yet. Updated to latest NPAPI from nixysa. Review URL: http://codereview.chromium.org/371074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31519 0039d316-1c4b-4281-b951-d872f2087c98
* Updating the installer to check for OpenGL stats. Requires saving those ↵rlp@google.com2009-11-0915-28/+218
| | | | | | | | stats and uploading with others which required a modification of the stats uploading code to actually save old stats--which it should do anyways. Review URL: http://codereview.chromium.org/295043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31502 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "linux: 64-bit"piman@google.com2009-11-0710-78/+28
| | | | | | | | This reverts svn://chrome-svn/chrome/trunk/src/o3d@31356 Review URL: http://codereview.chromium.org/372043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31364 0039d316-1c4b-4281-b951-d872f2087c98
* linux: 64-bitpiman@google.com2009-11-0710-28/+78
| | | | | | | | | | | This CL enables a 64-bit of linux. Set target_arch='x64' in the gyp defines to enable. - fixes a few 64-bit issues - fixes some linux build issues on scons vs make - add rules to build 64-bit version Review URL: http://codereview.chromium.org/376010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31356 0039d316-1c4b-4281-b951-d872f2087c98
* Removed core\cross\packing.h. Using approach consistent with Chrome. #pragma ↵apatrick@google.com2009-11-064-75/+6
| | | | | | | | | | pack works in both MSVC and GCC. http://gcc.gnu.org/onlinedocs/gcc/Structure_002dPacking-Pragmas.html Review URL: http://codereview.chromium.org/373005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31262 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing line endings to LF so trybot works.apatrick@google.com2009-11-061-404/+404
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31185 0039d316-1c4b-4281-b951-d872f2087c98
* Moved command_buffer and gpu_plugin code out of o3d namespace.apatrick@google.com2009-11-05134-15271/+920
| | | | | | | | | Changed header guard macros in preparation for move to Chrome gpu directory. Added svn:eol LF property. Review URL: http://codereview.chromium.org/375004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31171 0039d316-1c4b-4281-b951-d872f2087c98
* Updating O3D rev number to include recent changes to FColladavangelis@google.com2009-11-051-1/+1
| | | | | | Review URL: http://codereview.chromium.org/360045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31065 0039d316-1c4b-4281-b951-d872f2087c98
* GL fix. Code was DCHECKing valid conditions andgman@google.com2009-11-041-3/+10
| | | | | | | | therefore asserting in debug mode. Review URL: http://codereview.chromium.org/360033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31038 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed gpu_plugin and added to o3d_all.gyp so it gets built on buildbot.apatrick@google.com2009-11-048-103/+73
| | | | | | Review URL: http://codereview.chromium.org/361012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31037 0039d316-1c4b-4281-b951-d872f2087c98
* Change gypbuild to use python at its currentgman@google.com2009-11-041-1/+1
| | | | | | | | locatio instead of its old location. Review URL: http://codereview.chromium.org/360020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31034 0039d316-1c4b-4281-b951-d872f2087c98
* Removed command_buffer dependency on vectormath (indirectly via core/types.h).apatrick@google.com2009-11-049-143/+172
| | | | | | | | Changed common.gypi to automatically select cb_service of d3d9 pr gl in chrome builds. Review URL: http://codereview.chromium.org/360018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30987 0039d316-1c4b-4281-b951-d872f2087c98
* Make gyp build get idl files from only one location.gman@google.com2009-11-042-58/+27
| | | | | | Review URL: http://codereview.chromium.org/346043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30896 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for build.gman@google.com2009-11-041-1/+1
| | | | | | | | | | The if was wrong. If the jscompiler exists we DON'T want the non-compiled files. Review URL: http://codereview.chromium.org/342108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30895 0039d316-1c4b-4281-b951-d872f2087c98
* Change build to only have one place to listgman@google.com2009-11-037-378/+239
| | | | | | | | | o3djs files and build / selenium to use compiled o3djs libs. Review URL: http://codereview.chromium.org/353017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30838 0039d316-1c4b-4281-b951-d872f2087c98
* Switch gypbuild to use devenv instead of msbuild.gman@google.com2009-11-031-3/+9
| | | | | | | | | | devenv is significantly faster. For an up to date build (ie, a build that shouldn't build anything) devenv is 2.5x faster. Review URL: http://codereview.chromium.org/340038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30806 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Add support for loading environment variables at plugin start-up from ↵tschmelcher@chromium.org2009-11-034-0/+148
| | | | | | | | | | | a file on disk. This lets us set any needed environment variables in a cross-browser way (i.e., without trying to modify the browsers' program launcher scripts to set variables for us). This is needed on some 64-bit systems where an environment variable has to be set in order for MESA to know where to find its GPU drivers. BUG=none TEST=built, created envvars file, and put something in it; verified that it was set successfully Review URL: http://codereview.chromium.org/340044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30799 0039d316-1c4b-4281-b951-d872f2087c98
* Put back some scons files that the docs build parses, but rename themgspencer@google.com2009-11-034-8/+163
| | | | | | | | | with ".manifest", since we no longer have a scons build. We should probably change the code that parses these to be simpler someday. Review URL: http://codereview.chromium.org/341073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30774 0039d316-1c4b-4281-b951-d872f2087c98
* This change kills the SCons build, since we have switched completelygspencer@google.com2009-11-0234-5520/+106
| | | | | | | | | over to GYP. It also copies the contents of DEPS_gyp to DEPS, and removes the DEPS_gyp file. Review URL: http://codereview.chromium.org/354011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30729 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for GL unit_tests.gman@google.com2009-10-293-7/+7
| | | | | | | | | | | | | | | | | | Apparently there are issues with making a window off screen. We were creating a 512/512 window -1000 pixels off the screen. This worked before but recently it stopped working on my (gman) machine. I checked by building the release build 0.1.42.3 and that version fails as well where as it used to work. I don't know what changed on my machine. Also added CS_OWNDC in several places. Review URL: http://codereview.chromium.org/339057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30413 0039d316-1c4b-4281-b951-d872f2087c98
* Change from absolute paths to relative paths to allow tests,etc. to be ↵kkania@google.com2009-10-283-114/+113
| | | | | | | | | located in any directory, as long as the directory structure is correct. Original review at: http://codereview.chromium.org/344013. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30377 0039d316-1c4b-4281-b951-d872f2087c98
* Splits the command buffers into common commandsgman@google.com2009-10-2817-196/+488
| | | | | | | | | | | | and specific commands. Common are things like Noop, SetToken, Jump, Gosub, return. Specific are O3D etc... Review URL: http://codereview.chromium.org/329046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30365 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 30359 - Change from absolute paths to relative paths to allow ↵kkania@google.com2009-10-283-112/+114
| | | | | | | | | | | tests,etc. to be located in any directory, as long as the directory structure is maintained. Review URL: http://codereview.chromium.org/344013 TBR=kkania@google.com Review URL: http://codereview.chromium.org/345013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30362 0039d316-1c4b-4281-b951-d872f2087c98
* Change from absolute paths to relative paths to allow tests,etc. to be ↵kkania@google.com2009-10-283-114/+112
| | | | | | | | located in any directory, as long as the directory structure is maintained. Review URL: http://codereview.chromium.org/344013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30359 0039d316-1c4b-4281-b951-d872f2087c98
* Mapping third_party/makeself for the GYP build as well.vangelis@google.com2009-10-281-0/+3
| | | | | | Review URL: http://codereview.chromium.org/342009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30353 0039d316-1c4b-4281-b951-d872f2087c98
* Add --clean support to gypbuild.gman@google.com2009-10-281-90/+185
| | | | | | | | Also, re-arranged code to have a class per platform. Review URL: http://codereview.chromium.org/341009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30292 0039d316-1c4b-4281-b951-d872f2087c98
* Adding mapping for third_party/makeself. This is to complete checkin of ↵vangelis@google.com2009-10-271-0/+3
| | | | | | | | http://codereview.appspot.com/132050 Review URL: http://codereview.chromium.org/333016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30275 0039d316-1c4b-4281-b951-d872f2087c98
* Adding support for windows safari. This requires registering the o3d plugin ↵vangelis@google.com2009-10-273-3/+17
| | | | | | | | | with firefox (via registry entries) and adding Safari to the list of supported User Agents. Review URL: http://codereview.chromium.org/326001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30274 0039d316-1c4b-4281-b951-d872f2087c98
* Adding the o3d-internal include path before the others so that if ↵vangelis@google.com2009-10-272-0/+4
| | | | | | | | | o3d-internal is there it will be picked up first. This is how scons was setup. This is important for initializing swiftshader. Review URL: http://codereview.chromium.org/331002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30235 0039d316-1c4b-4281-b951-d872f2087c98
* GPUPluginObject has methods to query its current window size.apatrick@google.com2009-10-273-0/+96
| | | | | | | | | | GPUPluginObject sends event to client process when its window is resized. TEST=none BUG=none Review URL: http://codereview.chromium.org/344001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30223 0039d316-1c4b-4281-b951-d872f2087c98
* Update o3d_code_rev from 154 to 157, to get the new bitmap-draw-image ↵kkania@google.com2009-10-273-3/+3
| | | | | | | | reference image. Review URL: http://codereview.chromium.org/333051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30221 0039d316-1c4b-4281-b951-d872f2087c98
* move all O3D specific command buffer stuff to command_buffer::o3dgman@google.com2009-10-2649-643/+690
| | | | | | | | | namespace. That's so I can add command_buffer::xxx namespace for different command buffer. Review URL: http://codereview.chromium.org/332036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30118 0039d316-1c4b-4281-b951-d872f2087c98
* Pulling in latest gyp.bradnelson@google.com2009-10-262-2/+2
| | | | | | | | | | BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/337028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30083 0039d316-1c4b-4281-b951-d872f2087c98
* Adjusted timeouts for a couple failing tests; switched from umount to ↵kkania@google.com2009-10-264-57/+51
| | | | | | | | hdiutil detach to solve some unmounting problems seen on Tiger. Review URL: http://codereview.chromium.org/332030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30077 0039d316-1c4b-4281-b951-d872f2087c98
* Adding lib path to glew to invocation of converter.bradnelson@google.com2009-10-241-1/+5
| | | | | | | | | | | | This seems to be needed for 64-bit. BUG=None TEST=None TBR=gman Review URL: http://codereview.chromium.org/328021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30013 0039d316-1c4b-4281-b951-d872f2087c98
* Fix beach demo strafe.gman@google.com2009-10-241-1/+1
| | | | | | Review URL: http://codereview.chromium.org/328019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29974 0039d316-1c4b-4281-b951-d872f2087c98
* 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