Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 130 deletions

diff --git a/gfx/angle/src/libANGLE/format_map_data.json b/gfx/angle/src/libANGLE/format_map_data.json
deleted file mode 100644
index 3d6ad6c3c..000000000
--- a/gfx/angle/src/libANGLE/format_map_data.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-    "GL_RGBA": {
-        "GL_UNSIGNED_BYTE": "GL_RGBA8",
-        "GL_UNSIGNED_SHORT": "GL_RGBA16_EXT",
-        "GL_BYTE": "GL_RGBA8_SNORM",
-        "GL_SHORT": "GL_RGBA16_SNORM_EXT",
-        "GL_UNSIGNED_SHORT_4_4_4_4": "GL_RGBA4",
-        "GL_UNSIGNED_SHORT_5_5_5_1": "GL_RGB5_A1",
-        "GL_UNSIGNED_INT_2_10_10_10_REV": "GL_RGB10_A2",
-        "GL_FLOAT": "GL_RGBA32F",
-        "GL_HALF_FLOAT": "GL_RGBA16F",
-        "GL_HALF_FLOAT_OES": "GL_RGBA16F"
-    },
-    "GL_RGBA_INTEGER": {
-        "GL_UNSIGNED_BYTE": "GL_RGBA8UI",
-        "GL_BYTE": "GL_RGBA8I",
-        "GL_UNSIGNED_SHORT": "GL_RGBA16UI",
-        "GL_SHORT": "GL_RGBA16I",
-        "GL_UNSIGNED_INT": "GL_RGBA32UI",
-        "GL_INT": "GL_RGBA32I",
-        "GL_UNSIGNED_INT_2_10_10_10_REV": "GL_RGB10_A2UI"
-    },
-    "GL_RGB": {
-        "GL_UNSIGNED_BYTE": "GL_RGB8",
-        "GL_UNSIGNED_SHORT": "GL_RGB16_EXT",
-        "GL_BYTE": "GL_RGB8_SNORM",
-        "GL_SHORT": "GL_RGB16_SNORM_EXT",
-        "GL_UNSIGNED_SHORT_5_6_5": "GL_RGB565",
-        "GL_UNSIGNED_INT_10F_11F_11F_REV": "GL_R11F_G11F_B10F",
-        "GL_UNSIGNED_INT_5_9_9_9_REV": "GL_RGB9_E5",
-        "GL_FLOAT": "GL_RGB32F",
-        "GL_HALF_FLOAT": "GL_RGB16F",
-        "GL_HALF_FLOAT_OES": "GL_RGB16F"
-    },
-    "GL_RGB_INTEGER": {
-        "GL_UNSIGNED_BYTE": "GL_RGB8UI",
-        "GL_BYTE": "GL_RGB8I", "GL_UNSIGNED_SHORT": "GL_RGB16UI",
-        "GL_SHORT": "GL_RGB16I",
-        "GL_UNSIGNED_INT": "GL_RGB32UI",
-        "GL_INT": "GL_RGB32I"
-    },
-    "GL_RG": {
-        "GL_UNSIGNED_BYTE": "GL_RG8",
-        "GL_UNSIGNED_SHORT": "GL_RG16_EXT",
-        "GL_BYTE": "GL_RG8_SNORM",
-        "GL_SHORT": "GL_RG16_SNORM_EXT",
-        "GL_FLOAT": "GL_RG32F",
-        "GL_HALF_FLOAT": "GL_RG16F",
-        "GL_HALF_FLOAT_OES": "GL_RG16F"
-    },
-    "GL_RG_INTEGER": {
-        "GL_UNSIGNED_BYTE": "GL_RG8UI",
-        "GL_BYTE": "GL_RG8I",
-        "GL_UNSIGNED_SHORT": "GL_RG16UI",
-        "GL_SHORT": "GL_RG16I",
-        "GL_UNSIGNED_INT": "GL_RG32UI",
-        "GL_INT": "GL_RG32I"
-    },
-    "GL_RED": {
-        "GL_UNSIGNED_BYTE": "GL_R8",
-        "GL_UNSIGNED_SHORT": "GL_R16_EXT",
-        "GL_BYTE": "GL_R8_SNORM",
-        "GL_SHORT": "GL_R16_SNORM_EXT",
-        "GL_FLOAT": "GL_R32F",
-        "GL_HALF_FLOAT": "GL_R16F",
-        "GL_HALF_FLOAT_OES": "GL_R16F"
-    },
-    "GL_RED_INTEGER": {
-        "GL_UNSIGNED_BYTE": "GL_R8UI",
-        "GL_BYTE": "GL_R8I",
-        "GL_UNSIGNED_SHORT": "GL_R16UI",
-        "GL_SHORT": "GL_R16I",
-        "GL_UNSIGNED_INT": "GL_R32UI",
-        "GL_INT": "GL_R32I"
-    },
-    "GL_LUMINANCE_ALPHA": {
-        "GL_UNSIGNED_BYTE": "GL_LUMINANCE8_ALPHA8_EXT",
-        "GL_FLOAT": "GL_LUMINANCE_ALPHA32F_EXT",
-        "GL_HALF_FLOAT": "GL_LUMINANCE_ALPHA16F_EXT",
-        "GL_HALF_FLOAT_OES": "GL_LUMINANCE_ALPHA16F_EXT"
-    },
-    "GL_LUMINANCE": {
-        "GL_UNSIGNED_BYTE": "GL_LUMINANCE8_EXT",
-        "GL_FLOAT": "GL_LUMINANCE32F_EXT",
-        "GL_HALF_FLOAT": "GL_LUMINANCE16F_EXT",
-        "GL_HALF_FLOAT_OES": "GL_LUMINANCE16F_EXT"
-    },
-    "GL_ALPHA": {
-        "GL_UNSIGNED_BYTE": "GL_ALPHA8_EXT",
-        "GL_FLOAT": "GL_ALPHA32F_EXT",
-        "GL_HALF_FLOAT": "GL_ALPHA16F_EXT",
-        "GL_HALF_FLOAT_OES": "GL_ALPHA16F_EXT"
-    },
-    "GL_BGRA_EXT": {
-        "GL_UNSIGNED_BYTE": "GL_BGRA8_EXT",
-        "GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT": "GL_BGRA4_ANGLEX",
-        "GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT": "GL_BGR5_A1_ANGLEX",
-        "GL_UNSIGNED_SHORT_5_6_5": "GL_BGR565_ANGLEX"
-    },
-    "GL_SRGB_EXT": {
-        "GL_UNSIGNED_BYTE": "GL_SRGB8"
-    },
-    "GL_SRGB_ALPHA_EXT": {
-        "GL_UNSIGNED_BYTE": "GL_SRGB8_ALPHA8"
-    },
-    "GL_COMPRESSED_RGB_S3TC_DXT1_EXT": {
-        "GL_UNSIGNED_BYTE": "GL_COMPRESSED_RGB_S3TC_DXT1_EXT"
-    },
-    "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT": {
-        "GL_UNSIGNED_BYTE": "GL_COMPRESSED_RGBA_S3TC_DXT1_EXT"
-    },
-    "GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE": {
-        "GL_UNSIGNED_BYTE": "GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE"
-    },
-    "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE": {
-        "GL_UNSIGNED_BYTE": "GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE"
-    },
-    "GL_DEPTH_COMPONENT": {
-        "GL_UNSIGNED_SHORT": "GL_DEPTH_COMPONENT16",
-        "GL_UNSIGNED_INT": "GL_DEPTH_COMPONENT32_OES",
-        "GL_FLOAT": "GL_DEPTH_COMPONENT32F"
-    },
-    "GL_STENCIL": {
-        "GL_UNSIGNED_BYTE": "GL_STENCIL_INDEX8"
-    },
-    "GL_DEPTH_STENCIL": {
-        "GL_UNSIGNED_INT_24_8": "GL_DEPTH24_STENCIL8",
-        "GL_FLOAT_32_UNSIGNED_INT_24_8_REV": "GL_DEPTH32F_STENCIL8"
-    }
-}