X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=ae06557dfe2ae40fa26ab9700e6a628ed0f5f7fc;hb=715672cf2c64dab0744db676fdee255ee3a4cef7;hp=4984985c807489b28d6f5737c2f2ba03286488d3;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;p=libs%2Fgl.git diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp index 4984985c..ae06557d 100644 --- a/source/core/texturecube.cpp +++ b/source/core/texturecube.cpp @@ -5,9 +5,7 @@ #include #include #include -#include "bindable.h" #include "error.h" -#include "pixelstore.h" #include "texturecube.h" using namespace std; @@ -223,9 +221,6 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img) PixelFormat fmt = pixelformat_from_image(img); storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w); - PixelStore pstore = PixelStore::from_image(img); - BindRestore _bind_ps(pstore); - image(face, 0, img.get_pixels()); } @@ -249,9 +244,6 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv) else if(w!=size || h!=size) throw incompatible_data("TextureCube::image"); - PixelStore pstore = PixelStore::from_image(img); - BindRestore _bind_ps(pstore); - const char *pixels = reinterpret_cast(img.get_pixels()); unsigned face_size = img.get_stride()*size; for(unsigned i=0; i<6; ++i)