X-Git-Url: http://git.tdb.fi/?p=gldbg.git;a=blobdiff_plain;f=flavors%2Fgl%2Fsource%2Fglstate.cpp;fp=flavors%2Fgl%2Fsource%2Fglstate.cpp;h=f910b49cc041bd87ef2072f61837be3e41b2cfc6;hp=e33e49019bc6f660272a20b6cedd06fccef41354;hb=81f1ddee977603293d0c5710f2db69130dac6a96;hpb=a51c2557622ea93944e24f58845609526eb46ec1 diff --git a/flavors/gl/source/glstate.cpp b/flavors/gl/source/glstate.cpp index e33e490..f910b49 100644 --- a/flavors/gl/source/glstate.cpp +++ b/flavors/gl/source/glstate.cpp @@ -1,15 +1,14 @@ /* $Id$ This file is part of gldbg -Copyright © 2009-2010 Mikko Rasa, Mikkosoft Productions +Copyright © 2009-2011 Mikko Rasa, Mikkosoft Productions Distributed under the GPL */ -#include +#include #include "glstate.h" using namespace std; -using namespace Msp; namespace { @@ -147,7 +146,7 @@ const TextureState &GlState::get_texture(unsigned id) const { TextureMap::const_iterator i = textures.find(id); if(i==textures.end()) - throw KeyError("Unknown texture"); + throw runtime_error("Unknown texture"); return i->second; } @@ -155,7 +154,7 @@ const BufferState &GlState::get_buffer(unsigned id) const { BufferMap::const_iterator i = buffers.find(id); if(i==buffers.end()) - throw KeyError("Unknown buffer"); + throw runtime_error("Unknown buffer"); return i->second; } @@ -204,7 +203,7 @@ const ArrayState &GlState::get_array(GLenum array) const else if(array==GL_TEXTURE_COORD_ARRAY) return texcoord_arrays[client_active_tex]; else - throw InvalidParameterValue("Invalid array"); + throw logic_error("Invalid array"); } const ArrayState &GlState::get_texture_coord_array(unsigned index) const @@ -219,7 +218,7 @@ const ArrayState &GlState::get_attrib_array(unsigned index) const return i->second; // XXX Return a dummy? - throw KeyError("Unknown attribute array"); + throw runtime_error("Unknown attribute array"); } void GlState::set_current_texture(GLenum target, unsigned id)