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

Don't forward GL parameter gets for constant limits.

Browse source
This commit is contained in:
Josh Matthews 2018-05-30 14:47:20 -04:00
parent 4e6b100c7e
commit 76c29f8bd0
6 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/script/dom/webglrenderingcontext.rs
View file

@ -51,7 +51,7 @@ use euclid::Size2D;
use fnv::FnvHashMap;
use half::f16;
use js::jsapi::{JSContext, JSObject, Type};
use js::jsval::{BooleanValue, DoubleValue, Int32Value, JSVal, NullValue, UndefinedValue};
use js::jsval::{BooleanValue, DoubleValue, Int32Value, UInt32Value, JSVal, NullValue, UndefinedValue};
use js::rust::CustomAutoRooterGuard;
use js::typedarray::ArrayBufferView;
use net_traits::image::base::PixelFormat;
@ -1337,6 +1337,35 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
_ => {}
}
// Handle any MAX_ parameters by retrieving the limits that were stored
// when this context was created.
let limit = match parameter {
constants::MAX_VERTEX_ATTRIBS =>
Some(self.limits.max_vertex_attribs),
constants::MAX_TEXTURE_SIZE =>
Some(self.limits.max_tex_size),
constants::MAX_CUBE_MAP_TEXTURE_SIZE =>
Some(self.limits.max_cube_map_tex_size),
constants::MAX_COMBINED_TEXTURE_IMAGE_UNITS =>
Some(self.limits.max_combined_texture_image_units),
constants::MAX_FRAGMENT_UNIFORM_VECTORS =>
Some(self.limits.max_fragment_uniform_vectors),
constants::MAX_RENDERBUFFER_SIZE =>
Some(self.limits.max_renderbuffer_size),
constants::MAX_TEXTURE_IMAGE_UNITS =>
Some(self.limits.max_texture_image_units),
constants::MAX_VARYING_VECTORS =>
Some(self.limits.max_varying_vectors),
constants::MAX_VERTEX_TEXTURE_IMAGE_UNITS =>
Some(self.limits.max_vertex_texture_image_units),
constants::MAX_VERTEX_UNIFORM_VECTORS =>
Some(self.limits.max_vertex_uniform_vectors),
_ => None,
};
if let Some(limit) = limit {
return UInt32Value(limit);
}
if !self.extension_manager.is_get_parameter_name_enabled(parameter) {
self.webgl_error(WebGLError::InvalidEnum);
return NullValue();