Skip to content

A
angle
Commit 17605b61 by Jamie Madill Committed by Commit Bot
Options

Replace DXGI with ANGLE format in the load tables.

BUG=angleproject:1455 Change-Id: I851848d8a28bd70ff921d76b19902f40a5e8b17d Reviewed-on: https://chromium-review.googlesource.com/367453Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 46ad513f
Showing with 306 additions and 397 deletions
src/libANGLE/renderer/d3d/d3d11/gen_load_functions_table.py
...@@ -29,9 +29,6 @@ template = """// GENERATED FILE - DO NOT EDIT. ...@@ -29,9 +29,6 @@ template = """// GENERATED FILE - DO NOT EDIT.
#include "image_util/generatemip.h" #include "image_util/generatemip.h"
#include "image_util/loadimage.h" #include "image_util/loadimage.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
using namespace angle; using namespace angle;
namespace rx namespace rx
...@@ -78,7 +75,7 @@ void UnreachableLoadFunction(size_t width, ...@@ -78,7 +75,7 @@ void UnreachableLoadFunction(size_t width,
{load_functions_data}}} // namespace {load_functions_data}}} // namespace
LoadFunctionMap GetLoadFunctionsMap(GLenum {internal_format}, DXGI_FORMAT {dxgi_format}) LoadFunctionMap GetLoadFunctionsMap(GLenum {internal_format}, Format::ID {angle_format})
{{ {{
// clang-format off // clang-format off
switch ({internal_format}) switch ({internal_format})
...@@ -100,12 +97,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum {internal_format}, DXGI_FORMAT {dxgi_ ...@@ -100,12 +97,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum {internal_format}, DXGI_FORMAT {dxgi_
""" """
internal_format_param = 'internalFormat' internal_format_param = 'internalFormat'
dxgi_format_param = 'dxgiFormat' angle_format_param = 'angleFormat'
dxgi_format_unknown = "DXGI_FORMAT_UNKNOWN" angle_format_unknown = 'NONE'
def load_functions_name(internal_format, dxgi_format): def load_functions_name(internal_format, angle_format):
short_name = dxgi_format if dxgi_format == "default" else dxgi_format[len("DXGI_FORMAT_"):] return internal_format[3:] + "_to_" + angle_format
return internal_format[3:] + "_to_" + short_name
def unknown_func_name(internal_format): def unknown_func_name(internal_format):
return load_functions_name(internal_format, "default") return load_functions_name(internal_format, "default")
...@@ -128,41 +124,41 @@ def get_load_func(func_name, type_functions): ...@@ -128,41 +124,41 @@ def get_load_func(func_name, type_functions):
return snippet return snippet
def get_unknown_load_func(dxgi_to_type_map, internal_format): def get_unknown_load_func(angle_to_type_map, internal_format):
assert dxgi_format_unknown in dxgi_to_type_map assert angle_format_unknown in angle_to_type_map
return get_load_func(unknown_func_name(internal_format), dxgi_to_type_map[dxgi_format_unknown]) return get_load_func(unknown_func_name(internal_format), angle_to_type_map[angle_format_unknown])
def parse_json(json_data): def parse_json(json_data):
table_data = '' table_data = ''
load_functions_data = '' load_functions_data = ''
for internal_format, dxgi_to_type_map in sorted(json_data.iteritems()): for internal_format, angle_to_type_map in sorted(json_data.iteritems()):
s = ' ' s = ' '
table_data += s + 'case ' + internal_format + ':\n' table_data += s + 'case ' + internal_format + ':\n'
do_switch = len(dxgi_to_type_map) > 1 or dxgi_to_type_map.keys()[0] != dxgi_format_unknown do_switch = len(angle_to_type_map) > 1 or angle_to_type_map.keys()[0] != angle_format_unknown
if do_switch: if do_switch:
table_data += s + '{\n' table_data += s + '{\n'
s += ' ' s += ' '
table_data += s + 'switch (' + dxgi_format_param + ')\n' table_data += s + 'switch (' + angle_format_param + ')\n'
table_data += s + '{\n' table_data += s + '{\n'
s += ' ' s += ' '
for dxgi_format, type_functions in sorted(dxgi_to_type_map.iteritems()): for angle_format, type_functions in sorted(angle_to_type_map.iteritems()):
if dxgi_format == dxgi_format_unknown: if angle_format == angle_format_unknown:
continue continue
func_name = load_functions_name(internal_format, dxgi_format) func_name = load_functions_name(internal_format, angle_format)
# Main case statements # Main case statements
table_data += s + 'case ' + dxgi_format + ':\n' table_data += s + 'case Format::ID::' + angle_format + ':\n'
table_data += s + ' return ' + func_name + ';\n' table_data += s + ' return ' + func_name + ';\n'
if dxgi_format_unknown in dxgi_to_type_map: if angle_format_unknown in angle_to_type_map:
for gl_type, load_function in dxgi_to_type_map[dxgi_format_unknown].iteritems(): for gl_type, load_function in angle_to_type_map[angle_format_unknown].iteritems():
if gl_type not in type_functions: if gl_type not in type_functions:
type_functions[gl_type] = load_function type_functions[gl_type] = load_function
...@@ -171,9 +167,9 @@ def parse_json(json_data): ...@@ -171,9 +167,9 @@ def parse_json(json_data):
if do_switch: if do_switch:
table_data += s + 'default:\n' table_data += s + 'default:\n'
if dxgi_format_unknown in dxgi_to_type_map: if angle_format_unknown in angle_to_type_map:
table_data += s + ' return ' + unknown_func_name(internal_format) + ';\n' table_data += s + ' return ' + unknown_func_name(internal_format) + ';\n'
load_functions_data += get_unknown_load_func(dxgi_to_type_map, internal_format) load_functions_data += get_unknown_load_func(angle_to_type_map, internal_format)
else: else:
table_data += s + ' break;\n' table_data += s + ' break;\n'
...@@ -189,7 +185,7 @@ json_data = angle_format.load_json('load_functions_data.json') ...@@ -189,7 +185,7 @@ json_data = angle_format.load_json('load_functions_data.json')
switch_data, load_functions_data = parse_json(json_data) switch_data, load_functions_data = parse_json(json_data)
output = template.format(internal_format = internal_format_param, output = template.format(internal_format = internal_format_param,
dxgi_format = dxgi_format_param, angle_format = angle_format_param,
switch_data = switch_data, switch_data = switch_data,
load_functions_data = load_functions_data) load_functions_data = load_functions_data)
......
src/libANGLE/renderer/d3d/d3d11/load_functions_data.json
{ {
"GL_RG8_SNORM": { "GL_RG8_SNORM": {
"DXGI_FORMAT_R8G8_SNORM": { "R8G8_SNORM": {
"GL_BYTE": "LoadToNative<GLbyte, 2>" "GL_BYTE": "LoadToNative<GLbyte, 2>"
} }
}, },
"GL_SRGB8": { "GL_SRGB8": {
"DXGI_FORMAT_R8G8B8A8_UNORM_SRGB": { "R8G8B8A8_UNORM_SRGB": {
"GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0xFF>" "GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0xFF>"
} }
}, },
"GL_RGBA8I": { "GL_RGBA8I": {
"DXGI_FORMAT_R8G8B8A8_SINT": { "R8G8B8A8_SINT": {
"GL_BYTE": "LoadToNative<GLbyte, 4>" "GL_BYTE": "LoadToNative<GLbyte, 4>"
} }
}, },
"GL_R8_SNORM": { "GL_R8_SNORM": {
"DXGI_FORMAT_R8_SNORM": { "R8_SNORM": {
"GL_BYTE": "LoadToNative<GLbyte, 1>" "GL_BYTE": "LoadToNative<GLbyte, 1>"
} }
}, },
"GL_RGBA8_SNORM": { "GL_RGBA8_SNORM": {
"DXGI_FORMAT_R8G8B8A8_SNORM": { "R8G8B8A8_SNORM": {
"GL_BYTE": "LoadToNative<GLbyte, 4>" "GL_BYTE": "LoadToNative<GLbyte, 4>"
} }
}, },
"GL_R16I": { "GL_R16I": {
"DXGI_FORMAT_R16_SINT": { "R16_SINT": {
"GL_SHORT": "LoadToNative<GLshort, 1>" "GL_SHORT": "LoadToNative<GLshort, 1>"
} }
}, },
"GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC": { "GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC": {
"DXGI_FORMAT_R8G8B8A8_UNORM_SRGB": { "R8G8B8A8_UNORM_SRGB": {
"GL_UNSIGNED_BYTE": "LoadETC2SRGBA8ToSRGBA8" "GL_UNSIGNED_BYTE": "LoadETC2SRGBA8ToSRGBA8"
} }
}, },
"GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2": { "GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadETC2RGB8A1ToRGBA8" "GL_UNSIGNED_BYTE": "LoadETC2RGB8A1ToRGBA8"
} }
}, },
"GL_RGB32UI": { "GL_RGB32UI": {
"DXGI_FORMAT_R32G32B32A32_UINT": { "R32G32B32A32_UINT": {
"GL_UNSIGNED_INT": "LoadToNative3To4<GLuint, 0x00000001>" "GL_UNSIGNED_INT": "LoadToNative3To4<GLuint, 0x00000001>"
} }
}, },
"GL_ALPHA32F_EXT": { "GL_ALPHA32F_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_FLOAT": "LoadA32FToRGBA32F" "GL_FLOAT": "LoadA32FToRGBA32F"
} }
}, },
"GL_R16UI": { "GL_R16UI": {
"DXGI_FORMAT_R16_UINT": { "R16_UINT": {
"GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 1>" "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 1>"
} }
}, },
"GL_RGB9_E5": { "GL_RGB9_E5": {
"DXGI_FORMAT_R9G9B9E5_SHAREDEXP": { "R9G9B9E5_SHAREDEXP": {
"GL_HALF_FLOAT": "LoadRGB16FToRGB9E5", "GL_HALF_FLOAT": "LoadRGB16FToRGB9E5",
"GL_UNSIGNED_INT_5_9_9_9_REV": "LoadToNative<GLuint, 1>", "GL_UNSIGNED_INT_5_9_9_9_REV": "LoadToNative<GLuint, 1>",
"GL_FLOAT": "LoadRGB32FToRGB9E5", "GL_FLOAT": "LoadRGB32FToRGB9E5",
...@@ -63,154 +63,151 @@ ...@@ -63,154 +63,151 @@
} }
}, },
"GL_COMPRESSED_R11_EAC": { "GL_COMPRESSED_R11_EAC": {
"DXGI_FORMAT_R8_UNORM": { "R8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadEACR11ToR8" "GL_UNSIGNED_BYTE": "LoadEACR11ToR8"
} }
}, },
"GL_RGBA32UI": { "GL_RGBA32UI": {
"DXGI_FORMAT_R32G32B32A32_UINT": { "R32G32B32A32_UINT": {
"GL_UNSIGNED_INT": "LoadToNative<GLuint, 4>" "GL_UNSIGNED_INT": "LoadToNative<GLuint, 4>"
} }
}, },
"GL_RG8UI": { "GL_RG8UI": {
"DXGI_FORMAT_R8G8_UINT": { "R8G8_UINT": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 2>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 2>"
} }
}, },
"GL_LUMINANCE32F_EXT": { "GL_LUMINANCE32F_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_FLOAT": "LoadL32FToRGBA32F" "GL_FLOAT": "LoadL32FToRGBA32F"
} }
}, },
"GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2": { "GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2": {
"DXGI_FORMAT_R8G8B8A8_UNORM_SRGB": { "R8G8B8A8_UNORM_SRGB": {
"GL_UNSIGNED_BYTE": "LoadETC2SRGB8A1ToRGBA8" "GL_UNSIGNED_BYTE": "LoadETC2SRGB8A1ToRGBA8"
} }
}, },
"GL_R16F": { "GL_R16F": {
"DXGI_FORMAT_R16_FLOAT": { "R16_FLOAT": {
"GL_HALF_FLOAT": "LoadToNative<GLhalf, 1>", "GL_HALF_FLOAT": "LoadToNative<GLhalf, 1>",
"GL_FLOAT": "Load32FTo16F<1>", "GL_FLOAT": "Load32FTo16F<1>",
"GL_HALF_FLOAT_OES": "LoadToNative<GLhalf, 1>" "GL_HALF_FLOAT_OES": "LoadToNative<GLhalf, 1>"
} }
}, },
"GL_RGBA8UI": { "GL_RGBA8UI": {
"DXGI_FORMAT_R8G8B8A8_UINT": { "R8G8B8A8_UINT": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
} }
}, },
"GL_BGRA4_ANGLEX": { "GL_BGRA4_ANGLEX": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT": "LoadRGBA4ToRGBA8", "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT": "LoadRGBA4ToRGBA8",
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
} }
}, },
"GL_RGBA16F": { "GL_RGBA16F": {
"DXGI_FORMAT_R16G16B16A16_FLOAT": { "R16G16B16A16_FLOAT": {
"GL_HALF_FLOAT": "LoadToNative<GLhalf, 4>", "GL_HALF_FLOAT": "LoadToNative<GLhalf, 4>",
"GL_FLOAT": "Load32FTo16F<4>", "GL_FLOAT": "Load32FTo16F<4>",
"GL_HALF_FLOAT_OES": "LoadToNative<GLhalf, 4>" "GL_HALF_FLOAT_OES": "LoadToNative<GLhalf, 4>"
} }
}, },
"GL_LUMINANCE8_EXT": { "GL_LUMINANCE8_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "LoadL8ToRGBA8" "GL_UNSIGNED_BYTE": "LoadL8ToRGBA8"
} }
}, },
"GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE": { "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>" "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
} }
}, },
"GL_RGB": { "GL_RGB": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "UnreachableLoadFunction", "GL_UNSIGNED_BYTE": "UnreachableLoadFunction",
"GL_UNSIGNED_SHORT_5_6_5": "UnreachableLoadFunction" "GL_UNSIGNED_SHORT_5_6_5": "UnreachableLoadFunction"
} }
}, },
"GL_RGB5_A1": { "GL_RGB5_A1": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_INT_2_10_10_10_REV": "LoadRGB10A2ToRGBA8", "GL_UNSIGNED_INT_2_10_10_10_REV": "LoadRGB10A2ToRGBA8",
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>", "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>",
"GL_UNSIGNED_SHORT_5_5_5_1": "LoadRGB5A1ToRGBA8" "GL_UNSIGNED_SHORT_5_5_5_1": "LoadRGB5A1ToRGBA8"
}, },
"DXGI_FORMAT_B5G5R5A1_UNORM": { "B5G5R5A1_UNORM": {
"GL_UNSIGNED_INT_2_10_10_10_REV": "LoadRGB10A2ToBGR5A1", "GL_UNSIGNED_INT_2_10_10_10_REV": "LoadRGB10A2ToBGR5A1",
"GL_UNSIGNED_BYTE": "LoadRGBA8ToBGR5A1", "GL_UNSIGNED_BYTE": "LoadRGBA8ToBGR5A1",
"GL_UNSIGNED_SHORT_5_5_5_1": "LoadRGB5A1ToA1RGB5" "GL_UNSIGNED_SHORT_5_5_5_1": "LoadRGB5A1ToA1RGB5"
} }
}, },
"GL_RGB16UI": { "GL_RGB16UI": {
"DXGI_FORMAT_R16G16B16A16_UINT": { "R16G16B16A16_UINT": {
"GL_UNSIGNED_SHORT": "LoadToNative3To4<GLushort, 0x0001>" "GL_UNSIGNED_SHORT": "LoadToNative3To4<GLushort, 0x0001>"
} }
}, },
"GL_BGRA_EXT": { "GL_BGRA_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "UnreachableLoadFunction" "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
} }
}, },
"GL_COMPRESSED_RGB8_ETC2": { "GL_COMPRESSED_RGB8_ETC2": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadETC2RGB8ToRGBA8" "GL_UNSIGNED_BYTE": "LoadETC2RGB8ToRGBA8"
} }
}, },
"GL_RGBA32F": { "GL_RGBA32F": {
"DXGI_FORMAT_R32G32B32A32_FLOAT": { "R32G32B32A32_FLOAT": {
"GL_FLOAT": "LoadToNative<GLfloat, 4>" "GL_FLOAT": "LoadToNative<GLfloat, 4>"
} }
}, },
"GL_RGBA32I": { "GL_RGBA32I": {
"DXGI_FORMAT_R32G32B32A32_SINT": { "R32G32B32A32_SINT": {
"GL_INT": "LoadToNative<GLint, 4>" "GL_INT": "LoadToNative<GLint, 4>"
} }
}, },
"GL_LUMINANCE8_ALPHA8_EXT": { "GL_LUMINANCE8_ALPHA8_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "LoadLA8ToRGBA8" "GL_UNSIGNED_BYTE": "LoadLA8ToRGBA8"
} }
}, },
"GL_RG8": { "GL_RG8": {
"DXGI_FORMAT_R8G8_UNORM": { "R8G8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 2>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 2>"
} }
}, },
"GL_RGB10_A2": { "GL_RGB10_A2": {
"DXGI_FORMAT_R10G10B10A2_UNORM": { "R10G10B10A2_UNORM": {
"GL_UNSIGNED_INT_2_10_10_10_REV": "LoadToNative<GLuint, 1>" "GL_UNSIGNED_INT_2_10_10_10_REV": "LoadToNative<GLuint, 1>"
} }
}, },
"GL_COMPRESSED_SIGNED_RG11_EAC": { "GL_COMPRESSED_SIGNED_RG11_EAC": {
"DXGI_FORMAT_R8G8_SNORM": { "R8G8_SNORM": {
"GL_UNSIGNED_BYTE": "LoadEACRG11SToRG8" "GL_UNSIGNED_BYTE": "LoadEACRG11SToRG8"
} }
}, },
"GL_DEPTH_COMPONENT16": { "GL_DEPTH_COMPONENT16": {
"DXGI_FORMAT_R16_TYPELESS": { "D16_UNORM": {
"GL_UNSIGNED_INT": "LoadR32ToR16", "GL_UNSIGNED_INT": "LoadR32ToR16",
"GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 1>" "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 1>"
},
"DXGI_FORMAT_D16_UNORM": {
"GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 1>"
} }
}, },
"GL_RGB32I": { "GL_RGB32I": {
"DXGI_FORMAT_R32G32B32A32_SINT": { "R32G32B32A32_SINT": {
"GL_INT": "LoadToNative3To4<GLint, 0x00000001>" "GL_INT": "LoadToNative3To4<GLint, 0x00000001>"
} }
}, },
"GL_R8": { "GL_R8": {
"DXGI_FORMAT_R8_UNORM": { "R8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>"
} }
}, },
"GL_RGB32F": { "GL_RGB32F": {
"DXGI_FORMAT_R32G32B32A32_FLOAT": { "R32G32B32A32_FLOAT": {
"GL_FLOAT": "LoadToNative3To4<GLfloat, gl::Float32One>" "GL_FLOAT": "LoadToNative3To4<GLfloat, gl::Float32One>"
} }
}, },
"GL_R11F_G11F_B10F": { "GL_R11F_G11F_B10F": {
"DXGI_FORMAT_R11G11B10_FLOAT": { "R11G11B10_FLOAT": {
"GL_UNSIGNED_INT_10F_11F_11F_REV": "LoadToNative<GLuint, 1>", "GL_UNSIGNED_INT_10F_11F_11F_REV": "LoadToNative<GLuint, 1>",
"GL_HALF_FLOAT": "LoadRGB16FToRG11B10F", "GL_HALF_FLOAT": "LoadRGB16FToRG11B10F",
"GL_FLOAT": "LoadRGB32FToRG11B10F", "GL_FLOAT": "LoadRGB32FToRG11B10F",
...@@ -218,359 +215,347 @@ ...@@ -218,359 +215,347 @@
} }
}, },
"GL_RGB8": { "GL_RGB8": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0xFF>" "GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0xFF>"
} }
}, },
"GL_LUMINANCE_ALPHA": { "GL_LUMINANCE_ALPHA": {
"DXGI_FORMAT_R16G16B16A16_FLOAT": { "R16G16B16A16_FLOAT": {
"GL_HALF_FLOAT": "LoadLA16FToRGBA16F", "GL_HALF_FLOAT": "LoadLA16FToRGBA16F",
"GL_HALF_FLOAT_OES": "LoadLA16FToRGBA16F" "GL_HALF_FLOAT_OES": "LoadLA16FToRGBA16F"
}, },
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "UnreachableLoadFunction" "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
}, },
"DXGI_FORMAT_R32G32B32A32_FLOAT": { "R32G32B32A32_FLOAT": {
"GL_FLOAT": "LoadLA32FToRGBA32F" "GL_FLOAT": "LoadLA32FToRGBA32F"
} }
}, },
"GL_RGBA16I": { "GL_RGBA16I": {
"DXGI_FORMAT_R16G16B16A16_SINT": { "R16G16B16A16_SINT": {
"GL_SHORT": "LoadToNative<GLshort, 4>" "GL_SHORT": "LoadToNative<GLshort, 4>"
} }
}, },
"GL_R8I": { "GL_R8I": {
"DXGI_FORMAT_R8_SINT": { "R8_SINT": {
"GL_BYTE": "LoadToNative<GLbyte, 1>" "GL_BYTE": "LoadToNative<GLbyte, 1>"
} }
}, },
"GL_RGB8_SNORM": { "GL_RGB8_SNORM": {
"DXGI_FORMAT_R8G8B8A8_SNORM": { "R8G8B8A8_SNORM": {
"GL_BYTE": "LoadToNative3To4<GLbyte, 0x7F>" "GL_BYTE": "LoadToNative3To4<GLbyte, 0x7F>"
} }
}, },
"GL_RG32F": { "GL_RG32F": {
"DXGI_FORMAT_R32G32_FLOAT": { "R32G32_FLOAT": {
"GL_FLOAT": "LoadToNative<GLfloat, 2>" "GL_FLOAT": "LoadToNative<GLfloat, 2>"
} }
}, },
"GL_DEPTH_COMPONENT32F": { "GL_DEPTH_COMPONENT32F": {
"DXGI_FORMAT_R32_TYPELESS": { "D32_FLOAT": {
"GL_FLOAT": "LoadD32FToD32F" "GL_FLOAT": "LoadD32FToD32F"
},
"DXGI_FORMAT_UNKNOWN": {
"GL_FLOAT": "UnimplementedLoadFunction"
} }
}, },
"GL_RG32I": { "GL_RG32I": {
"DXGI_FORMAT_R32G32_SINT": { "R32G32_SINT": {
"GL_INT": "LoadToNative<GLint, 2>" "GL_INT": "LoadToNative<GLint, 2>"
} }
}, },
"GL_ALPHA8_EXT": { "GL_ALPHA8_EXT": {
"DXGI_FORMAT_A8_UNORM": { "A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>"
}, },
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadA8ToRGBA8" "GL_UNSIGNED_BYTE": "LoadA8ToRGBA8"
} }
}, },
"GL_RG32UI": { "GL_RG32UI": {
"DXGI_FORMAT_R32G32_UINT": { "R32G32_UINT": {
"GL_UNSIGNED_INT": "LoadToNative<GLuint, 2>" "GL_UNSIGNED_INT": "LoadToNative<GLuint, 2>"
} }
}, },
"GL_RGBA16UI": { "GL_RGBA16UI": {
"DXGI_FORMAT_R16G16B16A16_UINT": { "R16G16B16A16_UINT": {
"GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 4>" "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 4>"
} }
}, },
"GL_COMPRESSED_RGBA8_ETC2_EAC": { "GL_COMPRESSED_RGBA8_ETC2_EAC": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadETC2RGBA8ToRGBA8" "GL_UNSIGNED_BYTE": "LoadETC2RGBA8ToRGBA8"
} }
}, },
"GL_RGB8I": { "GL_RGB8I": {
"DXGI_FORMAT_R8G8B8A8_SINT": { "R8G8B8A8_SINT": {
"GL_BYTE": "LoadToNative3To4<GLbyte, 0x01>" "GL_BYTE": "LoadToNative3To4<GLbyte, 0x01>"
} }
}, },
"GL_COMPRESSED_SRGB8_ETC2": { "GL_COMPRESSED_SRGB8_ETC2": {
"DXGI_FORMAT_R8G8B8A8_UNORM_SRGB": { "R8G8B8A8_UNORM_SRGB": {
"GL_UNSIGNED_BYTE": "LoadETC2SRGB8ToRGBA8" "GL_UNSIGNED_BYTE": "LoadETC2SRGB8ToRGBA8"
} }
}, },
"GL_DEPTH32F_STENCIL8": { "GL_DEPTH32F_STENCIL8": {
"DXGI_FORMAT_R32G8X24_TYPELESS": { "D32_FLOAT_S8X24_UINT": {
"GL_FLOAT_32_UNSIGNED_INT_24_8_REV": "LoadD32FS8X24ToD32FS8X24" "GL_FLOAT_32_UNSIGNED_INT_24_8_REV": "LoadD32FS8X24ToD32FS8X24"
},
"DXGI_FORMAT_UNKNOWN": {
"GL_FLOAT_32_UNSIGNED_INT_24_8_REV": "UnimplementedLoadFunction"
} }
}, },
"GL_RG8I": { "GL_RG8I": {
"DXGI_FORMAT_R8G8_SINT": { "R8G8_SINT": {
"GL_BYTE": "LoadToNative<GLbyte, 2>" "GL_BYTE": "LoadToNative<GLbyte, 2>"
} }
}, },
"GL_R32UI": { "GL_R32UI": {
"DXGI_FORMAT_R32_UINT": { "R32_UINT": {
"GL_UNSIGNED_INT": "LoadToNative<GLuint, 1>" "GL_UNSIGNED_INT": "LoadToNative<GLuint, 1>"
} }
}, },
"GL_BGR5_A1_ANGLEX": { "GL_BGR5_A1_ANGLEX": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>", "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>",
"GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT": "LoadRGB5A1ToRGBA8" "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT": "LoadRGB5A1ToRGBA8"
} }
}, },
"GL_BGR565_ANGLEX": { "GL_BGR565_ANGLEX": {
"DXGI_FORMAT_B5G6R5_UNORM": { "B5G6R5_UNORM": {
"GL_UNSIGNED_SHORT_5_6_5": "LoadRGB565ToBGR565", "GL_UNSIGNED_SHORT_5_6_5": "LoadRGB565ToBGR565",
"GL_UNSIGNED_BYTE": "LoadToNative<GLushort, 1>" "GL_UNSIGNED_BYTE": "LoadToNative<GLushort, 1>"
} }
}, },
"GL_COMPRESSED_RG11_EAC": { "GL_COMPRESSED_RG11_EAC": {
"DXGI_FORMAT_R8G8_UNORM": { "R8G8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadEACRG11ToRG8" "GL_UNSIGNED_BYTE": "LoadEACRG11ToRG8"
} }
}, },
"GL_SRGB8_ALPHA8": { "GL_SRGB8_ALPHA8": {
"DXGI_FORMAT_R8G8B8A8_UNORM_SRGB": { "R8G8B8A8_UNORM_SRGB": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
} }
}, },
"GL_LUMINANCE_ALPHA16F_EXT": { "GL_LUMINANCE_ALPHA16F_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_HALF_FLOAT": "LoadLA16FToRGBA16F", "GL_HALF_FLOAT": "LoadLA16FToRGBA16F",
"GL_HALF_FLOAT_OES": "LoadLA16FToRGBA16F" "GL_HALF_FLOAT_OES": "LoadLA16FToRGBA16F"
} }
}, },
"GL_RGBA": { "GL_RGBA": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "UnreachableLoadFunction", "GL_UNSIGNED_BYTE": "UnreachableLoadFunction",
"GL_UNSIGNED_SHORT_4_4_4_4": "UnreachableLoadFunction", "GL_UNSIGNED_SHORT_4_4_4_4": "UnreachableLoadFunction",
"GL_UNSIGNED_SHORT_5_5_5_1": "UnreachableLoadFunction" "GL_UNSIGNED_SHORT_5_5_5_1": "UnreachableLoadFunction"
} }
}, },
"GL_DEPTH24_STENCIL8": { "GL_DEPTH24_STENCIL8": {
"DXGI_FORMAT_R24G8_TYPELESS": { "D24_UNORM_S8_UINT": {
"GL_UNSIGNED_INT_24_8": "LoadR32ToR24G8"
},
"DXGI_FORMAT_D24_UNORM_S8_UINT": {
"GL_UNSIGNED_INT_24_8": "LoadR32ToR24G8" "GL_UNSIGNED_INT_24_8": "LoadR32ToR24G8"
} }
}, },
"GL_RGB16I": { "GL_RGB16I": {
"DXGI_FORMAT_R16G16B16A16_SINT": { "R16G16B16A16_SINT": {
"GL_SHORT": "LoadToNative3To4<GLshort, 0x0001>" "GL_SHORT": "LoadToNative3To4<GLshort, 0x0001>"
} }
}, },
"GL_R8UI": { "GL_R8UI": {
"DXGI_FORMAT_R8_UINT": { "R8_UINT": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 1>"
} }
}, },
"GL_ALPHA": { "GL_ALPHA": {
"DXGI_FORMAT_R16G16B16A16_FLOAT": { "R16G16B16A16_FLOAT": {
"GL_HALF_FLOAT": "LoadA16FToRGBA16F", "GL_HALF_FLOAT": "LoadA16FToRGBA16F",
"GL_HALF_FLOAT_OES": "LoadA16FToRGBA16F" "GL_HALF_FLOAT_OES": "LoadA16FToRGBA16F"
}, },
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "UnreachableLoadFunction" "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
}, },
"DXGI_FORMAT_R32G32B32A32_FLOAT": { "R32G32B32A32_FLOAT": {
"GL_FLOAT": "LoadA32FToRGBA32F" "GL_FLOAT": "LoadA32FToRGBA32F"
} }
}, },
"GL_RGB16F": { "GL_RGB16F": {
"DXGI_FORMAT_R16G16B16A16_FLOAT": { "R16G16B16A16_FLOAT": {
"GL_HALF_FLOAT": "LoadToNative3To4<GLhalf, gl::Float16One>", "GL_HALF_FLOAT": "LoadToNative3To4<GLhalf, gl::Float16One>",
"GL_FLOAT": "LoadRGB32FToRGBA16F", "GL_FLOAT": "LoadRGB32FToRGBA16F",
"GL_HALF_FLOAT_OES": "LoadToNative3To4<GLhalf, gl::Float16One>" "GL_HALF_FLOAT_OES": "LoadToNative3To4<GLhalf, gl::Float16One>"
} }
}, },
"GL_COMPRESSED_SIGNED_R11_EAC": { "GL_COMPRESSED_SIGNED_R11_EAC": {
"DXGI_FORMAT_R8_SNORM": { "R8_SNORM": {
"GL_UNSIGNED_BYTE": "LoadEACR11SToR8" "GL_UNSIGNED_BYTE": "LoadEACR11SToR8"
} }
}, },
"GL_COMPRESSED_RGB_S3TC_DXT1_EXT": { "GL_COMPRESSED_RGB_S3TC_DXT1_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>" "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
} }
}, },
"GL_COMPRESSED_RGBA_S3TC_DXT1_EXT": { "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>" "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 8>"
} }
}, },
"GL_STENCIL_INDEX8": { "GL_STENCIL_INDEX8": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "UnimplementedLoadFunction" "GL_UNSIGNED_BYTE": "UnimplementedLoadFunction"
} }
}, },
"GL_LUMINANCE_ALPHA32F_EXT": { "GL_LUMINANCE_ALPHA32F_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_FLOAT": "LoadLA32FToRGBA32F" "GL_FLOAT": "LoadLA32FToRGBA32F"
} }
}, },
"GL_RGB8UI": { "GL_RGB8UI": {
"DXGI_FORMAT_R8G8B8A8_UINT": { "R8G8B8A8_UINT": {
"GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0x01>" "GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0x01>"
} }
}, },
"GL_DEPTH_COMPONENT24": { "GL_DEPTH_COMPONENT24": {
"DXGI_FORMAT_R24G8_TYPELESS": { "D24_UNORM_S8_UINT": {
"GL_UNSIGNED_INT": "LoadR32ToR24G8"
},
"DXGI_FORMAT_D24_UNORM_S8_UINT": {
"GL_UNSIGNED_INT": "LoadR32ToR24G8" "GL_UNSIGNED_INT": "LoadR32ToR24G8"
} }
}, },
"GL_R32I": { "GL_R32I": {
"DXGI_FORMAT_R32_SINT": { "R32_SINT": {
"GL_INT": "LoadToNative<GLint, 1>" "GL_INT": "LoadToNative<GLint, 1>"
} }
}, },
"GL_DEPTH_COMPONENT32_OES": { "GL_DEPTH_COMPONENT32_OES": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_INT": "LoadR32ToR24G8" "GL_UNSIGNED_INT": "LoadR32ToR24G8"
} }
}, },
"GL_R32F": { "GL_R32F": {
"DXGI_FORMAT_R32_FLOAT": { "R32_FLOAT": {
"GL_FLOAT": "LoadToNative<GLfloat, 1>" "GL_FLOAT": "LoadToNative<GLfloat, 1>"
} }
}, },
"GL_RG16F": { "GL_RG16F": {
"DXGI_FORMAT_R16G16_FLOAT": { "R16G16_FLOAT": {
"GL_HALF_FLOAT": "LoadToNative<GLhalf, 2>", "GL_HALF_FLOAT": "LoadToNative<GLhalf, 2>",
"GL_FLOAT": "Load32FTo16F<2>", "GL_FLOAT": "Load32FTo16F<2>",
"GL_HALF_FLOAT_OES": "LoadToNative<GLhalf, 2>" "GL_HALF_FLOAT_OES": "LoadToNative<GLhalf, 2>"
} }
}, },
"GL_RGB565": { "GL_RGB565": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0xFF>", "GL_UNSIGNED_BYTE": "LoadToNative3To4<GLubyte, 0xFF>",
"GL_UNSIGNED_SHORT_5_6_5": "LoadR5G6B5ToRGBA8" "GL_UNSIGNED_SHORT_5_6_5": "LoadR5G6B5ToRGBA8"
}, },
"DXGI_FORMAT_B5G6R5_UNORM": { "B5G6R5_UNORM": {
"GL_UNSIGNED_BYTE": "LoadRGB8ToBGR565", "GL_UNSIGNED_BYTE": "LoadRGB8ToBGR565",
"GL_UNSIGNED_SHORT_5_6_5": "LoadToNative<GLushort, 1>" "GL_UNSIGNED_SHORT_5_6_5": "LoadToNative<GLushort, 1>"
} }
}, },
"GL_LUMINANCE16F_EXT": { "GL_LUMINANCE16F_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_HALF_FLOAT": "LoadL16FToRGBA16F", "GL_HALF_FLOAT": "LoadL16FToRGBA16F",
"GL_HALF_FLOAT_OES": "LoadL16FToRGBA16F" "GL_HALF_FLOAT_OES": "LoadL16FToRGBA16F"
} }
}, },
"GL_RG16UI": { "GL_RG16UI": {
"DXGI_FORMAT_R16G16_UINT": { "R16G16_UINT": {
"GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 2>" "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 2>"
} }
}, },
"GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE": { "GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>" "GL_UNSIGNED_BYTE": "LoadCompressedToNative<4, 4, 16>"
} }
}, },
"GL_RG16I": { "GL_RG16I": {
"DXGI_FORMAT_R16G16_SINT": { "R16G16_SINT": {
"GL_SHORT": "LoadToNative<GLshort, 2>" "GL_SHORT": "LoadToNative<GLshort, 2>"
} }
}, },
"GL_BGRA8_EXT": { "GL_BGRA8_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
} }
}, },
"GL_ALPHA16F_EXT": { "GL_ALPHA16F_EXT": {
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_HALF_FLOAT": "LoadA16FToRGBA16F", "GL_HALF_FLOAT": "LoadA16FToRGBA16F",
"GL_HALF_FLOAT_OES": "LoadA16FToRGBA16F" "GL_HALF_FLOAT_OES": "LoadA16FToRGBA16F"
} }
}, },
"GL_RGBA4": { "GL_RGBA4": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>", "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>",
"GL_UNSIGNED_SHORT_4_4_4_4": "LoadRGBA4ToRGBA8" "GL_UNSIGNED_SHORT_4_4_4_4": "LoadRGBA4ToRGBA8"
}, },
"DXGI_FORMAT_B4G4R4A4_UNORM": { "B4G4R4A4_UNORM": {
"GL_UNSIGNED_BYTE": "LoadRGBA8ToBGRA4", "GL_UNSIGNED_BYTE": "LoadRGBA8ToBGRA4",
"GL_UNSIGNED_SHORT_4_4_4_4": "LoadRGBA4ToARGB4" "GL_UNSIGNED_SHORT_4_4_4_4": "LoadRGBA4ToARGB4"
} }
}, },
"GL_RGBA8": { "GL_RGBA8": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>" "GL_UNSIGNED_BYTE": "LoadToNative<GLubyte, 4>"
} }
}, },
"GL_LUMINANCE": { "GL_LUMINANCE": {
"DXGI_FORMAT_R16G16B16A16_FLOAT": { "R16G16B16A16_FLOAT": {
"GL_HALF_FLOAT": "LoadL16FToRGBA16F", "GL_HALF_FLOAT": "LoadL16FToRGBA16F",
"GL_HALF_FLOAT_OES": "LoadL16FToRGBA16F" "GL_HALF_FLOAT_OES": "LoadL16FToRGBA16F"
}, },
"DXGI_FORMAT_UNKNOWN": { "NONE": {
"GL_UNSIGNED_BYTE": "UnreachableLoadFunction" "GL_UNSIGNED_BYTE": "UnreachableLoadFunction"
}, },
"DXGI_FORMAT_R32G32B32A32_FLOAT": { "R32G32B32A32_FLOAT": {
"GL_FLOAT": "LoadL32FToRGBA32F" "GL_FLOAT": "LoadL32FToRGBA32F"
} }
}, },
"GL_RGB10_A2UI": { "GL_RGB10_A2UI": {
"DXGI_FORMAT_R10G10B10A2_UINT": { "R10G10B10A2_UINT": {
"GL_UNSIGNED_INT_2_10_10_10_REV": "LoadToNative<GLuint, 1>" "GL_UNSIGNED_INT_2_10_10_10_REV": "LoadToNative<GLuint, 1>"
} }
}, },
"GL_ETC1_RGB8_OES": { "GL_ETC1_RGB8_OES": {
"DXGI_FORMAT_R8G8B8A8_UNORM": { "R8G8B8A8_UNORM": {
"GL_UNSIGNED_BYTE": "LoadETC1RGB8ToRGBA8" "GL_UNSIGNED_BYTE": "LoadETC1RGB8ToRGBA8"
} }
}, },
"GL_ETC1_RGB8_LOSSY_DECODE_ANGLE": { "GL_ETC1_RGB8_LOSSY_DECODE_ANGLE": {
"DXGI_FORMAT_BC1_UNORM": { "BC1_RGB_UNORM_BLOCK": {
"GL_UNSIGNED_BYTE": "LoadETC1RGB8ToBC1" "GL_UNSIGNED_BYTE": "LoadETC1RGB8ToBC1"
} }
}, },
"GL_R16_EXT": { "GL_R16_EXT": {
"DXGI_FORMAT_R16_UNORM": { "R16_UNORM": {
"GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 1>" "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 1>"
} }
}, },
"GL_RG16_EXT": { "GL_RG16_EXT": {
"DXGI_FORMAT_R16G16_UNORM": { "R16G16_UNORM": {
"GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 2>" "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 2>"
} }
}, },
"GL_RGB16_EXT": { "GL_RGB16_EXT": {
"DXGI_FORMAT_R16G16B16A16_UNORM": { "R16G16B16A16_UNORM": {
"GL_UNSIGNED_SHORT": "LoadToNative3To4<GLushort, 0xFFFF>" "GL_UNSIGNED_SHORT": "LoadToNative3To4<GLushort, 0xFFFF>"
} }
}, },
"GL_RGBA16_EXT": { "GL_RGBA16_EXT": {
"DXGI_FORMAT_R16G16B16A16_UNORM": { "R16G16B16A16_UNORM": {
"GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 4>" "GL_UNSIGNED_SHORT": "LoadToNative<GLushort, 4>"
} }
}, },
"GL_R16_SNORM_EXT": { "GL_R16_SNORM_EXT": {
"DXGI_FORMAT_R16_SNORM": { "R16_SNORM": {
"GL_SHORT": "LoadToNative<GLushort, 1>" "GL_SHORT": "LoadToNative<GLushort, 1>"
} }
}, },
"GL_RG16_SNORM_EXT": { "GL_RG16_SNORM_EXT": {
"DXGI_FORMAT_R16G16_SNORM": { "R16G16_SNORM": {
"GL_SHORT": "LoadToNative<GLushort, 2>" "GL_SHORT": "LoadToNative<GLushort, 2>"
} }
}, },
"GL_RGB16_SNORM_EXT": { "GL_RGB16_SNORM_EXT": {
"DXGI_FORMAT_R16G16B16A16_SNORM": { "R16G16B16A16_SNORM": {
"GL_SHORT": "LoadToNative3To4<GLushort, 0x7FFF>" "GL_SHORT": "LoadToNative3To4<GLushort, 0x7FFF>"
} }
}, },
"GL_RGBA16_SNORM_EXT": { "GL_RGBA16_SNORM_EXT": {
"DXGI_FORMAT_R16G16B16A16_SNORM": { "R16G16B16A16_SNORM": {
"GL_SHORT": "LoadToNative<GLushort, 4>" "GL_SHORT": "LoadToNative<GLushort, 4>"
} }
} }
......
src/libANGLE/renderer/d3d/d3d11/load_functions_table.h
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
#ifndef LIBANGLE_RENDERER_D3D_D3D11_LOADFUNCTIONSTABLE_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D11_LOADFUNCTIONSTABLE_H_
#define LIBANGLE_RENDERER_D3D_D3D11_LOADFUNCTIONSTABLE_H_ #define LIBANGLE_RENDERER_D3D_D3D11_LOADFUNCTIONSTABLE_H_
#include <map> #include "libANGLE/renderer/Format.h"
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
#include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
namespace rx namespace rx
{ {
...@@ -21,7 +18,7 @@ namespace rx ...@@ -21,7 +18,7 @@ namespace rx
namespace d3d11 namespace d3d11
{ {
LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiFormat); LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, angle::Format::ID angleFormat);
} // namespace d3d11 } // namespace d3d11
......
src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp
...@@ -15,9 +15,6 @@ ...@@ -15,9 +15,6 @@
#include "image_util/generatemip.h" #include "image_util/generatemip.h"
#include "image_util/loadimage.h" #include "image_util/loadimage.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include "libANGLE/renderer/d3d/d3d11/texture_format_table.h"
using namespace angle; using namespace angle;
namespace rx namespace rx
...@@ -400,19 +397,7 @@ LoadImageFunctionInfo DEPTH24_STENCIL8_to_D24_UNORM_S8_UINT(GLenum type) ...@@ -400,19 +397,7 @@ LoadImageFunctionInfo DEPTH24_STENCIL8_to_D24_UNORM_S8_UINT(GLenum type)
} }
} }
LoadImageFunctionInfo DEPTH24_STENCIL8_to_R24G8_TYPELESS(GLenum type) LoadImageFunctionInfo DEPTH32F_STENCIL8_to_D32_FLOAT_S8X24_UINT(GLenum type)
{
switch (type)
{
case GL_UNSIGNED_INT_24_8:
return LoadImageFunctionInfo(LoadR32ToR24G8, true);
default:
UNREACHABLE();
return LoadImageFunctionInfo(UnreachableLoadFunction, true);
}
}
LoadImageFunctionInfo DEPTH32F_STENCIL8_to_R32G8X24_TYPELESS(GLenum type)
{ {
switch (type) switch (type)
{ {
...@@ -424,34 +409,10 @@ LoadImageFunctionInfo DEPTH32F_STENCIL8_to_R32G8X24_TYPELESS(GLenum type) ...@@ -424,34 +409,10 @@ LoadImageFunctionInfo DEPTH32F_STENCIL8_to_R32G8X24_TYPELESS(GLenum type)
} }
} }
LoadImageFunctionInfo DEPTH32F_STENCIL8_to_default(GLenum type)
{
switch (type)
{
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
return LoadImageFunctionInfo(UnimplementedLoadFunction, true);
default:
UNREACHABLE();
return LoadImageFunctionInfo(UnreachableLoadFunction, true);
}
}
LoadImageFunctionInfo DEPTH_COMPONENT16_to_D16_UNORM(GLenum type) LoadImageFunctionInfo DEPTH_COMPONENT16_to_D16_UNORM(GLenum type)
{ {
switch (type) switch (type)
{ {
case GL_UNSIGNED_SHORT:
return LoadImageFunctionInfo(LoadToNative<GLushort, 1>, false);
default:
UNREACHABLE();
return LoadImageFunctionInfo(UnreachableLoadFunction, true);
}
}
LoadImageFunctionInfo DEPTH_COMPONENT16_to_R16_TYPELESS(GLenum type)
{
switch (type)
{
case GL_UNSIGNED_INT: case GL_UNSIGNED_INT:
return LoadImageFunctionInfo(LoadR32ToR16, true); return LoadImageFunctionInfo(LoadR32ToR16, true);
case GL_UNSIGNED_SHORT: case GL_UNSIGNED_SHORT:
...@@ -474,19 +435,7 @@ LoadImageFunctionInfo DEPTH_COMPONENT24_to_D24_UNORM_S8_UINT(GLenum type) ...@@ -474,19 +435,7 @@ LoadImageFunctionInfo DEPTH_COMPONENT24_to_D24_UNORM_S8_UINT(GLenum type)
} }
} }
LoadImageFunctionInfo DEPTH_COMPONENT24_to_R24G8_TYPELESS(GLenum type) LoadImageFunctionInfo DEPTH_COMPONENT32F_to_D32_FLOAT(GLenum type)
{
switch (type)
{
case GL_UNSIGNED_INT:
return LoadImageFunctionInfo(LoadR32ToR24G8, true);
default:
UNREACHABLE();
return LoadImageFunctionInfo(UnreachableLoadFunction, true);
}
}
LoadImageFunctionInfo DEPTH_COMPONENT32F_to_R32_TYPELESS(GLenum type)
{ {
switch (type) switch (type)
{ {
...@@ -498,18 +447,6 @@ LoadImageFunctionInfo DEPTH_COMPONENT32F_to_R32_TYPELESS(GLenum type) ...@@ -498,18 +447,6 @@ LoadImageFunctionInfo DEPTH_COMPONENT32F_to_R32_TYPELESS(GLenum type)
} }
} }
LoadImageFunctionInfo DEPTH_COMPONENT32F_to_default(GLenum type)
{
switch (type)
{
case GL_FLOAT:
return LoadImageFunctionInfo(UnimplementedLoadFunction, true);
default:
UNREACHABLE();
return LoadImageFunctionInfo(UnreachableLoadFunction, true);
}
}
LoadImageFunctionInfo DEPTH_COMPONENT32_OES_to_default(GLenum type) LoadImageFunctionInfo DEPTH_COMPONENT32_OES_to_default(GLenum type)
{ {
switch (type) switch (type)
...@@ -522,7 +459,7 @@ LoadImageFunctionInfo DEPTH_COMPONENT32_OES_to_default(GLenum type) ...@@ -522,7 +459,7 @@ LoadImageFunctionInfo DEPTH_COMPONENT32_OES_to_default(GLenum type)
} }
} }
LoadImageFunctionInfo ETC1_RGB8_LOSSY_DECODE_ANGLE_to_BC1_UNORM(GLenum type) LoadImageFunctionInfo ETC1_RGB8_LOSSY_DECODE_ANGLE_to_BC1_RGB_UNORM_BLOCK(GLenum type)
{ {
switch (type) switch (type)
{ {
...@@ -1514,18 +1451,18 @@ LoadImageFunctionInfo STENCIL_INDEX8_to_default(GLenum type) ...@@ -1514,18 +1451,18 @@ LoadImageFunctionInfo STENCIL_INDEX8_to_default(GLenum type)
} // namespace } // namespace
LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiFormat) LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, Format::ID angleFormat)
{ {
// clang-format off // clang-format off
switch (internalFormat) switch (internalFormat)
{ {
case GL_ALPHA: case GL_ALPHA:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_FLOAT: case Format::ID::R16G16B16A16_FLOAT:
return ALPHA_to_R16G16B16A16_FLOAT; return ALPHA_to_R16G16B16A16_FLOAT;
case DXGI_FORMAT_R32G32B32A32_FLOAT: case Format::ID::R32G32B32A32_FLOAT:
return ALPHA_to_R32G32B32A32_FLOAT; return ALPHA_to_R32G32B32A32_FLOAT;
default: default:
return ALPHA_to_default; return ALPHA_to_default;
...@@ -1537,11 +1474,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1537,11 +1474,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
return ALPHA32F_EXT_to_default; return ALPHA32F_EXT_to_default;
case GL_ALPHA8_EXT: case GL_ALPHA8_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_A8_UNORM: case Format::ID::A8_UNORM:
return ALPHA8_EXT_to_A8_UNORM; return ALPHA8_EXT_to_A8_UNORM;
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return ALPHA8_EXT_to_R8G8B8A8_UNORM; return ALPHA8_EXT_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -1549,9 +1486,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1549,9 +1486,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_BGR565_ANGLEX: case GL_BGR565_ANGLEX:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_B5G6R5_UNORM: case Format::ID::B5G6R5_UNORM:
return BGR565_ANGLEX_to_B5G6R5_UNORM; return BGR565_ANGLEX_to_B5G6R5_UNORM;
default: default:
break; break;
...@@ -1567,9 +1504,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1567,9 +1504,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
return BGRA_EXT_to_default; return BGRA_EXT_to_default;
case GL_COMPRESSED_R11_EAC: case GL_COMPRESSED_R11_EAC:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8_UNORM: case Format::ID::R8_UNORM:
return COMPRESSED_R11_EAC_to_R8_UNORM; return COMPRESSED_R11_EAC_to_R8_UNORM;
default: default:
break; break;
...@@ -1577,9 +1514,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1577,9 +1514,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_COMPRESSED_RG11_EAC: case GL_COMPRESSED_RG11_EAC:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8_UNORM: case Format::ID::R8G8_UNORM:
return COMPRESSED_RG11_EAC_to_R8G8_UNORM; return COMPRESSED_RG11_EAC_to_R8G8_UNORM;
default: default:
break; break;
...@@ -1587,9 +1524,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1587,9 +1524,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_COMPRESSED_RGB8_ETC2: case GL_COMPRESSED_RGB8_ETC2:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return COMPRESSED_RGB8_ETC2_to_R8G8B8A8_UNORM; return COMPRESSED_RGB8_ETC2_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -1597,9 +1534,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1597,9 +1534,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2: case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM; return COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -1607,9 +1544,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1607,9 +1544,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_COMPRESSED_RGBA8_ETC2_EAC: case GL_COMPRESSED_RGBA8_ETC2_EAC:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return COMPRESSED_RGBA8_ETC2_EAC_to_R8G8B8A8_UNORM; return COMPRESSED_RGBA8_ETC2_EAC_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -1625,9 +1562,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1625,9 +1562,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
return COMPRESSED_RGB_S3TC_DXT1_EXT_to_default; return COMPRESSED_RGB_S3TC_DXT1_EXT_to_default;
case GL_COMPRESSED_SIGNED_R11_EAC: case GL_COMPRESSED_SIGNED_R11_EAC:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8_SNORM: case Format::ID::R8_SNORM:
return COMPRESSED_SIGNED_R11_EAC_to_R8_SNORM; return COMPRESSED_SIGNED_R11_EAC_to_R8_SNORM;
default: default:
break; break;
...@@ -1635,9 +1572,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1635,9 +1572,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_COMPRESSED_SIGNED_RG11_EAC: case GL_COMPRESSED_SIGNED_RG11_EAC:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8_SNORM: case Format::ID::R8G8_SNORM:
return COMPRESSED_SIGNED_RG11_EAC_to_R8G8_SNORM; return COMPRESSED_SIGNED_RG11_EAC_to_R8G8_SNORM;
default: default:
break; break;
...@@ -1645,9 +1582,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1645,9 +1582,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case Format::ID::R8G8B8A8_UNORM_SRGB:
return COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_to_R8G8B8A8_UNORM_SRGB; return COMPRESSED_SRGB8_ALPHA8_ETC2_EAC_to_R8G8B8A8_UNORM_SRGB;
default: default:
break; break;
...@@ -1655,9 +1592,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1655,9 +1592,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_COMPRESSED_SRGB8_ETC2: case GL_COMPRESSED_SRGB8_ETC2:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case Format::ID::R8G8B8A8_UNORM_SRGB:
return COMPRESSED_SRGB8_ETC2_to_R8G8B8A8_UNORM_SRGB; return COMPRESSED_SRGB8_ETC2_to_R8G8B8A8_UNORM_SRGB;
default: default:
break; break;
...@@ -1665,9 +1602,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1665,9 +1602,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case Format::ID::R8G8B8A8_UNORM_SRGB:
return COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM_SRGB; return COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2_to_R8G8B8A8_UNORM_SRGB;
default: default:
break; break;
...@@ -1675,77 +1612,71 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1675,77 +1612,71 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_DEPTH24_STENCIL8: case GL_DEPTH24_STENCIL8:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_D24_UNORM_S8_UINT: case Format::ID::D24_UNORM_S8_UINT:
return DEPTH24_STENCIL8_to_D24_UNORM_S8_UINT; return DEPTH24_STENCIL8_to_D24_UNORM_S8_UINT;
case DXGI_FORMAT_R24G8_TYPELESS:
return DEPTH24_STENCIL8_to_R24G8_TYPELESS;
default: default:
break; break;
} }
} }
case GL_DEPTH32F_STENCIL8: case GL_DEPTH32F_STENCIL8:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G8X24_TYPELESS: case Format::ID::D32_FLOAT_S8X24_UINT:
return DEPTH32F_STENCIL8_to_R32G8X24_TYPELESS; return DEPTH32F_STENCIL8_to_D32_FLOAT_S8X24_UINT;
default: default:
return DEPTH32F_STENCIL8_to_default; break;
} }
} }
case GL_DEPTH_COMPONENT16: case GL_DEPTH_COMPONENT16:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_D16_UNORM: case Format::ID::D16_UNORM:
return DEPTH_COMPONENT16_to_D16_UNORM; return DEPTH_COMPONENT16_to_D16_UNORM;
case DXGI_FORMAT_R16_TYPELESS:
return DEPTH_COMPONENT16_to_R16_TYPELESS;
default: default:
break; break;
} }
} }
case GL_DEPTH_COMPONENT24: case GL_DEPTH_COMPONENT24:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_D24_UNORM_S8_UINT: case Format::ID::D24_UNORM_S8_UINT:
return DEPTH_COMPONENT24_to_D24_UNORM_S8_UINT; return DEPTH_COMPONENT24_to_D24_UNORM_S8_UINT;
case DXGI_FORMAT_R24G8_TYPELESS:
return DEPTH_COMPONENT24_to_R24G8_TYPELESS;
default: default:
break; break;
} }
} }
case GL_DEPTH_COMPONENT32F: case GL_DEPTH_COMPONENT32F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32_TYPELESS: case Format::ID::D32_FLOAT:
return DEPTH_COMPONENT32F_to_R32_TYPELESS; return DEPTH_COMPONENT32F_to_D32_FLOAT;
default: default:
return DEPTH_COMPONENT32F_to_default; break;
} }
} }
case GL_DEPTH_COMPONENT32_OES: case GL_DEPTH_COMPONENT32_OES:
return DEPTH_COMPONENT32_OES_to_default; return DEPTH_COMPONENT32_OES_to_default;
case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE: case GL_ETC1_RGB8_LOSSY_DECODE_ANGLE:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_BC1_UNORM: case Format::ID::BC1_RGB_UNORM_BLOCK:
return ETC1_RGB8_LOSSY_DECODE_ANGLE_to_BC1_UNORM; return ETC1_RGB8_LOSSY_DECODE_ANGLE_to_BC1_RGB_UNORM_BLOCK;
default: default:
break; break;
} }
} }
case GL_ETC1_RGB8_OES: case GL_ETC1_RGB8_OES:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return ETC1_RGB8_OES_to_R8G8B8A8_UNORM; return ETC1_RGB8_OES_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -1753,11 +1684,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1753,11 +1684,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_LUMINANCE: case GL_LUMINANCE:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_FLOAT: case Format::ID::R16G16B16A16_FLOAT:
return LUMINANCE_to_R16G16B16A16_FLOAT; return LUMINANCE_to_R16G16B16A16_FLOAT;
case DXGI_FORMAT_R32G32B32A32_FLOAT: case Format::ID::R32G32B32A32_FLOAT:
return LUMINANCE_to_R32G32B32A32_FLOAT; return LUMINANCE_to_R32G32B32A32_FLOAT;
default: default:
return LUMINANCE_to_default; return LUMINANCE_to_default;
...@@ -1773,11 +1704,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1773,11 +1704,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
return LUMINANCE8_EXT_to_default; return LUMINANCE8_EXT_to_default;
case GL_LUMINANCE_ALPHA: case GL_LUMINANCE_ALPHA:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_FLOAT: case Format::ID::R16G16B16A16_FLOAT:
return LUMINANCE_ALPHA_to_R16G16B16A16_FLOAT; return LUMINANCE_ALPHA_to_R16G16B16A16_FLOAT;
case DXGI_FORMAT_R32G32B32A32_FLOAT: case Format::ID::R32G32B32A32_FLOAT:
return LUMINANCE_ALPHA_to_R32G32B32A32_FLOAT; return LUMINANCE_ALPHA_to_R32G32B32A32_FLOAT;
default: default:
return LUMINANCE_ALPHA_to_default; return LUMINANCE_ALPHA_to_default;
...@@ -1789,9 +1720,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1789,9 +1720,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
return LUMINANCE_ALPHA32F_EXT_to_default; return LUMINANCE_ALPHA32F_EXT_to_default;
case GL_R11F_G11F_B10F: case GL_R11F_G11F_B10F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R11G11B10_FLOAT: case Format::ID::R11G11B10_FLOAT:
return R11F_G11F_B10F_to_R11G11B10_FLOAT; return R11F_G11F_B10F_to_R11G11B10_FLOAT;
default: default:
break; break;
...@@ -1799,9 +1730,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1799,9 +1730,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R16F: case GL_R16F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16_FLOAT: case Format::ID::R16_FLOAT:
return R16F_to_R16_FLOAT; return R16F_to_R16_FLOAT;
default: default:
break; break;
...@@ -1809,9 +1740,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1809,9 +1740,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R16I: case GL_R16I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16_SINT: case Format::ID::R16_SINT:
return R16I_to_R16_SINT; return R16I_to_R16_SINT;
default: default:
break; break;
...@@ -1819,9 +1750,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1819,9 +1750,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R16UI: case GL_R16UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16_UINT: case Format::ID::R16_UINT:
return R16UI_to_R16_UINT; return R16UI_to_R16_UINT;
default: default:
break; break;
...@@ -1829,9 +1760,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1829,9 +1760,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R16_EXT: case GL_R16_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16_UNORM: case Format::ID::R16_UNORM:
return R16_EXT_to_R16_UNORM; return R16_EXT_to_R16_UNORM;
default: default:
break; break;
...@@ -1839,9 +1770,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1839,9 +1770,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R16_SNORM_EXT: case GL_R16_SNORM_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16_SNORM: case Format::ID::R16_SNORM:
return R16_SNORM_EXT_to_R16_SNORM; return R16_SNORM_EXT_to_R16_SNORM;
default: default:
break; break;
...@@ -1849,9 +1780,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1849,9 +1780,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R32F: case GL_R32F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32_FLOAT: case Format::ID::R32_FLOAT:
return R32F_to_R32_FLOAT; return R32F_to_R32_FLOAT;
default: default:
break; break;
...@@ -1859,9 +1790,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1859,9 +1790,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R32I: case GL_R32I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32_SINT: case Format::ID::R32_SINT:
return R32I_to_R32_SINT; return R32I_to_R32_SINT;
default: default:
break; break;
...@@ -1869,9 +1800,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1869,9 +1800,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R32UI: case GL_R32UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32_UINT: case Format::ID::R32_UINT:
return R32UI_to_R32_UINT; return R32UI_to_R32_UINT;
default: default:
break; break;
...@@ -1879,9 +1810,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1879,9 +1810,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R8: case GL_R8:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8_UNORM: case Format::ID::R8_UNORM:
return R8_to_R8_UNORM; return R8_to_R8_UNORM;
default: default:
break; break;
...@@ -1889,9 +1820,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1889,9 +1820,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R8I: case GL_R8I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8_SINT: case Format::ID::R8_SINT:
return R8I_to_R8_SINT; return R8I_to_R8_SINT;
default: default:
break; break;
...@@ -1899,9 +1830,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1899,9 +1830,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R8UI: case GL_R8UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8_UINT: case Format::ID::R8_UINT:
return R8UI_to_R8_UINT; return R8UI_to_R8_UINT;
default: default:
break; break;
...@@ -1909,9 +1840,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1909,9 +1840,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_R8_SNORM: case GL_R8_SNORM:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8_SNORM: case Format::ID::R8_SNORM:
return R8_SNORM_to_R8_SNORM; return R8_SNORM_to_R8_SNORM;
default: default:
break; break;
...@@ -1919,9 +1850,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1919,9 +1850,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG16F: case GL_RG16F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16_FLOAT: case Format::ID::R16G16_FLOAT:
return RG16F_to_R16G16_FLOAT; return RG16F_to_R16G16_FLOAT;
default: default:
break; break;
...@@ -1929,9 +1860,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1929,9 +1860,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG16I: case GL_RG16I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16_SINT: case Format::ID::R16G16_SINT:
return RG16I_to_R16G16_SINT; return RG16I_to_R16G16_SINT;
default: default:
break; break;
...@@ -1939,9 +1870,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1939,9 +1870,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG16UI: case GL_RG16UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16_UINT: case Format::ID::R16G16_UINT:
return RG16UI_to_R16G16_UINT; return RG16UI_to_R16G16_UINT;
default: default:
break; break;
...@@ -1949,9 +1880,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1949,9 +1880,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG16_EXT: case GL_RG16_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16_UNORM: case Format::ID::R16G16_UNORM:
return RG16_EXT_to_R16G16_UNORM; return RG16_EXT_to_R16G16_UNORM;
default: default:
break; break;
...@@ -1959,9 +1890,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1959,9 +1890,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG16_SNORM_EXT: case GL_RG16_SNORM_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16_SNORM: case Format::ID::R16G16_SNORM:
return RG16_SNORM_EXT_to_R16G16_SNORM; return RG16_SNORM_EXT_to_R16G16_SNORM;
default: default:
break; break;
...@@ -1969,9 +1900,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1969,9 +1900,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG32F: case GL_RG32F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32_FLOAT: case Format::ID::R32G32_FLOAT:
return RG32F_to_R32G32_FLOAT; return RG32F_to_R32G32_FLOAT;
default: default:
break; break;
...@@ -1979,9 +1910,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1979,9 +1910,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG32I: case GL_RG32I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32_SINT: case Format::ID::R32G32_SINT:
return RG32I_to_R32G32_SINT; return RG32I_to_R32G32_SINT;
default: default:
break; break;
...@@ -1989,9 +1920,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1989,9 +1920,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG32UI: case GL_RG32UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32_UINT: case Format::ID::R32G32_UINT:
return RG32UI_to_R32G32_UINT; return RG32UI_to_R32G32_UINT;
default: default:
break; break;
...@@ -1999,9 +1930,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -1999,9 +1930,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG8: case GL_RG8:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8_UNORM: case Format::ID::R8G8_UNORM:
return RG8_to_R8G8_UNORM; return RG8_to_R8G8_UNORM;
default: default:
break; break;
...@@ -2009,9 +1940,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2009,9 +1940,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG8I: case GL_RG8I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8_SINT: case Format::ID::R8G8_SINT:
return RG8I_to_R8G8_SINT; return RG8I_to_R8G8_SINT;
default: default:
break; break;
...@@ -2019,9 +1950,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2019,9 +1950,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG8UI: case GL_RG8UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8_UINT: case Format::ID::R8G8_UINT:
return RG8UI_to_R8G8_UINT; return RG8UI_to_R8G8_UINT;
default: default:
break; break;
...@@ -2029,9 +1960,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2029,9 +1960,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RG8_SNORM: case GL_RG8_SNORM:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8_SNORM: case Format::ID::R8G8_SNORM:
return RG8_SNORM_to_R8G8_SNORM; return RG8_SNORM_to_R8G8_SNORM;
default: default:
break; break;
...@@ -2041,9 +1972,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2041,9 +1972,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
return RGB_to_default; return RGB_to_default;
case GL_RGB10_A2: case GL_RGB10_A2:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R10G10B10A2_UNORM: case Format::ID::R10G10B10A2_UNORM:
return RGB10_A2_to_R10G10B10A2_UNORM; return RGB10_A2_to_R10G10B10A2_UNORM;
default: default:
break; break;
...@@ -2051,9 +1982,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2051,9 +1982,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB10_A2UI: case GL_RGB10_A2UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R10G10B10A2_UINT: case Format::ID::R10G10B10A2_UINT:
return RGB10_A2UI_to_R10G10B10A2_UINT; return RGB10_A2UI_to_R10G10B10A2_UINT;
default: default:
break; break;
...@@ -2061,9 +1992,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2061,9 +1992,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB16F: case GL_RGB16F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_FLOAT: case Format::ID::R16G16B16A16_FLOAT:
return RGB16F_to_R16G16B16A16_FLOAT; return RGB16F_to_R16G16B16A16_FLOAT;
default: default:
break; break;
...@@ -2071,9 +2002,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2071,9 +2002,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB16I: case GL_RGB16I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_SINT: case Format::ID::R16G16B16A16_SINT:
return RGB16I_to_R16G16B16A16_SINT; return RGB16I_to_R16G16B16A16_SINT;
default: default:
break; break;
...@@ -2081,9 +2012,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2081,9 +2012,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB16UI: case GL_RGB16UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_UINT: case Format::ID::R16G16B16A16_UINT:
return RGB16UI_to_R16G16B16A16_UINT; return RGB16UI_to_R16G16B16A16_UINT;
default: default:
break; break;
...@@ -2091,9 +2022,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2091,9 +2022,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB16_EXT: case GL_RGB16_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_UNORM: case Format::ID::R16G16B16A16_UNORM:
return RGB16_EXT_to_R16G16B16A16_UNORM; return RGB16_EXT_to_R16G16B16A16_UNORM;
default: default:
break; break;
...@@ -2101,9 +2032,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2101,9 +2032,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB16_SNORM_EXT: case GL_RGB16_SNORM_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_SNORM: case Format::ID::R16G16B16A16_SNORM:
return RGB16_SNORM_EXT_to_R16G16B16A16_SNORM; return RGB16_SNORM_EXT_to_R16G16B16A16_SNORM;
default: default:
break; break;
...@@ -2111,9 +2042,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2111,9 +2042,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB32F: case GL_RGB32F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32B32A32_FLOAT: case Format::ID::R32G32B32A32_FLOAT:
return RGB32F_to_R32G32B32A32_FLOAT; return RGB32F_to_R32G32B32A32_FLOAT;
default: default:
break; break;
...@@ -2121,9 +2052,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2121,9 +2052,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB32I: case GL_RGB32I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32B32A32_SINT: case Format::ID::R32G32B32A32_SINT:
return RGB32I_to_R32G32B32A32_SINT; return RGB32I_to_R32G32B32A32_SINT;
default: default:
break; break;
...@@ -2131,9 +2062,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2131,9 +2062,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB32UI: case GL_RGB32UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32B32A32_UINT: case Format::ID::R32G32B32A32_UINT:
return RGB32UI_to_R32G32B32A32_UINT; return RGB32UI_to_R32G32B32A32_UINT;
default: default:
break; break;
...@@ -2141,11 +2072,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2141,11 +2072,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB565: case GL_RGB565:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_B5G6R5_UNORM: case Format::ID::B5G6R5_UNORM:
return RGB565_to_B5G6R5_UNORM; return RGB565_to_B5G6R5_UNORM;
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return RGB565_to_R8G8B8A8_UNORM; return RGB565_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -2153,11 +2084,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2153,11 +2084,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB5_A1: case GL_RGB5_A1:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_B5G5R5A1_UNORM: case Format::ID::B5G5R5A1_UNORM:
return RGB5_A1_to_B5G5R5A1_UNORM; return RGB5_A1_to_B5G5R5A1_UNORM;
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return RGB5_A1_to_R8G8B8A8_UNORM; return RGB5_A1_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -2165,9 +2096,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2165,9 +2096,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB8: case GL_RGB8:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return RGB8_to_R8G8B8A8_UNORM; return RGB8_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -2175,9 +2106,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2175,9 +2106,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB8I: case GL_RGB8I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_SINT: case Format::ID::R8G8B8A8_SINT:
return RGB8I_to_R8G8B8A8_SINT; return RGB8I_to_R8G8B8A8_SINT;
default: default:
break; break;
...@@ -2185,9 +2116,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2185,9 +2116,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB8UI: case GL_RGB8UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UINT: case Format::ID::R8G8B8A8_UINT:
return RGB8UI_to_R8G8B8A8_UINT; return RGB8UI_to_R8G8B8A8_UINT;
default: default:
break; break;
...@@ -2195,9 +2126,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2195,9 +2126,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB8_SNORM: case GL_RGB8_SNORM:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_SNORM: case Format::ID::R8G8B8A8_SNORM:
return RGB8_SNORM_to_R8G8B8A8_SNORM; return RGB8_SNORM_to_R8G8B8A8_SNORM;
default: default:
break; break;
...@@ -2205,9 +2136,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2205,9 +2136,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGB9_E5: case GL_RGB9_E5:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R9G9B9E5_SHAREDEXP: case Format::ID::R9G9B9E5_SHAREDEXP:
return RGB9_E5_to_R9G9B9E5_SHAREDEXP; return RGB9_E5_to_R9G9B9E5_SHAREDEXP;
default: default:
break; break;
...@@ -2217,9 +2148,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2217,9 +2148,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
return RGBA_to_default; return RGBA_to_default;
case GL_RGBA16F: case GL_RGBA16F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_FLOAT: case Format::ID::R16G16B16A16_FLOAT:
return RGBA16F_to_R16G16B16A16_FLOAT; return RGBA16F_to_R16G16B16A16_FLOAT;
default: default:
break; break;
...@@ -2227,9 +2158,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2227,9 +2158,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA16I: case GL_RGBA16I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_SINT: case Format::ID::R16G16B16A16_SINT:
return RGBA16I_to_R16G16B16A16_SINT; return RGBA16I_to_R16G16B16A16_SINT;
default: default:
break; break;
...@@ -2237,9 +2168,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2237,9 +2168,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA16UI: case GL_RGBA16UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_UINT: case Format::ID::R16G16B16A16_UINT:
return RGBA16UI_to_R16G16B16A16_UINT; return RGBA16UI_to_R16G16B16A16_UINT;
default: default:
break; break;
...@@ -2247,9 +2178,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2247,9 +2178,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA16_EXT: case GL_RGBA16_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_UNORM: case Format::ID::R16G16B16A16_UNORM:
return RGBA16_EXT_to_R16G16B16A16_UNORM; return RGBA16_EXT_to_R16G16B16A16_UNORM;
default: default:
break; break;
...@@ -2257,9 +2188,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2257,9 +2188,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA16_SNORM_EXT: case GL_RGBA16_SNORM_EXT:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R16G16B16A16_SNORM: case Format::ID::R16G16B16A16_SNORM:
return RGBA16_SNORM_EXT_to_R16G16B16A16_SNORM; return RGBA16_SNORM_EXT_to_R16G16B16A16_SNORM;
default: default:
break; break;
...@@ -2267,9 +2198,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2267,9 +2198,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA32F: case GL_RGBA32F:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32B32A32_FLOAT: case Format::ID::R32G32B32A32_FLOAT:
return RGBA32F_to_R32G32B32A32_FLOAT; return RGBA32F_to_R32G32B32A32_FLOAT;
default: default:
break; break;
...@@ -2277,9 +2208,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2277,9 +2208,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA32I: case GL_RGBA32I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32B32A32_SINT: case Format::ID::R32G32B32A32_SINT:
return RGBA32I_to_R32G32B32A32_SINT; return RGBA32I_to_R32G32B32A32_SINT;
default: default:
break; break;
...@@ -2287,9 +2218,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2287,9 +2218,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA32UI: case GL_RGBA32UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R32G32B32A32_UINT: case Format::ID::R32G32B32A32_UINT:
return RGBA32UI_to_R32G32B32A32_UINT; return RGBA32UI_to_R32G32B32A32_UINT;
default: default:
break; break;
...@@ -2297,11 +2228,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2297,11 +2228,11 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA4: case GL_RGBA4:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_B4G4R4A4_UNORM: case Format::ID::B4G4R4A4_UNORM:
return RGBA4_to_B4G4R4A4_UNORM; return RGBA4_to_B4G4R4A4_UNORM;
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return RGBA4_to_R8G8B8A8_UNORM; return RGBA4_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -2309,9 +2240,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2309,9 +2240,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA8: case GL_RGBA8:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM: case Format::ID::R8G8B8A8_UNORM:
return RGBA8_to_R8G8B8A8_UNORM; return RGBA8_to_R8G8B8A8_UNORM;
default: default:
break; break;
...@@ -2319,9 +2250,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2319,9 +2250,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA8I: case GL_RGBA8I:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_SINT: case Format::ID::R8G8B8A8_SINT:
return RGBA8I_to_R8G8B8A8_SINT; return RGBA8I_to_R8G8B8A8_SINT;
default: default:
break; break;
...@@ -2329,9 +2260,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2329,9 +2260,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA8UI: case GL_RGBA8UI:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UINT: case Format::ID::R8G8B8A8_UINT:
return RGBA8UI_to_R8G8B8A8_UINT; return RGBA8UI_to_R8G8B8A8_UINT;
default: default:
break; break;
...@@ -2339,9 +2270,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2339,9 +2270,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_RGBA8_SNORM: case GL_RGBA8_SNORM:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_SNORM: case Format::ID::R8G8B8A8_SNORM:
return RGBA8_SNORM_to_R8G8B8A8_SNORM; return RGBA8_SNORM_to_R8G8B8A8_SNORM;
default: default:
break; break;
...@@ -2349,9 +2280,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2349,9 +2280,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_SRGB8: case GL_SRGB8:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case Format::ID::R8G8B8A8_UNORM_SRGB:
return SRGB8_to_R8G8B8A8_UNORM_SRGB; return SRGB8_to_R8G8B8A8_UNORM_SRGB;
default: default:
break; break;
...@@ -2359,9 +2290,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma ...@@ -2359,9 +2290,9 @@ LoadFunctionMap GetLoadFunctionsMap(GLenum internalFormat, DXGI_FORMAT dxgiForma
} }
case GL_SRGB8_ALPHA8: case GL_SRGB8_ALPHA8:
{ {
switch (dxgiFormat) switch (angleFormat)
{ {
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case Format::ID::R8G8B8A8_UNORM_SRGB:
return SRGB8_ALPHA8_to_R8G8B8A8_UNORM_SRGB; return SRGB8_ALPHA8_to_R8G8B8A8_UNORM_SRGB;
default: default:
break; break;
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table.cpp
...@@ -47,7 +47,7 @@ Format::Format(GLenum internalFormat, ...@@ -47,7 +47,7 @@ Format::Format(GLenum internalFormat,
blitSRVFormat(blitSRVFormat), blitSRVFormat(blitSRVFormat),
swizzle(swizzleFormat == internalFormat ? *this : Format::Get(swizzleFormat, deviceCaps)), swizzle(swizzleFormat == internalFormat ? *this : Format::Get(swizzleFormat, deviceCaps)),
dataInitializerFunction(internalFormatInitializer), dataInitializerFunction(internalFormatInitializer),
loadFunctions(GetLoadFunctionsMap(internalFormat, texFormat)) loadFunctions(GetLoadFunctionsMap(internalFormat, formatID))
{ {
} }
......
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