diff options
| -rw-r--r-- | app/app_base.gypi | 1 | ||||
| -rw-r--r-- | ui/gfx/compositor_gl.cc | 7 | ||||
| -rw-r--r-- | ui/gfx/gfx.gyp | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index ef5d10d..9e98ce4 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -63,6 +63,7 @@ # target, but it doesn't work due to a bug in gyp '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../ui/gfx/gfx.gyp:gfx', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', diff --git a/ui/gfx/compositor_gl.cc b/ui/gfx/compositor_gl.cc index 5404792..39a57a1 100644 --- a/ui/gfx/compositor_gl.cc +++ b/ui/gfx/compositor_gl.cc @@ -4,8 +4,9 @@ #include "ui/gfx/compositor.h" +#include <GL/gl.h> + #include "app/gfx/gl/gl_context.h" -#include "app/gfx/gl/gl_bindings.h" #include "app/gfx/gl/gl_implementation.h" #include "base/scoped_ptr.h" #include "base/basictypes.h" @@ -17,7 +18,7 @@ namespace ui { class CompositorGL : public Compositor { public: - explicit CompositorGL(gfx::AcceleratedWidget widget); + CompositorGL(gfx::AcceleratedWidget widget); private: // Overridden from Compositor. @@ -62,9 +63,11 @@ void CompositorGL::DrawTextureWithTransform(TextureID txt, } void CompositorGL::SaveTransform() { + glPushMatrix(); } void CompositorGL::RestoreTransform() { + glPopMatrix(); } // static diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index 3e95531..2cfad23 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -68,6 +68,7 @@ }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ + '../../app/app.gyp:app_base', '../../build/linux/system.gyp:gtk', ], }], @@ -173,12 +174,16 @@ }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { 'dependencies': [ - '../../app/app.gyp:app_base', # font_gtk.cc uses fontconfig. # TODO(evanm): I think this is wrong; it should just use GTK. '../../build/linux/system.gyp:fontconfig', '../../build/linux/system.gyp:gtk', ], + 'link_settings': { + 'libraries': [ + '-lGL', + ], + }, 'sources!': [ 'compositor.cc', ], |