Enumerate multisampled EGL configs.

src/OpenGL/libEGL/Config.cpp

@@ -143,7 +143,7 @@ Config::Config(const DisplayMode &displayMode, EGLint minInterval, EGLint maxInt
         | EGL_OPENGL_ES3_BIT
 #endif
         ;
-    mSampleBuffers = multiSample ? 1 : 0;
+    mSampleBuffers = (multiSample > 0) ? 1 : 0;
     mSamples = multiSample;
     mSurfaceType = EGL_PBUFFER_BIT | EGL_WINDOW_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT;
     mTransparentType = EGL_NONE;

src/OpenGL/libEGL/Display.cpp

@@ -134,6 +134,13 @@ bool Display::initialize()
     mMinSwapInterval = 0;
     mMaxSwapInterval = 4;
 
+	const int samples[] =
+	{
+		0,
+		2,
+		4
+	};
+
     const sw::Format renderTargetFormats[] =
     {
         sw::FORMAT_A1R5G5B5,
@@ -161,6 +168,8 @@ bool Display::initialize()
 	DisplayMode currentDisplayMode = getDisplayMode();
     ConfigSet configSet;
 
+	for(int samplesIndex = 0; samplesIndex < sizeof(samples) / sizeof(int); samplesIndex++)
+    {
 		for(int formatIndex = 0; formatIndex < sizeof(renderTargetFormats) / sizeof(sw::Format); formatIndex++)
 		{
 			sw::Format renderTargetFormat = renderTargetFormats[formatIndex];
@@ -169,9 +178,8 @@ bool Display::initialize()
 			{
 				sw::Format depthStencilFormat = depthStencilFormats[depthStencilIndex];
 
-            // FIXME: enumerate multi-sampling
-
-            configSet.add(currentDisplayMode, mMinSwapInterval, mMaxSwapInterval, renderTargetFormat, depthStencilFormat, 0);
+				configSet.add(currentDisplayMode, mMinSwapInterval, mMaxSwapInterval, renderTargetFormat, depthStencilFormat, samples[samplesIndex]);
+			}
 		}
 	}
 

src/OpenGL/libEGL/Surface.cpp

@@ -83,11 +83,11 @@ bool Surface::initialize()
     {
 		if(libGLES_CM)
 		{
-			depthStencil = libGLES_CM->createDepthStencil(width, height, config->mDepthStencilFormat, 1, false);
+			depthStencil = libGLES_CM->createDepthStencil(width, height, config->mDepthStencilFormat, config->mSamples, false);
 		}
 		else if(libGLESv2)
 		{
-			depthStencil = libGLESv2->createDepthStencil(width, height, config->mDepthStencilFormat, 1, false);
+			depthStencil = libGLESv2->createDepthStencil(width, height, config->mDepthStencilFormat, config->mSamples, false);
 		}
 
 		if(!depthStencil)

src/OpenGL/libGLES_CM/Texture.cpp

@@ -786,7 +786,7 @@ egl::Image *createBackBuffer(int width, int height, const egl::Config *config)
 {
 	if(config)
 	{
-		return new egl::Image(width, height, config->mRenderTargetFormat, 1, false, true);
+		return new egl::Image(width, height, config->mRenderTargetFormat, config->mSamples, false, true);
 	}
 
 	return 0;

src/OpenGL/libGLESv2/Texture.cpp

@@ -1894,7 +1894,7 @@ egl::Image *createBackBuffer(int width, int height, const egl::Config *config)
 {
 	if(config)
 	{
-		return new egl::Image(width, height, config->mRenderTargetFormat, 1, false, true);
+		return new egl::Image(width, height, config->mRenderTargetFormat, config->mSamples, false, true);
 	}
 
 	return 0;