Fix the order of the error() parameters in Surface.cpp and advertise EGL_ANGLE_d3d_share_handle_client_buffer extension
Trac #16711
Also rename the extension file to match the extension name
Signed-off-by: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@651 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/extensions/EGL_ANGLE_share_handle_client_buffer.txt b/extensions/EGL_ANGLE_d3d_share_handle_client_buffer.txt
similarity index 100%
rename from extensions/EGL_ANGLE_share_handle_client_buffer.txt
rename to extensions/EGL_ANGLE_d3d_share_handle_client_buffer.txt
diff --git a/src/common/version.h b/src/common/version.h
index 460d585..a77878a 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
#define MAJOR_VERSION 0
#define MINOR_VERSION 0
#define BUILD_VERSION 0
-#define BUILD_REVISION 650
+#define BUILD_REVISION 651
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
diff --git a/src/libEGL/Display.cpp b/src/libEGL/Display.cpp
index 338eefa..68eef76 100644
--- a/src/libEGL/Display.cpp
+++ b/src/libEGL/Display.cpp
@@ -854,6 +854,7 @@
if (isD3d9ExDevice()) {
mExtensionString += "EGL_ANGLE_surface_d3d_texture_2d_share_handle ";
+ mExtensionString += "EGL_ANGLE_d3d_share_handle_client_buffer ";
}
std::string::size_type end = mExtensionString.find_last_not_of(' ');
diff --git a/src/libEGL/Surface.cpp b/src/libEGL/Surface.cpp
index 1472efa..bbdd412 100644
--- a/src/libEGL/Surface.cpp
+++ b/src/libEGL/Surface.cpp
@@ -178,7 +178,7 @@
ERR("Could not create additional swap chains or offscreen surfaces: %08lX", result);
release();
- return error(false, EGL_BAD_ALLOC);
+ return error(EGL_BAD_ALLOC, false);
}
if (mConfig->mDepthStencilFormat != D3DFMT_UNKNOWN)
@@ -194,7 +194,7 @@
ERR("Could not create depthstencil surface for new swap chain: %08lX", result);
release();
- return error(false, EGL_BAD_ALLOC);
+ return error(EGL_BAD_ALLOC, false);
}
if (mWindow) {
