Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

webgl: Fix filling a non-zero level

Browse source 
You can fill a level > 0 as long as the width and height values are
power of two, so the previous test was bogus.
This commit is contained in:
Emilio Cobos Álvarez 2016-04-20 20:24:56 +02:00
parent 1ad7f73caf
commit 21e2f97cfa
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -251,13 +251,10 @@ impl WebGLRenderingContext {
// If an attempt is made to call this function with no
// WebGLTexture bound, an INVALID_OPERATION error is generated.
let texture = match texture {
Some(texture) => texture,
None => {
self.webgl_error(InvalidOperation);
return false;
}
};
if texture.is_none() {
self.webgl_error(InvalidOperation);
return false;
}
// GL_INVALID_ENUM is generated if data_type is not an accepted value.
match data_type {
@ -324,7 +321,9 @@ impl WebGLRenderingContext {
// GL_INVALID_VALUE is generated if level is greater than zero and the
// texture and the texture is not power of two.
if level > 0 && !texture.is_power_of_two() {
if level > 0 &&
(!(width as u32).is_power_of_two() ||
!(height as u32).is_power_of_two()) {
self.webgl_error(InvalidValue);
return false;
}