X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=6935e582f5932cd7c000d844c56c976f2c47b0e9;hb=40c364b04084d11573a9ff9f7be6f1c4cc521f4b;hp=ddb0c1e05189113257d55d94656e1c4391fa3fa9;hpb=2157e9320c60d561208dfdf6034e9a06781c9f30;p=libs%2Fgl.git diff --git a/source/texturecube.cpp b/source/texturecube.cpp index ddb0c1e0..6935e582 100644 --- a/source/texturecube.cpp +++ b/source/texturecube.cpp @@ -1,6 +1,6 @@ +#include "arb_texture_cube_map.h" #include "bindable.h" #include "error.h" -#include "extension.h" #include "texturecube.h" using namespace std; @@ -23,7 +23,7 @@ TextureCube::TextureCube(): size(0), allocated(0) { - static RequireVersion _ver(1, 3); + static Require _req(ARB_texture_cube_map); } void TextureCube::storage(PixelFormat fmt, unsigned sz) @@ -32,6 +32,7 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz) throw invalid_operation("TextureCube::storage"); if(sz==0) throw invalid_argument("TextureCube::storage"); + require_pixelformat(fmt); ifmt = fmt; size = sz; @@ -53,7 +54,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D unsigned s = get_level_size(level); if(s==0) - throw invalid_argument("TextureCube::image"); + throw out_of_range("TextureCube::image"); Bind _bind(this, true); glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);