diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 23:04:37 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-22 23:04:37 +0000 |
| commit | ad7bbbd6badf073dfd61bcc8d3ea9124d8b14ce7 (patch) | |
| tree | 16d59f3a765faf69f39bf3dcff8d2fa4b6e15030 /ui/gfx/gl/gl.gyp | |
| parent | 9cb2b3b8c8b21fb46d20ad4d6f14cdc7d6b3aeaf (diff) | |
| download | chromium_src-ad7bbbd6badf073dfd61bcc8d3ea9124d8b14ce7.zip chromium_src-ad7bbbd6badf073dfd61bcc8d3ea9124d8b14ce7.tar.gz chromium_src-ad7bbbd6badf073dfd61bcc8d3ea9124d8b14ce7.tar.bz2 | |
Reland 81998.The bug in webkit\gpu\webgraphicscontext3d_in_process_impl.cc that assumed creating a new GLContext made it current is now fixed and this patch should now work.
Original message:
Split OSMesa implementations of *GLContext into GLContextOSMesa and *GLSurfaceOSMesa.
Surfaces are independent of contexts in GL. To facilitate sharing of surfaces between processes, I have separated them from the notion of contexts because contexts cannot be shared between processes.
I started with EGL in r81512 and WGL in r81807. This is the same thing for OSMesa.
GLContextOSMesa still has a pointer to a surface and still has some surface specific operations that just forward through to it. Once I have refactored all the GLContext implementations in this way, I will remove these pointers and the surface specific opertations.
There will not be "view" and "offscreen" GL contexts. Rather there will be a single context type for each backend which can be made current with a surface that directs output either to a view or offscreen surface.
Original review:
http://codereview.chromium.org/6864031/
TEST=ran linux_layout and mac_layout try jobs (they were failing before)
BUG=none
Review URL: http://codereview.chromium.org/6881071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/gl/gl.gyp')
| -rw-r--r-- | ui/gfx/gl/gl.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp index 507d9b4..83299b3a 100644 --- a/ui/gfx/gl/gl.gyp +++ b/ui/gfx/gl/gl.gyp @@ -76,6 +76,8 @@ 'gl_interface.h', 'gl_surface.cc', 'gl_surface.h', + 'gl_surface_osmesa.cc', + 'gl_surface_osmesa.h', 'gl_switches.cc', 'gl_switches.h', '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', |