diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 18:27:27 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 18:27:27 +0000 |
| commit | 4297bea874c5620b111cd07bb06bd4e256e7e72b (patch) | |
| tree | 0b934b27d12098ea9bf28c1ffaee7cbd71b86464 /ui/base/x/x11_util.h | |
| parent | f8530b797730cca270210117a949a4a06be4009d (diff) | |
| download | chromium_src-4297bea874c5620b111cd07bb06bd4e256e7e72b.zip chromium_src-4297bea874c5620b111cd07bb06bd4e256e7e72b.tar.gz chromium_src-4297bea874c5620b111cd07bb06bd4e256e7e72b.tar.bz2 | |
Enable GL_CHROMIUM_post_sub_buffer for osmesa
Small changes to WGC3DInProcessImpl to pass the extension up to WebKit.
BUG=none
TEST=with https://bugs.webkit.org/show_bug.cgi?id=67341 and --use-gl=osmesa
Review URL: http://codereview.chromium.org/8772021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/x/x11_util.h')
| -rw-r--r-- | ui/base/x/x11_util.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index 4f2fe33..29fba7c 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -178,10 +178,25 @@ UI_EXPORT XID CreatePictureFromSkiaPixmap(Display* display, XID pixmap); // server side visual depth as needed. Destination is assumed to be the same // dimensions as |data| or larger. |data| is also assumed to be in row order // with each line being exactly |width| * 4 bytes long. -UI_EXPORT void PutARGBImage(Display* display, void* visual, int depth, - XID pixmap, void* pixmap_gc, const uint8* data, +UI_EXPORT void PutARGBImage(Display* display, + void* visual, int depth, + XID pixmap, void* pixmap_gc, + const uint8* data, int width, int height); +// Same as above only more general: +// - |data_width| and |data_height| refer to the data image +// - |src_x|, |src_y|, |copy_width| and |copy_height| define source region +// - |dst_x|, |dst_y|, |copy_width| and |copy_height| define destination region +UI_EXPORT void PutARGBImage(Display* display, + void* visual, int depth, + XID pixmap, void* pixmap_gc, + const uint8* data, + int data_width, int data_height, + int src_x, int src_y, + int dst_x, int dst_y, + int copy_width, int copy_height); + void FreePicture(Display* display, XID picture); void FreePixmap(Display* display, XID pixmap); |