Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 244 vs 245 for /trunk/Source Code/Hardware/Video/Textures/Headers/Texture.h

Diff revisions: vs.
  @@ -33,8 +33,8 @@
33 33 class Texture : public HardwareResource {
34 34 /*Abstract interface*/
35 35 public:
36 - virtual void Bind(U16 slot);
37 - virtual void Unbind(U16 slot);
36 + virtual void Bind(U16 slot, bool force = false) = 0;
37 + virtual void Unbind(U16 slot, bool force = false) = 0;
38 38 virtual void Destroy() = 0;
39 39 virtual void loadData(U32 target, const U8* const ptr, const vec2<U16>& dimensions, U8 bpp, GFXImageFormat format) = 0;
40 40 virtual void setMipMapRange(U32 base = 0, U32 max = 1000) = 0;
  @@ -61,7 +61,6 @@
61 61
62 62 protected:
63 63 Texture(const bool flipped = false);
64 - static bool checkBinding(U16 unit, U32 handle);
65 64
66 65 protected:
67 66 boost::atomic<U32> _handle;
  @@ -71,7 +70,6 @@
71 70 bool _hasTransparency;
72 71 mat4<F32> _transformMatrix;
73 72 SamplerDescriptor _samplerDescriptor;
74 - static Unordered_map<U8/*slot*/, U32/*textureHandle*/> textureBoundMap;
75 73 };
76 74
77 75 #endif