From ff33b88f724704409c1fe675c4ebe05343a7cc5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Mon, 27 Apr 2020 14:04:46 +0200 Subject: [PATCH] Add support for even more WebGL2 GetParameter enums Adds support for the following new WebGL2 GetParameter values: - `PACK_ROW_LENGTH` - `PACK_SKIP_PIXELS` - `PACK_SKIP_ROWS` - `RASTERIZER_DISCARD` - `UNPACK_IMAGE_HEIGHT` - `UNPACK_ROW_LENGTH` - `UNPACK_SKIP_IMAGES` - `UNPACK_SKIP_PIXELS` - `UNPACK_SKIP_ROWS` See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.2 --- components/canvas_traits/webgl.rs | 9 +++++++ .../conformance2/state/gl-get-calls.html.ini | 27 ------------------- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/components/canvas_traits/webgl.rs b/components/canvas_traits/webgl.rs index e19ed2263a8..dad16b71399 100644 --- a/components/canvas_traits/webgl.rs +++ b/components/canvas_traits/webgl.rs @@ -793,6 +793,7 @@ parameters! { SampleCoverageInvert = gl::SAMPLE_COVERAGE_INVERT, TransformFeedbackActive = gl::TRANSFORM_FEEDBACK_ACTIVE, TransformFeedbackPaused = gl::TRANSFORM_FEEDBACK_PAUSED, + RasterizerDiscard = gl::RASTERIZER_DISCARD, }), Bool4(ParameterBool4 { ColorWritemask = gl::COLOR_WRITEMASK, @@ -840,6 +841,14 @@ parameters! { MaxTransformFeedbackSeparateComponents = gl::MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS, TransformFeedbackBufferSize = gl::TRANSFORM_FEEDBACK_BUFFER_SIZE, TransformFeedbackBufferStart = gl::TRANSFORM_FEEDBACK_BUFFER_START, + PackRowLength = gl::PACK_ROW_LENGTH, + PackSkipPixels = gl::PACK_SKIP_PIXELS, + PackSkipRows = gl::PACK_SKIP_ROWS, + UnpackImageHeight = gl::UNPACK_IMAGE_HEIGHT, + UnpackRowLength = gl::UNPACK_ROW_LENGTH, + UnpackSkipImages = gl::UNPACK_SKIP_IMAGES, + UnpackSkipPixels = gl::UNPACK_SKIP_PIXELS, + UnpackSkipRows = gl::UNPACK_SKIP_ROWS, }), Int2(ParameterInt2 { MaxViewportDims = gl::MAX_VIEWPORT_DIMS, diff --git a/tests/wpt/webgl/meta/conformance2/state/gl-get-calls.html.ini b/tests/wpt/webgl/meta/conformance2/state/gl-get-calls.html.ini index 2aad53568d5..36f3fcaf5b3 100644 --- a/tests/wpt/webgl/meta/conformance2/state/gl-get-calls.html.ini +++ b/tests/wpt/webgl/meta/conformance2/state/gl-get-calls.html.ini @@ -5,36 +5,9 @@ [WebGL test #80: context.getParameter(context.MIN_PROGRAM_TEXEL_OFFSET) is not an instance of Number] expected: FAIL - [WebGL test #26: context.getParameter(context.UNPACK_ROW_LENGTH) should be 0 (of type number). Was null (of type object).] - expected: FAIL - - [WebGL test #7: context.getParameter(context.PACK_ROW_LENGTH) should be 0 (of type number). Was null (of type object).] - expected: FAIL - - [WebGL test #27: context.getParameter(context.UNPACK_SKIP_IMAGES) should be 0 (of type number). Was null (of type object).] - expected: FAIL - [WebGL test #87: context.getError() should be 0. Was 1280.] expected: FAIL - [WebGL test #29: context.getParameter(context.UNPACK_SKIP_ROWS) should be 0 (of type number). Was null (of type object).] - expected: FAIL - - [WebGL test #25: context.getParameter(context.UNPACK_IMAGE_HEIGHT) should be 0 (of type number). Was null (of type object).] - expected: FAIL - [WebGL test #79: context.getParameter(context.MIN_PROGRAM_TEXEL_OFFSET) should be >= -8. Was null (of type object).] expected: FAIL - [WebGL test #28: context.getParameter(context.UNPACK_SKIP_PIXELS) should be 0 (of type number). Was null (of type object).] - expected: FAIL - - [WebGL test #8: context.getParameter(context.PACK_SKIP_PIXELS) should be 0 (of type number). Was null (of type object).] - expected: FAIL - - [WebGL test #9: context.getParameter(context.PACK_SKIP_ROWS) should be 0 (of type number). Was null (of type object).] - expected: FAIL - - [WebGL test #12: context.getParameter(context.RASTERIZER_DISCARD) should be false (of type boolean). Was null (of type object).] - expected: FAIL -