aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglrenderingcontext.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r--components/script/dom/webglrenderingcontext.rs12
1 files changed, 8 insertions, 4 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 33735d83633..216d6779550 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -696,8 +696,10 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
constants::LINE_LOOP | constants::LINES |
constants::TRIANGLE_STRIP | constants::TRIANGLE_FAN |
constants::TRIANGLES => {
- // TODO(ecoal95): Check the CURRENT_PROGRAM when we keep track of it, and if it's
- // null generate an InvalidOperation error
+ if self.current_program.get().is_none() {
+ return self.webgl_error(InvalidOperation);
+ }
+
if first < 0 || count < 0 {
self.webgl_error(InvalidValue);
} else {
@@ -733,8 +735,10 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
}
// TODO ensure a non-null WebGLBuffer must be bound to the ELEMENT_ARRAY_BUFFER
- // TODO(ecoal95): Check the CURRENT_PROGRAM when we keep track of it, and if it's
- // null generate an InvalidOperation error
+ if self.current_program.get().is_none() {
+ return self.webgl_error(InvalidOperation);
+ }
+
match mode {
constants::POINTS | constants::LINE_STRIP |
constants::LINE_LOOP | constants::LINES |