Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26336 - szeged:mmatyas__webgl_fns_getparam4, r=jdm

Browse source 
Add support for WebGL2 MIN_PROGRAM_TEXEL_OFFSET

Improves the support of the WebGL2 `MIN_PROGRAM_TEXEL_OFFSET` property (ie. stores it as a signed integer) and adds support for querying it using GetParameter.

See: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.2

<!-- Please describe your changes on the following line: -->

cc @jdm @zakorgy

Depends on #26333 because they touch the same test files.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2020-05-01 13:30:05 -04:00 • committed by GitHub
commit d08c4fff15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/canvas/webgl_limits.rs
View file

@ -95,7 +95,7 @@ impl GLLimitsDetect for GLLimits {
if webgl_version == WebGLVersion::WebGL2 { if webgl_version == WebGLVersion::WebGL2 {
max_uniform_block_size = gl.get_integer64(gl::MAX_UNIFORM_BLOCK_SIZE); max_uniform_block_size = gl.get_integer64(gl::MAX_UNIFORM_BLOCK_SIZE);
max_uniform_buffer_bindings = gl.get_integer(gl::MAX_UNIFORM_BUFFER_BINDINGS); max_uniform_buffer_bindings = gl.get_integer(gl::MAX_UNIFORM_BUFFER_BINDINGS);
min_program_texel_offset = gl.get_integer(gl::MIN_PROGRAM_TEXEL_OFFSET); min_program_texel_offset = gl.get_signed_integer(gl::MIN_PROGRAM_TEXEL_OFFSET);
max_program_texel_offset = gl.get_integer(gl::MAX_PROGRAM_TEXEL_OFFSET); max_program_texel_offset = gl.get_integer(gl::MAX_PROGRAM_TEXEL_OFFSET);
max_transform_feedback_separate_attribs = max_transform_feedback_separate_attribs =
gl.get_integer(gl::MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS); gl.get_integer(gl::MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS);
@ -206,9 +206,11 @@ impl GLLimitsDetect for GLLimits {
trait GLExt { trait GLExt {
fn try_get_integer(self, parameter: GLenum) -> Option<u32>; fn try_get_integer(self, parameter: GLenum) -> Option<u32>;
fn try_get_integer64(self, parameter: GLenum) -> Option<u64>; fn try_get_integer64(self, parameter: GLenum) -> Option<u64>;
fn try_get_signed_integer(self, parameter: GLenum) -> Option<i32>;
fn try_get_float(self, parameter: GLenum) -> Option<f32>; fn try_get_float(self, parameter: GLenum) -> Option<f32>;
fn get_integer(self, parameter: GLenum) -> u32; fn get_integer(self, parameter: GLenum) -> u32;
fn get_integer64(self, parameter: GLenum) -> u64; fn get_integer64(self, parameter: GLenum) -> u64;
fn get_signed_integer(self, parameter: GLenum) -> i32;
fn get_float(self, parameter: GLenum) -> f32; fn get_float(self, parameter: GLenum) -> f32;
} }
@ -236,5 +238,12 @@ macro_rules! create_fun {
impl<'a> GLExt for &'a Gl { impl<'a> GLExt for &'a Gl {
create_fun!(try_get_integer, get_integer, i32, get_integer_v, u32); create_fun!(try_get_integer, get_integer, i32, get_integer_v, u32);
create_fun!(try_get_integer64, get_integer64, i64, get_integer64_v, u64); create_fun!(try_get_integer64, get_integer64, i64, get_integer64_v, u64);
create_fun!(
try_get_signed_integer,
get_signed_integer,
i32,
get_integer_v,
i32
);
create_fun!(try_get_float, get_float, f32, get_float_v, f32); create_fun!(try_get_float, get_float, f32, get_float_v, f32);
} }

2
components/canvas_traits/webgl.rs
View file

@ -1411,7 +1411,7 @@ pub struct GLLimits {
pub max_draw_buffers: u32, pub max_draw_buffers: u32,
pub max_color_attachments: u32, pub max_color_attachments: u32,
pub max_uniform_buffer_bindings: u32, pub max_uniform_buffer_bindings: u32,
pub min_program_texel_offset: u32, pub min_program_texel_offset: i32,
pub max_program_texel_offset: u32, pub max_program_texel_offset: u32,
pub max_uniform_block_size: u64, pub max_uniform_block_size: u64,
pub max_combined_uniform_blocks: u32, pub max_combined_uniform_blocks: u32,

3
components/script/dom/webgl2renderingcontext.rs
View file

@ -1046,6 +1046,9 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
constants::MAX_UNIFORM_BLOCK_SIZE => { constants::MAX_UNIFORM_BLOCK_SIZE => {
return DoubleValue(self.base.limits().max_uniform_block_size as f64) return DoubleValue(self.base.limits().max_uniform_block_size as f64)
}, },
constants::MIN_PROGRAM_TEXEL_OFFSET => {
return Int32Value(self.base.limits().min_program_texel_offset)
},
_ => {}, _ => {},
} }

6
tests/wpt/webgl/meta/conformance2/state/gl-get-calls.html.ini
View file

@ -2,12 +2,6 @@
[WebGL test #55: context.getParameter(context.MAX_SAMPLES) should be >= 4. Was 1 (of type number).] [WebGL test #55: context.getParameter(context.MAX_SAMPLES) should be >= 4. Was 1 (of type number).]
expected: FAIL expected: FAIL
[WebGL test #80: context.getParameter(context.MIN_PROGRAM_TEXEL_OFFSET) is not an instance of Number]
expected: FAIL
[WebGL test #87: context.getError() should be 0. Was 1280.] [WebGL test #87: context.getError() should be 0. Was 1280.]
expected: FAIL expected: FAIL
[WebGL test #79: context.getParameter(context.MIN_PROGRAM_TEXEL_OFFSET) should be >= -8. Was null (of type object).]
expected: FAIL