Changeset 56886 in webkit


Ignore:
Timestamp:
Mar 31, 2010 7:08:59 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-03-31 Zhenyao Mo <​zmo@google.com>

Reviewed by Eric Seidel.

Fix 3 failed tests on Snow Leopard bot from 33416
​https://bugs.webkit.org/show_bug.cgi?id=36910

  • fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt: Considering the case where EXT_packed_depth_stencil is unsupported.
  • fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html: Ditto.
  • fast/canvas/webgl/context-attributes-expected.txt: Ditto.
  • fast/canvas/webgl/context-attributes.html: Ditto.
  • fast/canvas/webgl/gl-get-calls-expected.txt: Ditto.
  • fast/canvas/webgl/gl-get-calls.html: Ditto.
Location:
trunk/LayoutTests
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r56885 r56886  
     12010-03-31  Zhenyao Mo  <zmo@google.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Fix 3 failed tests on Snow Leopard bot from 33416
     6        https://bugs.webkit.org/show_bug.cgi?id=36910
     7
     8        * fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt: Considering the case where EXT_packed_depth_stencil is unsupported.
     9        * fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html: Ditto.
     10        * fast/canvas/webgl/context-attributes-expected.txt: Ditto.
     11        * fast/canvas/webgl/context-attributes.html: Ditto.
     12        * fast/canvas/webgl/gl-get-calls-expected.txt: Ditto.
     13        * fast/canvas/webgl/gl-get-calls.html: Ditto.
     14
    1152010-03-31  Geoffrey Garen  <ggaren@apple.com>
    216

  • trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt

    r56872 r56886  
    4444PASS webGL = getWebGL('stencilOn', { depth: false, stencil: true, antialias: false }, [ 0, 0, 0, 1 ], 1, 0) is non-null.
    4545PASS contextAttribs = webGL.getContextAttributes() is non-null.
    46 PASS contextAttribs.depth is true
    47 PASS contextAttribs.stencil is true
     46PASS contextAttribs.depth == contextAttribs.stencil is true
    4847PASS contextAttribs.alpha is true
    4948PASS contextAttribs.antialias is false
    … …  
    5352PASS webGL = getWebGL('stencilOff', { depth: false, stencil: false, antialias: false }, [ 0, 0, 0, 1 ], 1, 0) is non-null.
    5453PASS contextAttribs = webGL.getContextAttributes() is non-null.
    55 PASS contextAttribs.depth is false
    56 PASS contextAttribs.stencil is false
     54PASS contextAttribs.depth == contextAttribs.stencil is true
    5755PASS contextAttribs.alpha is true
    5856PASS contextAttribs.antialias is false

  • trunk/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html

    r56872 r56886  
    205205        shouldBeNonNull("webGL = getWebGL('stencilOff', { depth: false, stencil: false, antialias: false }, [ 0, 0, 0, 1 ], 1, 0)");
    206206    shouldBeNonNull("contextAttribs = webGL.getContextAttributes()");
    207     shouldBe("contextAttribs.depth", (stencil ? "true" : "false"));
    208     shouldBe("contextAttribs.stencil", (stencil ? "true" : "false"));
     207    // If EXT_packed_depth_stencil is supported, both depth & stencil will be true; otherwise, both will be false.
     208    shouldBe("contextAttribs.depth == contextAttribs.stencil", "true");
    209209    shouldBe("contextAttribs.alpha", "true");
    210210    shouldBe("contextAttribs.antialias", "false");
    … …  
    237237    pixel[3] = buf[3];
    238238    correctColor = (stencil ? [0, 0, 0, 255] : [255, 0, 0, 255]);
     239    // If stencil is requested but not supported, we fake the effect.
     240    if (stencil && !contextAttribs.stencil)
     241        pixel[0] = 0;
    239242    shouldBe("pixel", "correctColor");
    240243}

  • trunk/LayoutTests/fast/canvas/webgl/context-attributes-expected.txt

    r56872 r56886  
    88PASS attribs.depth is true
    99PASS attribs.alpha is true
    10 PASS attribs.stencil is true
     10PASS attribs.stencil == true || attribs.stencil == false is true
    1111PASS attribs.antialias == true || attribs.antialias == false is true
    1212PASS attribs.premultipliedAlpha is true
    … …  
    2222PASS context = create3DContext({ depth: false, stencil: true, antialias: false }) is non-null.
    2323PASS attribs = context.getContextAttributes() is non-null.
    24 PASS attribs.depth is true
     24PASS attribs.depth == attribs.stencil is true
    2525PASS attribs.alpha is true
    26 PASS attribs.stencil is true
    2726PASS attribs.antialias is false
    2827PASS attribs.premultipliedAlpha is true
    … …  
    3231PASS attribs.depth is true
    3332PASS attribs.alpha is true
    34 PASS attribs.stencil is true
     33PASS attribs.stencil == true || attribs.stencil == false is true
    3534PASS attribs.antialias is false
    3635PASS attribs.premultipliedAlpha is true

  • trunk/LayoutTests/fast/canvas/webgl/context-attributes.html

    r56872 r56886  
    1919shouldBe("attribs.depth", "true");
    2020shouldBe("attribs.alpha", "true");
    21 shouldBe("attribs.stencil", "true");
     21shouldBe("attribs.stencil == true || attribs.stencil == false", "true");
    2222// Antialias is requested by default, but might or might not be supported.
    2323shouldBe("attribs.antialias == true || attribs.antialias == false", "true");
    … …  
    3434
    3535debug("Test customized values");
    36 // (stencil == true && depth == false) is not supported, default depth to true
     36// (stencil == true && depth == false) is not supported.
     37// Default depth to true if EXT_packed_depth_stencil is supported.
     38// Otherwise, both depth and stencil should be false.
    3739shouldBeNonNull("context = create3DContext({ depth: false, stencil: true, antialias: false })");
    3840shouldBeNonNull("attribs = context.getContextAttributes()");
    39 shouldBe("attribs.depth", "true");
     41shouldBe("attribs.depth == attribs.stencil", "true");
    4042shouldBe("attribs.alpha", "true");
    41 shouldBe("attribs.stencil", "true");
    4243shouldBe("attribs.antialias", "false");
    4344shouldBe("attribs.premultipliedAlpha", "true");
    … …  
    4950shouldBe("attribs.depth", "true");
    5051shouldBe("attribs.alpha", "true");
    51 shouldBe("attribs.stencil", "true");
     52shouldBe("attribs.stencil == true || attribs.stencil == false", "true");
    5253shouldBe("attribs.antialias", "false");
    5354shouldBe("attribs.premultipliedAlpha", "true");

  • trunk/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt

    r56872 r56886  
    5454PASS context.getParameter(context.STENCIL_BACK_PASS_DEPTH_PASS) is context.KEEP
    5555PASS context.getParameter(context.STENCIL_BACK_REF) is 0
    56 PASS context.getParameter(context.STENCIL_BITS) > 0 is true
     56PASS context.getParameter(context.STENCIL_BITS) >= 0 is true
    5757PASS context.getParameter(context.STENCIL_CLEAR_VALUE) is 0
    5858PASS context.getParameter(context.STENCIL_FAIL) is context.KEEP

  • trunk/LayoutTests/fast/canvas/webgl/gl-get-calls.html

    r56872 r56886  
    8383    //shouldBe('context.getParameter(context.STENCIL_BACK_VALUE_MASK)', '0xFFFFFFFF');
    8484    //shouldBe('context.getParameter(context.STENCIL_BACK_WRITEMASK)', '0xFFFFFFFF');
    85     shouldBe('context.getParameter(context.STENCIL_BITS) > 0', 'true');
     85    // If EXT_packed_depth_stencil is supported, STENCIL_BITS > 0; otherwise, STENCIL_BITS == 0.
     86    shouldBe('context.getParameter(context.STENCIL_BITS) >= 0', 'true');
    8687    shouldBe('context.getParameter(context.STENCIL_CLEAR_VALUE)', '0');
    8788    shouldBe('context.getParameter(context.STENCIL_FAIL)', 'context.KEEP');
Note: See TracChangeset for help on using the changeset viewer.