From 19f6c0c49eb71b07d36ca6a7544aa37836030542 Mon Sep 17 00:00:00 2001 From: Jeff Gilbert Date: Fri, 10 Jan 2014 08:08:37 -0500 Subject: [PATCH] Bug 942951 - Add missing GL_RGB32F and GL_RBGA32F formats to WebGLContext::GetBitsPerTexel. r=bjacob --- content/canvas/src/WebGLContextValidate.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/canvas/src/WebGLContextValidate.cpp b/content/canvas/src/WebGLContextValidate.cpp index cba76706065..56a70034edf 100644 --- a/content/canvas/src/WebGLContextValidate.cpp +++ b/content/canvas/src/WebGLContextValidate.cpp @@ -490,9 +490,11 @@ uint32_t WebGLContext::GetBitsPerTexel(GLenum format, GLenum type) case LOCAL_GL_LUMINANCE_ALPHA: return 2 * multiplier; case LOCAL_GL_RGB: + case LOCAL_GL_RGB32F: case LOCAL_GL_SRGB_EXT: return 3 * multiplier; case LOCAL_GL_RGBA: + case LOCAL_GL_RGBA32F: case LOCAL_GL_SRGB_ALPHA_EXT: return 4 * multiplier; case LOCAL_GL_COMPRESSED_RGB_PVRTC_2BPPV1: @@ -519,7 +521,7 @@ uint32_t WebGLContext::GetBitsPerTexel(GLenum format, GLenum type) return 16; } - MOZ_ASSERT(false); + MOZ_ASSERT(false, "Unhandled format+type combo."); return 0; }