summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/context.rs9
-rw-r--r--src/shader.rs4
2 files changed, 11 insertions, 2 deletions
diff --git a/src/context.rs b/src/context.rs
index 2171053..9f0d4ad 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -216,4 +216,13 @@ impl Context {
self.gl.disable(glow::CULL_FACE);
}
}
+
+ pub fn check_error(&self) {
+ unsafe {
+ let err = self.gl.get_error();
+ if err != 0 {
+ log::warn!("gl error: {}", err);
+ }
+ }
+ }
}
diff --git a/src/shader.rs b/src/shader.rs
index d260881..178833a 100644
--- a/src/shader.rs
+++ b/src/shader.rs
@@ -49,10 +49,10 @@ impl Shader {
ctx.gl.link_program(program);
if !ctx.gl.get_program_link_status(program) {
- panic!(
+ return Err(format!(
"failed to link shader program:\n{}",
ctx.gl.get_program_info_log(program),
- );
+ ));
}
ctx.gl.detach_shader(program, vert);