Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 267 vs 286 for /trunk/Source Code/Hardware/Video/Direct3D/Textures/Headers/d3dTexture.h

Diff revisions: vs.
  @@ -28,22 +28,21 @@
28 28
29 29 class d3dTexture : public Texture {
30 30 public:
31 - d3dTexture(U32 type, bool flipped = false) : Texture(flipped), _type(type) {}
32 - ~d3dTexture() {}
31 + d3dTexture(TextureType type, bool flipped = false);
32 + ~d3dTexture() {}
33 33
34 - bool generateHWResource(const std::string& name){return true;}
35 - bool unload() {Destroy(); return true;}
34 + bool generateHWResource(const std::string& name){return true;}
35 + bool unload() {return true;}
36 36
37 - void Bind(U16 unit){}
38 -
39 - void setMipMapRange(U32 base = 0, U32 max = 1000){}
40 - void loadData(U32 target, const U8* const ptr, const vec2<U16>& dimensions, U8 bpp, GFXImageFormat format){}
37 + void Bind(U16 unit){}
38 +
39 + void setMipMapRange(U16 base = 0, U16 max = 1000){}
40 + void updateMipMaps() {}
41 + void loadData(U32 target, const U8* const ptr, const vec2<U16>& dimensions, const vec2<U16>& mipLevels,
42 + GFXImageFormat format, GFXImageFormat internalFormat, bool usePOW2 = false){}
41 43
42 44 private:
43 - void Destroy() {}
44 -
45 - private:
46 - U32 _type;
45 + U32 _type;
47 46 };
48 47
49 48 #endif