Fix the order of the error() parameters in Surface.cpp and advertise…

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
parent 4e297707
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 650 #define BUILD_REVISION 651
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -854,6 +854,7 @@ void Display::initExtensionString() ...@@ -854,6 +854,7 @@ void Display::initExtensionString()
if (isD3d9ExDevice()) { if (isD3d9ExDevice()) {
mExtensionString += "EGL_ANGLE_surface_d3d_texture_2d_share_handle "; 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(' '); std::string::size_type end = mExtensionString.find_last_not_of(' ');
......
...@@ -178,7 +178,7 @@ bool Surface::resetSwapChain(int backbufferWidth, int backbufferHeight) ...@@ -178,7 +178,7 @@ bool Surface::resetSwapChain(int backbufferWidth, int backbufferHeight)
ERR("Could not create additional swap chains or offscreen surfaces: %08lX", result); ERR("Could not create additional swap chains or offscreen surfaces: %08lX", result);
release(); release();
return error(false, EGL_BAD_ALLOC); return error(EGL_BAD_ALLOC, false);
} }
if (mConfig->mDepthStencilFormat != D3DFMT_UNKNOWN) if (mConfig->mDepthStencilFormat != D3DFMT_UNKNOWN)
...@@ -194,7 +194,7 @@ bool Surface::resetSwapChain(int backbufferWidth, int backbufferHeight) ...@@ -194,7 +194,7 @@ bool Surface::resetSwapChain(int backbufferWidth, int backbufferHeight)
ERR("Could not create depthstencil surface for new swap chain: %08lX", result); ERR("Could not create depthstencil surface for new swap chain: %08lX", result);
release(); release();
return error(false, EGL_BAD_ALLOC); return error(EGL_BAD_ALLOC, false);
} }
if (mWindow) { if (mWindow) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment