commit 1e8dcb5f053c2f4331db43bc1d13941ea7e51855
author Jamie Madill <jmadill@chromium.org> Fri Jul 22 12:01:41 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Jul 22 19:43:17 2016 +0000
tree bf59da09bda2d992cb998ba5a43e1ff5ddbbd589
parent 6dd2843b9721fc546497f5b4e8b1b30646df1d29

Add missing R16 formats to internal format mapping.

These were missing and are in the spec.

BUG=angleproject:1228

Change-Id: Ife9d311e76662d467d06b7aec4e674f9699b3573
Reviewed-on: https://chromium-review.googlesource.com/362624
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/formatutils.cpp

diff --git a/src/libANGLE/formatutils.cpp b/src/libANGLE/formatutils.cpp
index 4b5c140..3ddafdd 100644
--- a/src/libANGLE/formatutils.cpp
+++ b/src/libANGLE/formatutils.cpp
@@ -48,6 +48,7 @@
 {
     FormatMap map;
 
+    // clang-format off
     //                       | Format               | Type                             | Internal format          |
     InsertFormatMapping(&map, GL_RGBA,               GL_UNSIGNED_BYTE,                  GL_RGBA8);
     InsertFormatMapping(&map, GL_RGBA,               GL_BYTE,                           GL_RGBA8_SNORM);
@@ -142,6 +143,17 @@
     InsertFormatMapping(&map, GL_DEPTH_STENCIL,      GL_UNSIGNED_INT_24_8,              GL_DEPTH24_STENCIL8);
     InsertFormatMapping(&map, GL_DEPTH_STENCIL,      GL_FLOAT_32_UNSIGNED_INT_24_8_REV, GL_DEPTH32F_STENCIL8);
 
+    // From GL_EXT_texture_norm16
+    InsertFormatMapping(&map, GL_RED,                GL_UNSIGNED_SHORT,                 GL_R16_EXT);
+    InsertFormatMapping(&map, GL_RED,                GL_SHORT,                          GL_R16_SNORM_EXT);
+    InsertFormatMapping(&map, GL_RG,                 GL_UNSIGNED_SHORT,                 GL_RG16_EXT);
+    InsertFormatMapping(&map, GL_RG,                 GL_SHORT,                          GL_RG16_SNORM_EXT);
+    InsertFormatMapping(&map, GL_RGB,                GL_UNSIGNED_SHORT,                 GL_RGB16_EXT);
+    InsertFormatMapping(&map, GL_RGB,                GL_SHORT,                          GL_RGB16_SNORM_EXT);
+    InsertFormatMapping(&map, GL_RGBA,               GL_UNSIGNED_SHORT,                 GL_RGBA16_EXT);
+    InsertFormatMapping(&map, GL_RGBA,               GL_SHORT,                          GL_RGBA16_SNORM_EXT);
+    // clang-format on
+
     return map;
 }