Deleted: trunk/LayoutTests/platform/ios-simulator/webgl/2.0.0/conformance/extensions/oes-texture-half-float-linear-expected.txt (261975 => 261976)
--- trunk/LayoutTests/platform/ios-simulator/webgl/2.0.0/conformance/extensions/oes-texture-half-float-linear-expected.txt 2020-05-21 00:16:47 UTC (rev 261975)
+++ trunk/LayoutTests/platform/ios-simulator/webgl/2.0.0/conformance/extensions/oes-texture-half-float-linear-expected.txt 2020-05-21 00:35:02 UTC (rev 261976)
@@ -1,135 +0,0 @@
-This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
-
-Test: ../../resources/webgl_test_files/conformance/extensions/oes-texture-half-float-linear.html
-[ 1: PASS ] Successfully enabled OES_texture_half_float extension
-[ 2: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
-[ 3: PASS ] should be 255,255,255,255
-[ 4: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 5: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 6: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 7: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
-[ 8: PASS ] should be 255,255,255,255
-[ 9: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 10: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 11: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 12: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 13: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 14: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 15: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 16: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 17: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 18: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 19: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 20: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 21: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 22: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 23: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 24: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 25: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 26: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 27: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 28: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 29: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 30: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 31: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 32: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 33: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 34: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
-[ 35: PASS ] should be 255,255,255,255
-[ 36: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 37: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 38: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 39: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
-[ 40: PASS ] should be 255,255,255,255
-[ 41: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 42: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 43: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 44: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 45: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 46: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 47: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 48: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 49: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 50: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 51: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 52: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 53: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 54: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 55: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 56: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 57: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 58: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 59: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 60: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 61: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 62: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 63: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 64: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should produce [0, 0, 0, 1.0] with NO_ERROR if OES_texture_half_float_linear isn't enabled
-[ 65: FAIL ] should be 0,0,0,255 at (0, 0) expected: 0,0,0,255 was 255,255,255,255
-[ 66: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
-[ 67: PASS ] should be 255,255,255,255
-[ 68: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 69: PASS ] should be 255,255,255,255
-[ 70: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 71: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
-[ 72: PASS ] should be 255,255,255,255
-[ 73: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 74: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 75: PASS ] should be 255,255,255,255
-[ 76: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 77: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 78: PASS ] should be 255,255,255,255
-[ 79: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 80: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 81: PASS ] should be 255,255,255,255
-[ 82: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 83: PASS ] should be 255,255,255,255
-[ 84: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 85: PASS ] should be 255,255,255,255
-[ 86: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 87: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 88: PASS ] should be 255,255,255,255
-[ 89: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 90: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 91: PASS ] should be 255,255,255,255
-[ 92: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 93: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 94: PASS ] should be 255,255,255,255
-[ 95: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 96: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 97: PASS ] should be 255,255,255,255
-[ 98: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
-[ 99: PASS ] should be 255,255,255,255
-[ 100: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 101: PASS ] should be 255,255,255,255
-[ 102: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 103: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with non-Linear filter should succeed with NO_ERROR no matter whether OES_texture_half_float_linear is enabled or not
-[ 104: PASS ] should be 255,255,255,255
-[ 105: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 106: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 107: PASS ] should be 255,255,255,255
-[ 108: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 109: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 110: PASS ] should be 255,255,255,255
-[ 111: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 112: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 113: PASS ] should be 255,255,255,255
-[ 114: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 115: PASS ] should be 255,255,255,255
-[ 116: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 117: PASS ] should be 255,255,255,255
-[ 118: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 119: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 120: PASS ] should be 255,255,255,255
-[ 121: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 122: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 123: PASS ] should be 255,255,255,255
-[ 124: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 125: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 126: PASS ] should be 255,255,255,255
-[ 127: PASS ] getError was expected value: NO_ERROR : should be no errors during texture setup
-[ 128: PASS ] getError was expected value: NO_ERROR : OES_texture_half_float texture with Linear filter should succeed with NO_ERROR if OES_texture_half_float is enabled
-[ 129: PASS ] should be 255,255,255,255
-[ 130: PASS ] successfullyParsed is true
-[ FAIL ] 20 failures reported
-
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp (261975 => 261976)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp 2020-05-21 00:16:47 UTC (rev 261975)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp 2020-05-21 00:35:02 UTC (rev 261976)
@@ -275,16 +275,16 @@
InsertFormatMapping(&map, GL_DEPTH_STENCIL, VersionOnly(1, 5), VersionOrExts(1, 5, "GL_ARB_depth_texture"), VersionOnly(1, 5), VersionOnly(2, 0), VersionOrExts(3, 0, "GL_OES_depth_texture"), VersionOnly(2, 0), VersionOnly(2, 0) );
// Luminance alpha formats
- // | Format | OpenGL texture support | Filter | Render | OpenGL ES texture support | Filter | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
- InsertFormatMapping(&map, GL_ALPHA8_EXT, AlwaysSupported(), AlwaysSupported(), NeverSupported(), AlwaysSupported(), AlwaysSupported(), NeverSupported(), NeverSupported() );
- InsertFormatMapping(&map, GL_LUMINANCE8_EXT, AlwaysSupported(), AlwaysSupported(), NeverSupported(), AlwaysSupported(), AlwaysSupported(), NeverSupported(), NeverSupported() );
- InsertFormatMapping(&map, GL_LUMINANCE8_ALPHA8_EXT, AlwaysSupported(), AlwaysSupported(), NeverSupported(), AlwaysSupported(), AlwaysSupported(), NeverSupported(), NeverSupported() );
- InsertFormatMapping(&map, GL_ALPHA16F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_half_float"), ExtsOnly("GL_OES_texture_half_float_linear"), NeverSupported(), NeverSupported() );
- InsertFormatMapping(&map, GL_LUMINANCE16F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_half_float"), ExtsOnly("GL_OES_texture_half_float_linear"), NeverSupported(), NeverSupported() );
- InsertFormatMapping(&map, GL_LUMINANCE_ALPHA16F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_half_float"), ExtsOnly("GL_OES_texture_half_float_linear"), NeverSupported(), NeverSupported() );
- InsertFormatMapping(&map, GL_ALPHA32F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_float"), ExtsOnly("GL_OES_texture_float_linear"), NeverSupported(), NeverSupported() );
- InsertFormatMapping(&map, GL_LUMINANCE32F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_float"), ExtsOnly("GL_OES_texture_float_linear"), NeverSupported(), NeverSupported() );
- InsertFormatMapping(&map, GL_LUMINANCE_ALPHA32F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_float"), ExtsOnly("GL_OES_texture_float_linear"), NeverSupported(), NeverSupported() );
+ // | Format | OpenGL texture support | Filter | Render | OpenGL ES texture support | Filter | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
+ InsertFormatMapping(&map, GL_ALPHA8_EXT, AlwaysSupported(), AlwaysSupported(), NeverSupported(), AlwaysSupported(), AlwaysSupported(), NeverSupported(), NeverSupported() );
+ InsertFormatMapping(&map, GL_LUMINANCE8_EXT, AlwaysSupported(), AlwaysSupported(), NeverSupported(), AlwaysSupported(), AlwaysSupported(), NeverSupported(), NeverSupported() );
+ InsertFormatMapping(&map, GL_LUMINANCE8_ALPHA8_EXT, AlwaysSupported(), AlwaysSupported(), NeverSupported(), AlwaysSupported(), AlwaysSupported(), NeverSupported(), NeverSupported() );
+ InsertFormatMapping(&map, GL_ALPHA16F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_half_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), NeverSupported(), NeverSupported() );
+ InsertFormatMapping(&map, GL_LUMINANCE16F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_half_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), NeverSupported(), NeverSupported() );
+ InsertFormatMapping(&map, GL_LUMINANCE_ALPHA16F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_half_float"), VersionOrExts(3, 0, "GL_OES_texture_half_float_linear"), NeverSupported(), NeverSupported() );
+ InsertFormatMapping(&map, GL_ALPHA32F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_float"), ExtsOnly("GL_OES_texture_float_linear"), NeverSupported(), NeverSupported() );
+ InsertFormatMapping(&map, GL_LUMINANCE32F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_float"), ExtsOnly("GL_OES_texture_float_linear"), NeverSupported(), NeverSupported() );
+ InsertFormatMapping(&map, GL_LUMINANCE_ALPHA32F_EXT, VersionOrExts(3, 0, "GL_ARB_texture_float"), AlwaysSupported(), NeverSupported(), VersionOrExts(3, 0, "GL_OES_texture_float"), ExtsOnly("GL_OES_texture_float_linear"), NeverSupported(), NeverSupported() );
// EXT_texture_compression_rgtc formats
// | Format | OpenGL texture support | Filter | Render | OpenGL ES texture support | Filter | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
