Rework exceptions

[libs/gl.git] / source / renderer.cpp

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 72043cd153f1d669b7f69011f97981d1a4793aea..03042e67c12f80ac95904ca4c66e8f4e80e6baee 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -1,7 +1,7 @@
-#include <msp/core/except.h>
 #include "batch.h"
 #include "buffer.h"
 #include "camera.h"
+#include "error.h"
 #include "material.h"
 #include "program.h"
 #include "programdata.h"
@@ -80,7 +80,7 @@ void Renderer::set_shader(const Program *p, const ProgramData *d)
 void Renderer::add_shader_data(const ProgramData *d)
 {
        if(!state->shprog)
-               throw InvalidState("No shader program");
+               throw invalid_operation("Renderer::add_shader_data");
 
        state->shdata.push_back(d);
 }
@@ -111,7 +111,7 @@ void Renderer::push_state()
 void Renderer::pop_state()
 {
        if(state_stack.size()==1)
-               throw InvalidState("Can't pop the last state");
+               throw stack_underflow("Renderer::pop_state");
 
        state_stack.pop_back();
        state = &state_stack.back();
@@ -128,7 +128,7 @@ void Renderer::escape()
 void Renderer::draw(const Batch &batch)
 {
        if(!vertex_array)
-               throw InvalidState("Can't draw without a vertex array");
+               throw invalid_operation("Renderer::draw");
 
        apply_state();