Implement GL_EXT_draw_buffers.

src/OpenGL/compiler/Compiler.h

@@ -49,6 +49,7 @@ struct ShBuiltInResources
     int OES_standard_derivatives;
 	int OES_fragment_precision_high;
     int OES_EGL_image_external;
+	int EXT_draw_buffers;
 
     unsigned int MaxCallStackDepth;
 };

src/OpenGL/compiler/Initialize.cpp

@@ -481,4 +481,6 @@ void InitExtensionBehavior(const ShBuiltInResources& resources,
         extBehavior["GL_FRAGMENT_PRECISION_HIGH"] = EBhUndefined;
     if(resources.OES_EGL_image_external)
         extBehavior["GL_OES_EGL_image_external"] = EBhUndefined;
+	if(resources.EXT_draw_buffers)
+        extBehavior["GL_EXT_draw_buffers"] = EBhUndefined;
 }

src/OpenGL/libGLESv2/Context.cpp

@@ -4253,6 +4253,7 @@ const GLubyte* Context::getExtensions(GLuint index, GLuint* numExt) const
 		(const GLubyte*)"GL_OES_texture_3D",
 		(const GLubyte*)"GL_EXT_blend_minmax",
 		(const GLubyte*)"GL_EXT_color_buffer_half_float",
+		(const GLubyte*)"GL_EXT_draw_buffers",
 		(const GLubyte*)"GL_EXT_occlusion_query_boolean",
 		(const GLubyte*)"GL_EXT_read_format_bgra",
 #if (S3TC_SUPPORT)

src/OpenGL/libGLESv2/Shader.cpp

@@ -176,6 +176,7 @@ TranslatorASM *Shader::createCompiler(GLenum shaderType)
 	resources.OES_standard_derivatives = 1;
 	resources.OES_fragment_precision_high = 1;
 	resources.OES_EGL_image_external = 1;
+	resources.EXT_draw_buffers = 1;
 	resources.MaxCallStackDepth = 16;
 	assembler->Init(resources);
 

src/OpenGL/libGLESv2/exports.map

@@ -182,6 +182,7 @@ global:
 	glFramebufferTexture2DOES;
 	glGetFramebufferAttachmentParameterivOES;
 	glGenerateMipmapOES;
+	glDrawBuffersEXT;
 
     # GLES 3.0 Functions
     glReadBuffer;

src/OpenGL/libGLESv2/libGLESv2.cpp

@@ -1987,6 +1987,7 @@ void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuff
 
 		switch(attachment)
 		{
+		case GL_COLOR_ATTACHMENT0:
 		case GL_COLOR_ATTACHMENT1:
 		case GL_COLOR_ATTACHMENT2:
 		case GL_COLOR_ATTACHMENT3:
@@ -2018,12 +2019,6 @@ void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuff
 		case GL_COLOR_ATTACHMENT29:
 		case GL_COLOR_ATTACHMENT30:
 		case GL_COLOR_ATTACHMENT31:
-			if(clientVersion < 3)
-			{
-				return error(GL_INVALID_ENUM);
-			}
-			// fall through
-		case GL_COLOR_ATTACHMENT0:
 			if((attachment - GL_COLOR_ATTACHMENT0) >= MAX_COLOR_ATTACHMENTS)
 			{
 				return error(GL_INVALID_ENUM);
@@ -2134,10 +2129,9 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
 			return error(GL_INVALID_OPERATION);
 		}
 
-		GLint clientVersion = context->getClientVersion();
-
 		switch(attachment)
 		{
+		case GL_COLOR_ATTACHMENT0:
 		case GL_COLOR_ATTACHMENT1:
 		case GL_COLOR_ATTACHMENT2:
 		case GL_COLOR_ATTACHMENT3:
@@ -2169,12 +2163,6 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
 		case GL_COLOR_ATTACHMENT29:
 		case GL_COLOR_ATTACHMENT30:
 		case GL_COLOR_ATTACHMENT31:
-			if(clientVersion < 3)
-			{
-				return error(GL_INVALID_ENUM);
-			}
-			// fall through
-		case GL_COLOR_ATTACHMENT0:
 			if((attachment - GL_COLOR_ATTACHMENT0) >= MAX_COLOR_ATTACHMENTS)
 			{
 				return error(GL_INVALID_ENUM);
@@ -2807,6 +2795,7 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu
 			}
 			else return error(GL_INVALID_ENUM);
 			break;
+		case GL_COLOR_ATTACHMENT0:
 		case GL_COLOR_ATTACHMENT1:
 		case GL_COLOR_ATTACHMENT2:
 		case GL_COLOR_ATTACHMENT3:
@@ -2838,12 +2827,6 @@ void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenu
 		case GL_COLOR_ATTACHMENT29:
 		case GL_COLOR_ATTACHMENT30:
 		case GL_COLOR_ATTACHMENT31:
-			if(clientVersion < 3)
-			{
-				return error(GL_INVALID_ENUM);
-			}
-			// fall through
-		case GL_COLOR_ATTACHMENT0:
 			if((attachment - GL_COLOR_ATTACHMENT0) >= MAX_COLOR_ATTACHMENTS)
 			{
 				return error(GL_INVALID_ENUM);
@@ -6772,6 +6755,82 @@ void GenerateMipmapOES(GLenum target)
 	GenerateMipmap(target);
 }
 
+void DrawBuffersEXT(GLsizei n, const GLenum *bufs)
+{
+	TRACE("(GLsizei n = %d, const GLenum *bufs = %p)", n, bufs);
+
+	if(n < 0 || n > MAX_DRAW_BUFFERS)
+	{
+		return error(GL_INVALID_VALUE);
+	}
+
+	es2::Context *context = es2::getContext();
+
+	if(context)
+	{
+		GLuint drawFramebufferName = context->getDrawFramebufferName();
+
+		if((drawFramebufferName == 0) && (n != 1))
+		{
+			return error(GL_INVALID_OPERATION);
+		}
+
+		for(unsigned int i = 0; i < (unsigned)n; i++)
+		{
+			switch(bufs[i])
+			{
+			case GL_BACK:
+				if(drawFramebufferName != 0)
+				{
+					return error(GL_INVALID_OPERATION);
+				}
+				break;
+			case GL_NONE:
+				break;
+			case GL_COLOR_ATTACHMENT0_EXT:
+			case GL_COLOR_ATTACHMENT1_EXT:
+			case GL_COLOR_ATTACHMENT2_EXT:
+			case GL_COLOR_ATTACHMENT3_EXT:
+			case GL_COLOR_ATTACHMENT4_EXT:
+			case GL_COLOR_ATTACHMENT5_EXT:
+			case GL_COLOR_ATTACHMENT6_EXT:
+			case GL_COLOR_ATTACHMENT7_EXT:
+			case GL_COLOR_ATTACHMENT8_EXT:
+			case GL_COLOR_ATTACHMENT9_EXT:
+			case GL_COLOR_ATTACHMENT10_EXT:
+			case GL_COLOR_ATTACHMENT11_EXT:
+			case GL_COLOR_ATTACHMENT12_EXT:
+			case GL_COLOR_ATTACHMENT13_EXT:
+			case GL_COLOR_ATTACHMENT14_EXT:
+			case GL_COLOR_ATTACHMENT15_EXT:
+				{
+					GLuint index = (bufs[i] - GL_COLOR_ATTACHMENT0_EXT);
+
+					if(index >= MAX_COLOR_ATTACHMENTS)
+					{
+						return error(GL_INVALID_OPERATION);
+					}
+
+					if(index != i)
+					{
+						return error(GL_INVALID_OPERATION);
+					}
+
+					if(drawFramebufferName == 0)
+					{
+						return error(GL_INVALID_OPERATION);
+					}
+				}
+				break;
+			default:
+				return error(GL_INVALID_ENUM);
+			}
+		}
+
+		context->setFramebufferDrawBuffers(n, bufs);
+	}
+}
+
 }
 
 extern "C" __eglMustCastToProperFunctionPointerType es2GetProcAddress(const char *procname)
@@ -6831,6 +6890,7 @@ extern "C" __eglMustCastToProperFunctionPointerType es2GetProcAddress(const char
 		EXTENSION(glFramebufferTexture2DOES),
 		EXTENSION(glGetFramebufferAttachmentParameterivOES),
 		EXTENSION(glGenerateMipmapOES),
+		EXTENSION(glDrawBuffersEXT),
 
 		#undef EXTENSION
 	};

src/OpenGL/libGLESv2/libGLESv2.def

@@ -182,6 +182,7 @@ EXPORTS
 	glFramebufferTexture2DOES
 	glGetFramebufferAttachmentParameterivOES
 	glGenerateMipmapOES
+	glDrawBuffersEXT
 
     ; GLES 3.0 Functions
     glReadBuffer                    @211

src/OpenGL/libGLESv2/libGLESv2.hpp

@@ -224,6 +224,7 @@ public:
 	void (*glFramebufferTexture2DOES)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 	void (*glGetFramebufferAttachmentParameterivOES)(GLenum target, GLenum attachment, GLenum pname, GLint* params);
 	void (*glGenerateMipmapOES)(GLenum target);
+	void (*glDrawBuffersEXT)(GLsizei n, const GLenum *bufs);
 
 	egl::Context *(*es2CreateContext)(const egl::Config *config, const egl::Context *shareContext, int clientVersion);
 	__eglMustCastToProperFunctionPointerType (*es2GetProcAddress)(const char *procname);

src/OpenGL/libGLESv2/main.cpp

@@ -347,6 +347,7 @@ GL_APICALL void FramebufferRenderbufferOES(GLenum target, GLenum attachment, GLe
 GL_APICALL void FramebufferTexture2DOES(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 GL_APICALL void GetFramebufferAttachmentParameterivOES(GLenum target, GLenum attachment, GLenum pname, GLint* params);
 GL_APICALL void GenerateMipmapOES(GLenum target);
+GL_APICALL void DrawBuffersEXT(GLsizei n, const GLenum *bufs);
 }
 
 extern "C"
@@ -1318,6 +1319,11 @@ GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES(GLenum target
 	return es2::EGLImageTargetRenderbufferStorageOES(target, image);
 }
 
+GL_APICALL void GL_APIENTRY glDrawBuffersEXT(GLsizei n, const GLenum *bufs)
+{
+	return es2::DrawBuffersEXT(n, bufs);
+}
+
 void GL_APIENTRY Register(const char *licenseKey)
 {
 	RegisterLicenseKey(licenseKey);
@@ -1524,6 +1530,7 @@ LibGLESv2exports::LibGLESv2exports()
 	this->glFramebufferTexture2DOES = es2::FramebufferTexture2DOES;
 	this->glGetFramebufferAttachmentParameterivOES = es2::GetFramebufferAttachmentParameterivOES;
 	this->glGenerateMipmapOES = es2::GenerateMipmapOES;
+	this->glDrawBuffersEXT = es2::DrawBuffersEXT;
 
 	this->es2CreateContext = ::es2CreateContext;
 	this->es2GetProcAddress = ::es2GetProcAddress;