Rework exceptions

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index b6b5954837c2e8b2ca4d35a801bd28f199e75757..be4e1a112d08e8c02f189fbcd951dce4dfcdcf2c 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,5 +1,5 @@
 #include "bindable.h"
-#include "except.h"
+#include "error.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -17,9 +17,9 @@ Texture2D::Texture2D():
 void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 {
        if(width>0)
-               throw InvalidState("Texture storage may only be specified once");
+               throw invalid_operation("Texture2D::storage");
        if(wd==0 || ht==0)
-               throw InvalidParameterValue("Invalid texture dimensions");
+               throw invalid_argument("Texture2D::storage");
 
        ifmt = fmt;
        width = wd;
@@ -36,7 +36,8 @@ void Texture2D::allocate(unsigned level)
 
 void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
 {
-       require_storage();
+       if(width==0 || height==0)
+               throw invalid_operation("Texture2D::image");
 
        unsigned w = width;
        unsigned h = height;
@@ -55,7 +56,9 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
 {
-       require_storage();
+       if(width==0 || height==0)
+               throw invalid_operation("Texture2D::sub_image");
+
        allocate(level);
 
        Bind _bind(this, true);
@@ -78,17 +81,11 @@ void Texture2D::image(const Graphics::Image &img)
        if(width==0)
                storage(fmt, w, h);
        else if(w!=width || h!=height)
-               throw IncompatibleData("Image does not match texture storage");
+               throw incompatible_data("Texture2D::image");
 
        image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-void Texture2D::require_storage()
-{
-       if(width==0 || height==0)
-               throw InvalidState("Texture storage has not been specified");
-}
-
 void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
 {
        w >>= level;