summaryrefslogtreecommitdiffstats
path: root/o3d/build
Commit message (Collapse)AuthorAgeFilesLines
* Moving o3d up a level, to get it out of chrome checkouts.bradnelson@google.com2011-03-2818-1346/+0
| | | | | | | | | | BUG=None TEST=None Too large for codereview. Manual review by thaloun and tschelcher. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79609 0039d316-1c4b-4281-b951-d872f2087c98
* Bump version for the next release.tschmelcher@chromium.org2011-03-211-1/+1
| | | | | | Review URL: http://codereview.chromium.org/6675003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78898 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing O2D crash in Windows XP. The original pixman uses thread local variablegangji@google.com2011-03-181-0/+4
| | | | | | | | | | which is not supported in Windows Xp. Bump third-party code to version 235 which has the fix in pixman. Now pixman uses TLS primitives. TESTED=manually tested under Windows 7/Windows XP using chrome, firefox and IE. Review URL: http://codereview.chromium.org/6688039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78739 0039d316-1c4b-4281-b951-d872f2087c98
* O2D Mac: Include pixman+cairo debugging symbols in O3D debug builds.tschmelcher@google.com2011-03-113-4/+20
| | | | | | | | | TEST=built on Mac in Release and Debug modes, verified proper flag was used for each; verified debugging information seen in gdb when using Debug build BUG=none Review URL: http://codereview.chromium.org/6684014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77890 0039d316-1c4b-4281-b951-d872f2087c98
* Bump O3D version for the release of the first one with O2D support.tschmelcher@google.com2011-03-091-1/+1
| | | | | | | | | TEST=no BUG=none Review URL: http://codereview.chromium.org/6651007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77377 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing random resizing issues under Windows. When resizing under Windows,gangji@google.com2011-03-081-0/+1
| | | | | | | | sometimes, the windows is not updated when creating the surface. Now update the clip region and surface parameters when this happens. Review URL: http://codereview.chromium.org/6626080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77334 0039d316-1c4b-4281-b951-d872f2087c98
* When auto fall-back is enabled, fall back to o2d milligan@google.com2011-03-071-11/+0
| | | | | | | | | | | if we detect a software renderer is being reported by o3d. Also add software renderer detection to o2d keyed off of the GL_RENDERER string "Software Rasterizer" Review URL: http://codereview.chromium.org/6592020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77177 0039d316-1c4b-4281-b951-d872f2087c98
* Add O2D rendering with cairo into Windows build.gangji@google.com2011-03-042-2/+2
| | | | | | Review URL: http://codereview.chromium.org/6628015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76986 0039d316-1c4b-4281-b951-d872f2087c98
* Port O2D to Mac, currently just for Core Graphics (the drawing model used in ↵tschmelcher@chromium.org2011-03-034-31/+78
| | | | | | | | | | | Chrome on 10.5). Unfortunately the performance is not yet good enough to prefer it over the CGL + GPU readback + CoreGraphics re-render code path currently in use, so some optimization work will be necessary. TEST=loaded O3D on OSX with RenderMode=Auto and RenderMode=2D in Chrome 9 on 10.5 and 10.6, Safari 4 on 10.5, Safari 5 on 10.6, and FF 3.6 on 10.5 and 10.6 and verified that Auto works everywhere, 2D works in Chrome on 10.5, and 2D fails without crashing in the remaining cases; unit tests BUG=none Review URL: http://codereview.chromium.org/6614005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76839 0039d316-1c4b-4281-b951-d872f2087c98
* Adding cairo and pixman build to windows.gangji@google.com2011-03-024-3/+164
| | | | | | Review URL: http://codereview.chromium.org/6594091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76584 0039d316-1c4b-4281-b951-d872f2087c98
* Add build rules for cairo, pixman, and pkg-config on Mac. (Not yet being used.)tschmelcher@google.com2011-03-014-0/+192
| | | | | | | | | TEST=added them as dependencies to a real target and verified they were built successfully BUG=none Review URL: http://codereview.chromium.org/6591079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76438 0039d316-1c4b-4281-b951-d872f2087c98
* Remove FORCE_CAIRO flag and replace with a new feature.milligan@google.com2011-02-241-9/+0
| | | | | | | | | | | | | | | The possible feature values are: RenderMode=Auto RenderMode=2D RenderMode=3D The default if no feature is specified is 3D for backwards compatibility. Review URL: http://codereview.chromium.org/6576007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75895 0039d316-1c4b-4281-b951-d872f2087c98
* Baby steps toward o2d and o3d dynamic switching in the video acceleratormilligan@google.com2011-02-221-6/+19
| | | | | | | | | | | browser plugin. This step rolls the o2d renderer and the gl renderer into the same linux plugin. Unfortunately the code path for which one gets used is still controlled by a compile time switch. That switch is force_cairo which is set to 0 by default (meaning o3d) in common.gypi. Review URL: http://codereview.chromium.org/6532010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75614 0039d316-1c4b-4281-b951-d872f2087c98
* Bump O3D version (before integrate into ChromeOS)zhurunz@google.com2010-11-171-1/+1
| | | | | | Review URL: http://codereview.chromium.org/5147002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66523 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Update DEPS to pick up statically linked libGLEW.tschmelcher@chromium.org2010-10-221-2/+22
| | | | | | | | | BUG=none TEST=built and ran O3D on Linux (64-bit) Review URL: http://codereview.chromium.org/3978003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63452 0039d316-1c4b-4281-b951-d872f2087c98
* Bump version before I snapshot into ChromeOS.zhurunz@google.com2010-09-241-1/+1
| | | | | | Review URL: http://codereview.chromium.org/3479015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60542 0039d316-1c4b-4281-b951-d872f2087c98
* Initial version rendering 2D path for O3D. This will eventually allow O3D ↵fransiskusx@google.com2010-08-052-0/+35
| | | | | | | | | | | | | | apps to fall back to 2D logic on systems without (working) GPUs. Incorporated 2D library Cairo to O3D. Currently only support Linux and compiled when renderer = cairo. TEST= I compiled with renderer = cairo and it worked. Also I compiled with renderer = gl and it worked. BUG=none Review URL: http://codereview.chromium.org/2825074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55008 0039d316-1c4b-4281-b951-d872f2087c98
* Parameterize the name of the "O3DExtras" directory with a GYP variable (to ↵tschmelcher@chromium.org2010-07-122-0/+32
| | | | | | | | | | | | | | allow side-by-side installs of differently-branded builds that both include the extras directory). Also move the branding.gypi and version.gypi files from plugin/ to build/, which is a more sensible location. Also delete an extraneous definition of plugin_enable_fullscreen_msg from core.gyp (it's already in common.gypi). TEST=built on Windows, both with and without plugin_extras_directory specified BUG=none Review URL: http://codereview.chromium.org/2893011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52153 0039d316-1c4b-4281-b951-d872f2087c98
* Rolled forward O3D's Chromium DEPS to match the Skia roll-forward inkbr@google.com2010-07-082-1/+10
| | | | | | | | | | | | | the last CL, which broke the Linux build due to version mismatches. Thanks to tschmelcher for help with the Linux changes. Built and tested O3D on Windows, Linux and Mac OS X. BUG=none TEST=none Review URL: http://codereview.chromium.org/2952001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51895 0039d316-1c4b-4281-b951-d872f2087c98
* Provide a default definition of the target_arch variable on Linux tokbr@google.com2010-06-151-0/+7
| | | | | | | | | | | | | | | work around a problem in NaCl's GYP files where it infers 32-bit on Linux in native_client/build/common.gypi. A fix in Native Client and a DEPS roll in O3D are still needed to make the Linux build fully work with the newer NaCl. BUG=none TEST=built O3D on Linux Review URL: http://codereview.chromium.org/2851003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49817 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: include -g for Release builds to aid debugging. There is no downside ↵tschmelcher@chromium.org2010-06-021-0/+4
| | | | | | | | | | | because it does not affect what we ship. BUG=none TEST=built on Linux; verified no significant change in shipped file size Review URL: http://codereview.chromium.org/2439005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48778 0039d316-1c4b-4281-b951-d872f2087c98
* Added --convert-dds-to-png command line option to the COLLADA converter,kbr@google.com2010-04-201-0/+1
| | | | | | | | | | | | | | | | | | | which causes all DDS textures to be outputted as PNGs. This required changes to the serialization code to reconstitute cube map textures from six separate images. Some bugs in the plugin were uncovered with this change which have been worked around for the time being. Pulled in libtxc_dxtn library for decompressing DXTn textures. Tested by converting teapot with --convert-dds-to-png and running helloworld.html and render-mode.html. BUG=none TEST=none Review URL: http://codereview.chromium.org/1677002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45014 0039d316-1c4b-4281-b951-d872f2087c98
* Added support for O3D in Chrome on Mac OS X using CoreGraphics drawingkbr@chromium.org2010-03-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | model by rendering offscreen, reading back the frame buffer, and drawing the rendering results into the CGContextRef. This code path is currently Chrome-specific, but could be used for any browser with similar characteristics. This will require refactoring of the drawing and event model selection code, which may be done in a subsequent bug. Changed the RenderSurface APIs to allow the Bitmap for readback to be passed in. Added Client::SetOffscreenRenderingSurfaces so that the entry point Client::RenderClient() can be used unchanged. Fixed problem with plugin_enable_fullscreen_msg gyp variable which needs to be in top-level gypi so #define is consistent throughout project. Fixed minor issue in Cocoa key event handling. Fixed log message causing crashes when render target attachment fails. Chrome currently blacklists the O3D plugin's MIME type, so to enable support for O3D this blacklist entry needs to be removed from Chrome. Ran nearly all O3D samples in Chrome on Mac OS X. There are a couple of failures which will be fixed in subsequent bugs. Also ran samples in Safari and Firefox on Mac and verified no performance regressions. BUG=http://code.google.com/p/o3d/issues/detail?id=215 TEST=ran O3D samples in Chrome, Safari and Firefox Review URL: http://codereview.chromium.org/669220 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41233 0039d316-1c4b-4281-b951-d872f2087c98
* linux: native OpenGL ES supportpiman@google.com2010-02-082-85/+98
| | | | | | | | | This includes Gregg's CL 548023 There are still a few hard-coded paths, and issues to solve, but hellocube-textures-glsl is running on an actual device. Review URL: http://codereview.chromium.org/572029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38385 0039d316-1c4b-4281-b951-d872f2087c98
* linux: add an option to disable FBO support for platforms that don't have it.piman@google.com2010-02-011-0/+4
| | | | | | Review URL: http://codereview.chromium.org/551218 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37737 0039d316-1c4b-4281-b951-d872f2087c98
* Add Debian/Ubuntu packages back to Linux build.tschmelcher@chromium.org2010-01-291-6/+0
| | | | | | | | | | | Thanks go to Jeff Bailey for writing most of this CL. Also, bump version to 0.1.43.1 so that it exceeds the version of the previous O3D packages. TEST=build, install, and run on Ubuntu Review URL: http://codereview.chromium.org/556071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37561 0039d316-1c4b-4281-b951-d872f2087c98
* linux: arm fixespiman@google.com2010-01-291-0/+5
| | | | | | Review URL: http://codereview.chromium.org/549104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37497 0039d316-1c4b-4281-b951-d872f2087c98
* win: fix DXSDK include path, needs to be after platform sdk include pathpiman@google.com2010-01-281-1/+1
| | | | | | Review URL: http://codereview.chromium.org/554110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37384 0039d316-1c4b-4281-b951-d872f2087c98
* force nacl_standalone=1 for windows - nacl needs itpiman@google.com2010-01-271-0/+3
| | | | | | Review URL: http://codereview.chromium.org/556037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37240 0039d316-1c4b-4281-b951-d872f2087c98
* linux: use internal libjpeg for bots that don't have itpiman@google.com2010-01-271-0/+1
| | | | | | Review URL: http://codereview.chromium.org/549169 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37230 0039d316-1c4b-4281-b951-d872f2087c98
* linux: roll deps for armpiman@google.com2010-01-272-3/+20
| | | | | | Review URL: http://codereview.chromium.org/552063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37225 0039d316-1c4b-4281-b951-d872f2087c98
* Step 1 in Adding GLES2 renderer to O3D.gman@google.com2009-12-163-0/+77
| | | | | | | | | | | | | | | | | | | | | This step does only copies the GL files to a GLES2 folder. It's still actually the GL renderer at this point but it's the smallest step for getting something that builds and a place to start working. The next step will be to rename all the classes from xxxGL to xxxGLES2 At some point CG will be removed as well One other thing slipped in there. A standalone build path to help generate a C++ only example of using O3D. It's currently only a placeholder. Review URL: http://codereview.chromium.org/500070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34744 0039d316-1c4b-4281-b951-d872f2087c98
* Deleted gpu process and command buffer code from O3D tree. Now resides in ↵apatrick@google.com2009-11-251-2/+0
| | | | | | | | Chrome tree at src/gpu. Review URL: http://codereview.chromium.org/442013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33115 0039d316-1c4b-4281-b951-d872f2087c98
* Removed O3D command buffer protocol code and O3D comand buffer configuration.apatrick@google.com2009-11-202-86/+4
| | | | | | Review URL: http://codereview.chromium.org/415004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32576 0039d316-1c4b-4281-b951-d872f2087c98
* A clear screen GLES2 demo.gman@chromium.org2009-11-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure if I should check the demo in or not. I expect it will be moved or deleted but I'd like to get it in. This demo currently only runs on Windows because of a few setup issues. All it does is clear the screen purple then yellow. It shows a tiny C segment including only gl2.h and calling a GL function. Also a tiny C++ segment including only gl2.h and calling a GL function. The setup code is currently in the gles2_demo.cc. I'd like to move to gles2_lib.cc but it needs to be NaCl specific for that since that's the use case for generic setup. WebGL and unit tests will have to do custom setup I think. Also, I found out glGetAttribLocation and glGetUniformLocation were not implemented. For now I mostly subbed them out. The quickest solution was to add class GetGLcharHandler to the code generator but my next step will be to delete class GetGLcharHandler and GLcharHandler given that they only represent 3 functions total that code should be written manually. Review URL: http://codereview.chromium.org/399108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32546 0039d316-1c4b-4281-b951-d872f2087c98
* Moved all gpu plugin and command buffer tests into a single executable prior ↵apatrick@google.com2009-11-121-2/+1
| | | | | | | | to move to Chrome tree. Review URL: http://codereview.chromium.org/392017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31854 0039d316-1c4b-4281-b951-d872f2087c98
* Made all line endings consistently LF and added svn:eol-style=LF property to ↵apatrick@google.com2009-11-122-69/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | files with these names / extensions. c cc h mm txt idl py js html css gyp gypi xml shader json htm README DEPS git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31811 0039d316-1c4b-4281-b951-d872f2087c98
* Recomitting 31676 with fix.apatrick@google.com2009-11-111-1/+2
| | | | 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-111-2/+1
| | | | 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-111-1/+2
| | | | | | | | | | | | 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-113-12/+71
| | | | | | | | | | | 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
* Switched from NPObject shared memory wrapper to Chrome shared memory in ↵apatrick@google.com2009-11-101-0/+9
| | | | | | | | | | | 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
* Revert "linux: 64-bit"piman@google.com2009-11-073-63/+12
| | | | | | | | 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-073-12/+63
| | | | | | | | | | | 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
* Fixed gpu_plugin and added to o3d_all.gyp so it gets built on buildbot.apatrick@google.com2009-11-041-0/+7
| | | | | | Review URL: http://codereview.chromium.org/361012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31037 0039d316-1c4b-4281-b951-d872f2087c98
* Removed command_buffer dependency on vectormath (indirectly via core/types.h).apatrick@google.com2009-11-041-22/+56
| | | | | | | | 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
* Splits the command buffers into common commandsgman@google.com2009-10-281-0/+8
| | | | | | | | | | | | 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
* Adding the o3d-internal include path before the others so that if ↵vangelis@google.com2009-10-271-0/+1
| | | | | | | | | 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
* 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
generated by cgit v1.1 at 2025-03-14 01:57:03 +0000