Framebuffer completeness multisample fix

Framebuffer completeness, usually verified through glCheckFramebufferStatus, should return GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE when the number of samples is not the same for all attached renderbuffers. Change-Id: I8d29895c6d4ded26847ce47fbd2581bbf06ed1bf Reviewed-on: https://swiftshader-review.googlesource.com/4363Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Framebuffer completeness multisample fix
137364a7 · Alexis Hetu · Alexis Hétu · e23029a7 · 137364a7
Commit 137364a7 authored Dec 08, 2015 by Alexis Hetu Committed by Alexis Hétu Dec 08, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

Framebuffer.cpp src/OpenGL/libGLESv2/Framebuffer.cpp +10 -1

No files found.
--- a/src/OpenGL/libGLESv2/Framebuffer.cpp
+++ b/src/OpenGL/libGLESv2/Framebuffer.cpp
@@ -314,7 +314,16 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)

 			width = colorbuffer->getWidth();
 			height = colorbuffer->getHeight();
-			samples = colorbuffer->getSamples();
+
+			if(samples == -1)
+			{
+				samples = colorbuffer->getSamples();
+			}
+			else if(samples != colorbuffer->getSamples())
+			{
+				return GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE;
+			}
+
 		}
 	}