Allocate D3D queries from a pool for the Display.

samples/gles2_book/Common/esUtil.c

@@ -33,6 +33,13 @@
 
 PFNEGLPOSTSUBBUFFERNVPROC eglPostSubBufferNV;
 
+PFNGLDELETEFENCESNVPROC glDeleteFencesNV;
+PFNGLGENFENCESNVPROC glGenFencesNV;
+PFNGLGETFENCEIVNVPROC glGetFenceivNV;
+PFNGLISFENCENVPROC glIsFenceNV;
+PFNGLFINISHFENCENVPROC glFinishFenceNV;
+PFNGLSETFENCENVPROC glSetFenceNV;
+PFNGLTESTFENCENVPROC glTestFenceNV;
 
 ///
 // CreateEGLContext()
@@ -68,6 +75,14 @@ EGLBoolean CreateEGLContext ( EGLNativeWindowType hWnd, EGLDisplay* eglDisplay,
    // Bind to extensions
    eglPostSubBufferNV = (PFNEGLPOSTSUBBUFFERNVPROC) eglGetProcAddress("eglPostSubBufferNV");
 
+   glDeleteFencesNV = (PFNGLDELETEFENCESNVPROC) eglGetProcAddress("glDeleteFencesNV");
+   glGenFencesNV = (PFNGLGENFENCESNVPROC) eglGetProcAddress("glGenFencesNV");
+   glGetFenceivNV = (PFNGLGETFENCEIVNVPROC) eglGetProcAddress("glGetFenceivNV");
+   glIsFenceNV = (PFNGLISFENCENVPROC) eglGetProcAddress("glIsFenceNV");
+   glFinishFenceNV = (PFNGLFINISHFENCENVPROC) eglGetProcAddress("glFinishFenceNV");
+   glSetFenceNV = (PFNGLSETFENCENVPROC) eglGetProcAddress("glSetFenceNV");
+   glTestFenceNV = (PFNGLTESTFENCENVPROC) eglGetProcAddress("glTestFenceNV");
+
    // Get configs
    if ( !eglGetConfigs(display, NULL, 0, &numConfigs) )
    {

samples/gles2_book/Common/esUtil.h

@@ -21,6 +21,7 @@
 //  Includes
 //
 #include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
@@ -95,6 +96,13 @@ typedef struct
 
 extern PFNEGLPOSTSUBBUFFERNVPROC eglPostSubBufferNV;
 
+extern PFNGLDELETEFENCESNVPROC glDeleteFencesNV;
+extern PFNGLGENFENCESNVPROC glGenFencesNV;
+extern PFNGLGETFENCEIVNVPROC glGetFenceivNV;
+extern PFNGLISFENCENVPROC glIsFenceNV;
+extern PFNGLFINISHFENCENVPROC glFinishFenceNV;
+extern PFNGLSETFENCENVPROC glSetFenceNV;
+extern PFNGLTESTFENCENVPROC glTestFenceNV;
 
 ///
 //  Public Functions

src/common/version.h

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

src/libEGL/Display.cpp

@@ -76,7 +76,6 @@ Display::Display(EGLNativeDisplayType displayId, HDC deviceContext, bool softwar
     mDevice = NULL;
     mDeviceEx = NULL;
     mDeviceWindow = NULL;
-    mEventQuery = NULL;
 
     mAdapter = D3DADAPTER_DEFAULT;
 
@@ -304,10 +303,10 @@ void Display::terminate()
         destroyContext(*mContextSet.begin());
     }
 
-    if (mEventQuery)
+    while (!mEventQueryPool.empty())
     {
-        mEventQuery->Release();
-        mEventQuery = NULL;
+        mEventQueryPool.back()->Release();
+        mEventQueryPool.pop_back();
     }
 
     if (mDevice)
@@ -469,12 +468,6 @@ 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;
 }
 
@@ -737,10 +730,10 @@ bool Display::restoreLostDevice()
         (*surface)->release();
     }
 
-    if (mEventQuery)
+    while (!mEventQueryPool.empty())
     {
-        mEventQuery->Release();
-        mEventQuery = NULL;
+        mEventQueryPool.back()->Release();
+        mEventQueryPool.pop_back();
     }
 
     if (!resetDevice())
@@ -892,17 +885,18 @@ void Display::sync(bool block)
 {
     HRESULT result;
 
-    if (!mEventQuery)
+    IDirect3DQuery9* query = allocateEventQuery();
+    if (!query)
     {
         return;
     }
 
-    result = mEventQuery->Issue(D3DISSUE_END);
+    result = query->Issue(D3DISSUE_END);
     ASSERT(SUCCEEDED(result));
 
     do
     {
-        result = mEventQuery->GetData(NULL, 0, D3DGETDATA_FLUSH);
+        result = query->GetData(NULL, 0, D3DGETDATA_FLUSH);
 
         if(block && result == S_FALSE)
         {
@@ -919,9 +913,41 @@ void Display::sync(bool block)
     }
     while(block && result == S_FALSE);
 
-    if (isDeviceLostError(result))
+    freeEventQuery(query);
+
+    if (isDeviceLostError(result))
+    {
+        notifyDeviceLost();
+    }
+}
+
+IDirect3DQuery9* Display::allocateEventQuery()
+{
+    IDirect3DQuery9 *query = NULL;
+
+    if (mEventQueryPool.empty())
+    {
+        HRESULT result = mDevice->CreateQuery(D3DQUERYTYPE_EVENT, &query);
+        ASSERT(SUCCEEDED(result));
+    }
+    else
+    {
+        query = mEventQueryPool.back();
+        mEventQueryPool.pop_back();
+    }
+
+    return query;
+}
+
+void Display::freeEventQuery(IDirect3DQuery9* query)
+{
+    if (mEventQueryPool.size() > 1000)
+    {
+        query->Release();
+    }
+    else
     {
-        notifyDeviceLost();
+        mEventQueryPool.push_back(query);
     }
 }
 
@@ -1068,14 +1094,16 @@ D3DPOOL Display::getTexturePool(bool renderable) const
 
 bool Display::getEventQuerySupport()
 {
-    IDirect3DQuery9 *query;
-    HRESULT result = mDevice->CreateQuery(D3DQUERYTYPE_EVENT, &query);
-    if (SUCCEEDED(result))
+    IDirect3DQuery9 *query = allocateEventQuery();
+    if (query)
     {
-        query->Release();
+        freeEventQuery(query);
+        return true;
+    }
+    else
+    {
+        return false;
     }
-
-    return result != D3DERR_NOTAVAILABLE;
 }
 
 D3DPRESENT_PARAMETERS Display::getDefaultPresentParameters()

src/libEGL/Display.h

@@ -18,6 +18,7 @@
 #include <d3d9.h>
 
 #include <set>
+#include <vector>
 
 #include "libGLESv2/Context.h"
 
@@ -64,6 +65,8 @@ class Display
     virtual bool testDeviceLost();
     virtual bool testDeviceResettable();
     virtual void sync(bool block);
+    virtual IDirect3DQuery9* allocateEventQuery();
+    virtual void freeEventQuery(IDirect3DQuery9* query);
     virtual void getMultiSampleSupport(D3DFORMAT format, bool *multiSampleArray);
     virtual bool getDXT1TextureSupport();
     virtual bool getDXT3TextureSupport();
@@ -104,7 +107,9 @@ 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;
+
+    // A pool of event queries that are currently unused.
+    std::vector<IDirect3DQuery9*> mEventQueryPool;
 
     D3DCAPS9 mDeviceCaps;
     D3DADAPTER_IDENTIFIER9 mAdapterIdentifier;

src/libGLESv2/Fence.cpp

@@ -24,8 +24,7 @@ Fence::~Fence()
 {
     if (mQuery != NULL)
     {
-        mQuery->Release();
-        mQuery = NULL;
+        getDisplay()->freeEventQuery(mQuery);
     }
 }
 
@@ -38,15 +37,13 @@ GLboolean Fence::isFence()
 
 void Fence::setFence(GLenum condition)
 {
-    if (mQuery != NULL)
-    {
-        mQuery->Release();
-        mQuery = NULL;
-    }
-
-    if (FAILED(getDevice()->CreateQuery(D3DQUERYTYPE_EVENT, &mQuery)))
+    if (!mQuery)
     {
-        return error(GL_OUT_OF_MEMORY);
+        mQuery = getDisplay()->allocateEventQuery();
+        if (!mQuery)
+        {
+            return error(GL_OUT_OF_MEMORY);
+        }
     }
 
     HRESULT result = mQuery->Issue(D3DISSUE_END);