Move Context::sync to Display::sync.

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 939
+#define BUILD_REVISION 940
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libEGL/Display.cpp

@@ -16,6 +16,7 @@
 
 #include "common/debug.h"
 #include "libGLESv2/mathutil.h"
+#include "libGLESv2/utilities.h"
 
 #include "libEGL/main.h"
 
@@ -75,6 +76,7 @@ Display::Display(EGLNativeDisplayType displayId, HDC deviceContext, bool softwar
     mDevice = NULL;
     mDeviceEx = NULL;
     mDeviceWindow = NULL;
+    mEventQuery = NULL;
 
     mAdapter = D3DADAPTER_DEFAULT;
 
@@ -302,6 +304,12 @@ void Display::terminate()
         destroyContext(*mContextSet.begin());
     }
 
+    if (mEventQuery)
+    {
+        mEventQuery->Release();
+        mEventQuery = NULL;
+    }
+
     if (mDevice)
     {
         // If the device is lost, reset it first to prevent leaving the driver in an unstable state
@@ -461,6 +469,12 @@ void Display::initializeDevice()
     mDevice->SetRenderState(D3DRS_POINTSPRITEENABLE, TRUE);
     mDevice->SetRenderState(D3DRS_LASTPIXEL, FALSE);
 
+    // Leave mEventQuery null if CreateQuery fails. This will prevent sync from
+    // working correctly but otherwise mEventQuery is expected to be null when
+    // queries are not supported.
+    ASSERT(!mEventQuery);
+    mDevice->CreateQuery(D3DQUERYTYPE_EVENT, &mEventQuery);
+
     mSceneStarted = false;
 }
 
@@ -723,6 +737,12 @@ bool Display::restoreLostDevice()
         (*surface)->release();
     }
 
+    if (mEventQuery)
+    {
+        mEventQuery->Release();
+        mEventQuery = NULL;
+    }
+
     if (!resetDevice())
     {
         return false;
@@ -868,6 +888,43 @@ bool Display::testDeviceResettable()
     }
 }
 
+void Display::sync(bool block)
+{
+    HRESULT result;
+
+    if (!mEventQuery)
+    {
+        return;
+    }
+
+    result = mEventQuery->Issue(D3DISSUE_END);
+    ASSERT(SUCCEEDED(result));
+
+    do
+    {
+        result = mEventQuery->GetData(NULL, 0, D3DGETDATA_FLUSH);
+
+        if(block && result == S_FALSE)
+        {
+            // Keep polling, but allow other threads to do something useful first
+            Sleep(0);
+            // explicitly check for device loss
+            // some drivers seem to return S_FALSE even if the device is lost
+            // instead of D3DERR_DEVICELOST like they should
+            if (testDeviceLost())
+            {
+                result = D3DERR_DEVICELOST;
+            }
+        }
+    }
+    while(block && result == S_FALSE);
+
+    if (isDeviceLostError(result))
+    {
+        notifyDeviceLost();
+    }
+}
+
 void Display::getMultiSampleSupport(D3DFORMAT format, bool *multiSampleArray)
 {
     for (int multiSampleIndex = 0; multiSampleIndex <= D3DMULTISAMPLE_16_SAMPLES; multiSampleIndex++)

src/libEGL/Display.h

@@ -63,6 +63,7 @@ class Display
     virtual D3DADAPTER_IDENTIFIER9 *getAdapterIdentifier();
     virtual bool testDeviceLost();
     virtual bool testDeviceResettable();
+    virtual void sync(bool block);
     virtual void getMultiSampleSupport(D3DFORMAT format, bool *multiSampleArray);
     virtual bool getDXT1TextureSupport();
     virtual bool getDXT3TextureSupport();
@@ -103,6 +104,8 @@ class Display
     IDirect3D9Ex *mD3d9Ex;  // Might be null if D3D9Ex is not supported.
     IDirect3DDevice9 *mDevice;
     IDirect3DDevice9Ex *mDeviceEx;  // Might be null if D3D9Ex is not supported.
+    IDirect3DQuery9 *mEventQuery;
+
     D3DCAPS9 mDeviceCaps;
     D3DADAPTER_IDENTIFIER9 mAdapterIdentifier;
     HWND mDeviceWindow;

src/libGLESv2/Context.cpp

@@ -2859,56 +2859,7 @@ void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const void *
 // Implements glFlush when block is false, glFinish when block is true
 void Context::sync(bool block)
 {
-    egl::Display *display = getDisplay();
-    IDirect3DQuery9 *eventQuery = NULL;
-    HRESULT result;
-
-    result = mDevice->CreateQuery(D3DQUERYTYPE_EVENT, &eventQuery);
-    if (FAILED(result))
-    {
-        ERR("CreateQuery failed hr=%x\n", result);
-        if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
-        {
-            return error(GL_OUT_OF_MEMORY);
-        }
-        ASSERT(false);
-        return;
-    }
-
-    result = eventQuery->Issue(D3DISSUE_END);
-    if (FAILED(result))
-    {
-        ERR("eventQuery->Issue(END) failed hr=%x\n", result);
-        ASSERT(false);
-        eventQuery->Release();
-        return;
-    }
-
-    do
-    {
-        result = eventQuery->GetData(NULL, 0, D3DGETDATA_FLUSH);
-
-        if(block && result == S_FALSE)
-        {
-            // Keep polling, but allow other threads to do something useful first
-            Sleep(0);
-            // explicitly check for device loss
-            // some drivers seem to return S_FALSE even if the device is lost
-            // instead of D3DERR_DEVICELOST like they should
-            if (display->testDeviceLost())
-            {
-                result = D3DERR_DEVICELOST;
-            }
-        }
-    }
-    while(block && result == S_FALSE);
-
-    eventQuery->Release();
-
-    if (checkDeviceLost(result))
-    {
-        error(GL_OUT_OF_MEMORY);
-    }
+    mDisplay->sync(block);
 }
 
 void Context::drawClosingLine(unsigned int first, unsigned int last, int minIndex)