Commit 1e8dcb5f by Jamie Madill Committed by Commit Bot

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/362624Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 6dd2843b
...@@ -48,6 +48,7 @@ FormatMap BuildFormatMap() ...@@ -48,6 +48,7 @@ FormatMap BuildFormatMap()
{ {
FormatMap map; FormatMap map;
// clang-format off
// | Format | Type | Internal format | // | Format | Type | Internal format |
InsertFormatMapping(&map, GL_RGBA, GL_UNSIGNED_BYTE, GL_RGBA8); InsertFormatMapping(&map, GL_RGBA, GL_UNSIGNED_BYTE, GL_RGBA8);
InsertFormatMapping(&map, GL_RGBA, GL_BYTE, GL_RGBA8_SNORM); InsertFormatMapping(&map, GL_RGBA, GL_BYTE, GL_RGBA8_SNORM);
...@@ -142,6 +143,17 @@ FormatMap BuildFormatMap() ...@@ -142,6 +143,17 @@ FormatMap BuildFormatMap()
InsertFormatMapping(&map, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH24_STENCIL8); 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); 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; return map;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment