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,19 +168,20 @@ bool Display::initialize()
 	DisplayMode currentDisplayMode = getDisplayMode();
     ConfigSet configSet;
 
-    for(int formatIndex = 0; formatIndex < sizeof(renderTargetFormats) / sizeof(sw::Format); formatIndex++)
+	for(int samplesIndex = 0; samplesIndex < sizeof(samples) / sizeof(int); samplesIndex++)
     {
-        sw::Format renderTargetFormat = renderTargetFormats[formatIndex];
-
-        for(int depthStencilIndex = 0; depthStencilIndex < sizeof(depthStencilFormats) / sizeof(sw::Format); depthStencilIndex++)
-        {
-            sw::Format depthStencilFormat = depthStencilFormats[depthStencilIndex];
+		for(int formatIndex = 0; formatIndex < sizeof(renderTargetFormats) / sizeof(sw::Format); formatIndex++)
+		{
+			sw::Format renderTargetFormat = renderTargetFormats[formatIndex];
 
-            // FIXME: enumerate multi-sampling
+			for(int depthStencilIndex = 0; depthStencilIndex < sizeof(depthStencilFormats) / sizeof(sw::Format); depthStencilIndex++)
+			{
+				sw::Format depthStencilFormat = depthStencilFormats[depthStencilIndex];
 
-            configSet.add(currentDisplayMode, mMinSwapInterval, mMaxSwapInterval, renderTargetFormat, depthStencilFormat, 0);
-        }
-    }
+				configSet.add(currentDisplayMode, mMinSwapInterval, mMaxSwapInterval, renderTargetFormat, depthStencilFormat, samples[samplesIndex]);
+			}
+		}
+	}
 
     // Give the sorted configs a unique ID and store them internally
     EGLint index = 1;
@@ -277,22 +285,22 @@ EGLSurface Display::createWindowSurface(EGLNativeWindowType window, EGLConfig co
         {
             switch (attribList[0])
             {
-              case EGL_RENDER_BUFFER:
+            case EGL_RENDER_BUFFER:
                 switch (attribList[1])
                 {
-                  case EGL_BACK_BUFFER:
+                case EGL_BACK_BUFFER:
                     break;
-                  case EGL_SINGLE_BUFFER:
+                case EGL_SINGLE_BUFFER:
                     return error(EGL_BAD_MATCH, EGL_NO_SURFACE);   // Rendering directly to front buffer not supported
-                  default:
+                default:
                     return error(EGL_BAD_ATTRIBUTE, EGL_NO_SURFACE);
                 }
                 break;
-              case EGL_VG_COLORSPACE:
+            case EGL_VG_COLORSPACE:
                 return error(EGL_BAD_MATCH, EGL_NO_SURFACE);
-              case EGL_VG_ALPHA_FORMAT:
+            case EGL_VG_ALPHA_FORMAT:
                 return error(EGL_BAD_MATCH, EGL_NO_SURFACE);
-              default:
+            default:
                 return error(EGL_BAD_ATTRIBUTE, EGL_NO_SURFACE);
             }
 

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/libEGL/Surface.h

@@ -75,21 +75,21 @@ protected:
 	bool reset(int backbufferWidth, int backbufferHeight);
    
 	const Config *const config;    // EGL config surface was created with
-	EGLint height;                      // Height of surface
-	EGLint width;                       // Width of surface
-//  EGLint horizontalResolution;        // Horizontal dot pitch
-//  EGLint verticalResolution;          // Vertical dot pitch
-	EGLBoolean largestPBuffer;          // If true, create largest pbuffer possible
-//  EGLBoolean mipmapTexture;           // True if texture has mipmaps
-//  EGLint mipmapLevel;                 // Mipmap level to render to
-//  EGLenum multisampleResolve;         // Multisample resolve behavior
-	EGLint pixelAspectRatio;            // Display aspect ratio
-	EGLenum renderBuffer;               // Render buffer
-	EGLenum swapBehavior;               // Buffer swap behavior
-	EGLenum textureFormat;              // Format of texture: RGB, RGBA, or no texture
-	EGLenum textureTarget;              // Type of texture: 2D or no texture
-//  EGLenum vgAlphaFormat;              // Alpha format for OpenVG
-//  EGLenum vgColorSpace;               // Color space for OpenVG
+	EGLint height;                 // Height of surface
+	EGLint width;                  // Width of surface
+//  EGLint horizontalResolution;   // Horizontal dot pitch
+//  EGLint verticalResolution;     // Vertical dot pitch
+	EGLBoolean largestPBuffer;     // If true, create largest pbuffer possible
+//  EGLBoolean mipmapTexture;      // True if texture has mipmaps
+//  EGLint mipmapLevel;            // Mipmap level to render to
+//  EGLenum multisampleResolve;    // Multisample resolve behavior
+	EGLint pixelAspectRatio;       // Display aspect ratio
+	EGLenum renderBuffer;          // Render buffer
+	EGLenum swapBehavior;          // Buffer swap behavior
+	EGLenum textureFormat;         // Format of texture: RGB, RGBA, or no texture
+	EGLenum textureTarget;         // Type of texture: 2D or no texture
+//  EGLenum vgAlphaFormat;         // Alpha format for OpenVG
+//  EGLenum vgColorSpace;          // Color space for OpenVG
 	EGLint swapInterval;
 };
 

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;