| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/329002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29855 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
you shouldn't have to register the dll just because
you built it.
Then, make registering o3d_host.dll and selenium_ie
only happen if you are running as admin. This makes
it so you can build the O3D without turning of UAC
or running as admin. Only if you want to run
seleniun_ie do you need to be admin.
Review URL: http://codereview.chromium.org/307012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29573 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
Updating LIBRARY_PREFIX -> SHARED_LIB_PREFIX to reflect changed convention.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/283014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29302 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
and fixes the locations in the executable so that unit tests run
correctly.
Also, removes explicit references to Cg.framework from plugin and
converter gyp files, since they already rely on cg_libs, and that
should be sufficient.
Review URL: http://codereview.chromium.org/276049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29199 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
how hash functions are specified for certain key types, and deleted
our std_hash.h. Fixed forward reference bug in cmd_buffer_format.h.
Built and tested on Windows and Mac.
Remaining workarounds: enabled C++ exceptions due to use of Objective
C try/catch in plugin_mac.mm; disabled warnings as errors due to
signed / unsigned issues in command buffer code, which will probably
need to be fixed by changing typedefs and argument types.
Review URL: http://codereview.chromium.org/249013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27311 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
It's so chrome.exe does not have to load these dlls even when there's no 3D going on.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/237004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27224 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Can optionally override default renderer with environment variable. One of:
GYP_DEFINES = "renderer=d3d9"
GYP_DEFINES = "renderer=gl"
GYP_DEFINES = "renderer=cb cb_service=d3d9"
GYP_DEFINES = "renderer=cb cb_service=gl"
Fixed some warnings.
Works on windows with D3D9 but not GL, mac or linux yet.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/208037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27125 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
full-screen changes in http://codereview.chromium.org/210005 . Call
CComControlBase::IOleInPlaceObject_SetObjectRects directly as the
superclass implementation of CHostControl::SetObjectRects.
Review URL: http://codereview.chromium.org/216055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26870 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
http://codereview.chromium.org/210005 . Restore the browser's original
WNDPROC on the plugin window before destroying the O3D plugin, so that
Windows does not attempt to call into the O3D plugin after it has been
unloaded.
Review URL: http://codereview.chromium.org/208050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26750 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
It also fixes two other minor problems:
a signed/unsigned mismatch in the gapi_decoder,
and a switch from sys.argv[0] to __file__ in codegen.py.
Review URL: http://codereview.chromium.org/208015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26504 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
window in which to render, rather than rendering into either the
browser's window or a separate full-screen window. The O3D window is
removed from the browser's hierarchy and made top-level in order to go
to full-screen mode via Direct3D. This solves fundamental focus
fighting problems seen on Windows Vista.
This change allowed the event forwarding code in the plugin's window
message loop to be deleted, but a new workaround for a flicker upon
the first mouse click in O3D in Firefox was required.
Split the Renderer's fullscreen API into GoFullscreen and
CancelFullscreen to solve chicken-and-egg problems with coming out of
full-screen mode.
Changed how the plugin detects resize events. Rather than responding
to WM_SIZE messages, NPP_SetWindow is now responsible for propagating
resize events to the client. Changed the ActiveX host control to call
NPP_SetWindow in response to SetObjectRects.
Fixed RendererGL::IsCurrent() on non-Mac platforms. Removed the bogus
current_renderer_ static variable.
Tested the following scenarios in IE and Firefox on Windows:
- Full-screen involving display mode change, Escape to exit.
- Full-screen involving display mode change, Alt-Tab to exit.
- Full-screen involving display mode change, Alt-F4 to exit.
- Full-screen involving display mode change, timeout to exit.
- Full-screen with no display mode change, Escape to exit.
- Full-screen with no display mode change, Alt-Tab to exit.
- Full-screen with no display mode change, Alt-F4 to exit.
- Full-screen with no display mode change, timeout to exit.
- Beach demo, particle demo, other tests.
Tested the following scenarios on the Mac in Safari (for which the
code path didn't change):
- Full-screen, escape to exit.
- Full-screen, Alt-Tab to exit.
- Full-screen, timeout to exit.
When http://crbug.com/21921 is fixed, full-screen mode will work on
Windows Vista with Aero on in Chrome.
Review URL: http://codereview.chromium.org/210005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26489 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix the format of many directories so they don't show up in git status anymore.
Run dos2unix on *.cc, caught many inconsistent and CRLF files.
TBR=evan
TEST=still build, git status shows nothing
BUG=none
Review URL: http://codereview.chromium.org/211010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26441 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/199087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25937 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/198032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25539 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/194005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25332 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/172119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25292 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Also, split Lock/Unlock into common and platform
specific parts.
This is needed to work around an apparent bug in
mac drivers where glGetTexImage apparently doesn't
always work.
This doesn't solve the issue unless we disallow
READ completely. Not sure what to about that
except make a small GL sample and report the
bug to Apple.
Review URL: http://codereview.chromium.org/173640
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25012 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
can be called recursively. Because of that
ArchiveRequest::raw_data_ would be invalid when the
outer call came back. This way we mostly don't use
that field.
Also updated the docs so it can me marked as
deprecated.
Review URL: http://codereview.chromium.org/173620
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24906 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
| |
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/175016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24814 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
of chrome.
This was preventing the installer from baking it in.
BUG=None
TEST=None
TBR=gspencer
Review URL: http://codereview.chromium.org/173591
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24666 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
| |
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24481 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
| |
Review URL: http://codereview.chromium.org/173453
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24478 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
| |
Downstream packagers are (rightly) careful about the license of code
that they distribute and so we want to dot our i's.
http://codereview.chromium.org/174372
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24311 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
Adjust a lot of build voodoo to get things set correctly for a mach-o bundled plugin.
Create scripts to install private frameworks and modify the plugin to use the private copies.
Review URL: http://codereview.chromium.org/173329
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24291 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
| |
- Eliminate useless call to ldconfig (see Debian bug #364436)
- Eliminate spurious rpath. We were setting the rpath equal to the build output directory for libs, which is wrong. The rpath is the _run-time_ library search path for the resulting binary, i.e. the one used by ld.so at load time. Setting it equal to the path to build output on the build machine is nonsense.
Also:
- Use new-found knowledge of rpath to eliminate the need to symlink into /usr/lib(32) by instead setting rpath to /opt/google/o3d/lib and putting our three dependent libs there.
Review URL: http://codereview.chromium.org/174369
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24250 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I believe there were some mis-understandings
about the code. It's supposed to work
StartRendering();
BeginDraw();
EndDraw();
BeginDraw();
EndDraw();
BeginDraw();
EndDraw();
FinishRendering();
To try to enforce correct usage I separated
some platform dependant stuff from shared
stuff and added a few flags.
Also in this CL I made Texture::GetRenderSurface
not require a pack. This is so I because it feels
cleaner that way but also because I wanted to
use surfaces without a pack to take a screenshot.
Finally I put some screenshot code in for GL.
Also fixed some bugs with locking textures.
1) I thought it was x, y, width, height but it's
actually x1, y1, x2, y2
2) I was using width in places I should have been
using mip_width
Review URL: http://codereview.chromium.org/174199
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24188 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
environment variable.
In the Mac version, the place it's added lets
one instance use the hardware renderer and
another instance use the software renderer.
The windows version does this as well.
Review URL: http://codereview.chromium.org/173248
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24127 0039d316-1c4b-4281-b951-d872f2087c98
|
|
|
|
|
|
|
|
| |
converter tool.
Review URL: http://codereview.chromium.org/173045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23721 0039d316-1c4b-4281-b951-d872f2087c98
|