| Index: src/views/unix/SkOSWindow_Unix.cpp
|
| diff --git a/src/views/unix/SkOSWindow_Unix.cpp b/src/views/unix/SkOSWindow_Unix.cpp
|
| index cb7aa4b5ae8be7300c8f944ecd7dec336b004ffe..0a66c7ce52c3e8336e3aee0ef1e779a9d4ebf51e 100644
|
| --- a/src/views/unix/SkOSWindow_Unix.cpp
|
| +++ b/src/views/unix/SkOSWindow_Unix.cpp
|
| @@ -374,6 +374,10 @@ void SkOSWindow::doPaint() {
|
| if (NULL == fUnixWindow.fDisplay) {
|
| return;
|
| }
|
| + // If we are drawing with GL, we don't need XPutImage.
|
| + if (NULL != fUnixWindow.fGLContext) {
|
| + return;
|
| + }
|
| // Draw the bitmap to the screen.
|
| const SkBitmap& bitmap = getBitmap();
|
| int width = bitmap.width();
|
|
|