Disable getting share handles when PIX is enabled.

src/common/version.h

 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 981
+#define BUILD_REVISION 982
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libEGL/Display.cpp

@@ -1131,7 +1131,6 @@ D3DPRESENT_PARAMETERS Display::getDefaultPresentParameters()
 void Display::initExtensionString()
 {
     HMODULE swiftShader = GetModuleHandle(TEXT("swiftshader_d3d9.dll"));
-    bool isd3d9ex = isD3d9ExDevice();
 
     mExtensionString = "";
 
@@ -1139,7 +1138,7 @@ void Display::initExtensionString()
     mExtensionString += "EGL_EXT_create_context_robustness ";
 
     // ANGLE-specific extensions
-    if (isd3d9ex)
+    if (shareHandleSupported())
     {
         mExtensionString += "EGL_ANGLE_d3d_share_handle_client_buffer ";
     }
@@ -1151,7 +1150,7 @@ void Display::initExtensionString()
         mExtensionString += "EGL_ANGLE_software_display ";
     }
 
-    if (isd3d9ex)
+    if (shareHandleSupported())
     {
         mExtensionString += "EGL_ANGLE_surface_d3d_texture_2d_share_handle ";
     }
@@ -1170,6 +1169,12 @@ const char *Display::getExtensionString() const
     return mExtensionString.c_str();
 }
 
+bool Display::shareHandleSupported() const 
+{
+    // PIX doesn't seem to support using share handles, so disable them.
+    return isD3d9ExDevice() && !gl::perfActive();
+}
+
 // Only Direct3D 10 ready devices support all the necessary vertex texture formats.
 // We test this using D3D9 by checking support for the R16F format.
 bool Display::getVertexTextureSupport() const

src/libEGL/Display.h

@@ -86,8 +86,9 @@ class Display
     virtual void notifyDeviceLost();
     bool isDeviceLost();
 
-    bool isD3d9ExDevice() { return mD3d9Ex != NULL; }
+    bool isD3d9ExDevice() const { return mD3d9Ex != NULL; }
     const char *getExtensionString() const;
+    bool shareHandleSupported() const;
 
   private:
     DISALLOW_COPY_AND_ASSIGN(Display);

src/libEGL/Surface.cpp

@@ -253,7 +253,7 @@ bool Surface::resetSwapChain(int backbufferWidth, int backbufferHeight)
         result = device->CreateAdditionalSwapChain(&presentParameters, &mSwapChain);
     } else {
         HANDLE *pShareHandle = NULL;
-        if (mDisplay->isD3d9ExDevice()) {
+        if (mDisplay->shareHandleSupported()) {
             pShareHandle = &mShareHandle;
         }