commit 3911efd7cb89f2f02dddf7ca3fdec492930ee0f1
author Nicolas Capens <capn@google.com> Mon Oct 30 10:46:56 2017 -0400
committer Nicolas Capens <nicolascapens@google.com> Tue Nov 07 21:31:09 2017 +0000
tree cfb7e9930e9fc52738acf8dab840f69f09fd1c37
parent 2a3932cb7442a307b80ead23c88684ceb19785f4

Default to libGLESv2 for EGL surface buffer creation.

If both libGLES_CM and libGLESv2 are available, we were using the
former for creating the buffers of an EGL surface. The choice is
arbitrary, but it causes confusing issues when an interface changes
and one of the libraries wasn't rebuilt. This is less likely to occur
for libGLESv2.

Change-Id: If0c05d50a141c3782866892694d238332d8211db
Reviewed-on: https://swiftshader-review.googlesource.com/13388
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/OpenGL/libEGL/Surface.cpp

diff --git a/src/OpenGL/libEGL/Surface.cpp b/src/OpenGL/libEGL/Surface.cpp
index b3616b1..4e05d5a 100644
--- a/src/OpenGL/libEGL/Surface.cpp
+++ b/src/OpenGL/libEGL/Surface.cpp
@@ -76,14 +76,14 @@
 {
 	ASSERT(!backBuffer && !depthStencil);
 
-	if(libGLES_CM)
-	{
-		backBuffer = libGLES_CM->createBackBuffer(width, height, config->mRenderTargetFormat, config->mSamples);
-	}
-	else if(libGLESv2)
+	if(libGLESv2)
 	{
 		backBuffer = libGLESv2->createBackBuffer(width, height, config->mRenderTargetFormat, config->mSamples);
 	}
+	else if(libGLES_CM)
+	{
+		backBuffer = libGLES_CM->createBackBuffer(width, height, config->mRenderTargetFormat, config->mSamples);
+	}
 
 	if(!backBuffer)
 	{
@@ -94,14 +94,14 @@
 
 	if(config->mDepthStencilFormat != sw::FORMAT_NULL)
 	{
-		if(libGLES_CM)
-		{
-			depthStencil = libGLES_CM->createDepthStencil(width, height, config->mDepthStencilFormat, config->mSamples);
-		}
-		else if(libGLESv2)
+		if(libGLESv2)
 		{
 			depthStencil = libGLESv2->createDepthStencil(width, height, config->mDepthStencilFormat, config->mSamples);
 		}
+		else if(libGLES_CM)
+		{
+			depthStencil = libGLES_CM->createDepthStencil(width, height, config->mDepthStencilFormat, config->mSamples);
+		}
 
 		if(!depthStencil)
 		{
@@ -332,14 +332,14 @@
 
 	if(window)
 	{
-		if(libGLES_CM)
-		{
-			frameBuffer = libGLES_CM->createFrameBuffer(display->getNativeDisplay(), window, width, height);
-		}
-		else if(libGLESv2)
+		if(libGLESv2)
 		{
 			frameBuffer = libGLESv2->createFrameBuffer(display->getNativeDisplay(), window, width, height);
 		}
+		else if(libGLES_CM)
+		{
+			frameBuffer = libGLES_CM->createFrameBuffer(display->getNativeDisplay(), window, width, height);
+		}
 
 		if(!frameBuffer)
 		{