X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.h;h=bd000a325e520b7392a2afc404988879f7e3ecca;hb=a40fc85277dba5c34402a0e703d038efd30cc57b;hp=19da006937cf536aef73bc9ae43e0ba3bc3472b1;hpb=2fa1bb084e54af7134b44d3ee7512056e28de67e;p=libs%2Fgl.git diff --git a/source/texture.h b/source/texture.h index 19da0069..bd000a32 100644 --- a/source/texture.h +++ b/source/texture.h @@ -102,7 +102,6 @@ protected: WRAP_S = 4, WRAP_T = 8, WRAP_R = 16, - GENERATE_MIPMAP = 32, COMPARE = 64, COMPARE_FUNC = 128, MAX_ANISOTROPY = 256, @@ -128,7 +127,7 @@ protected: TextureWrap wrap_s; TextureWrap wrap_t; TextureWrap wrap_r; - Msp::UInt8 auto_gen_mipmap; + bool auto_gen_mipmap; bool compare; Predicate cmp_func; mutable int dirty_params; @@ -202,16 +201,13 @@ public: GLenum get_target() const { return target; } unsigned get_id() const { return id; } - void bind(bool legacy = true) const { bind_to(0, legacy); } - void bind_to(unsigned, bool = true) const; + void bind() const { bind_to(0); } + void bind_to(unsigned) const; static const Texture *current(unsigned = 0); static void unbind() { unbind_from(0); } static void unbind_from(unsigned); -private: - static bool is_legacy_target(GLenum); -public: virtual UInt64 get_data_size() const { return 0; } };