Merging r6196 through r6248 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6249 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@@ -29,7 +29,7 @@ namespace irr
|
||||
CD3D9RenderTarget(CD3D9Driver* driver);
|
||||
virtual ~CD3D9RenderTarget();
|
||||
|
||||
virtual void setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) _IRR_OVERRIDE_;
|
||||
virtual void setTextures(ITexture* const * textures, u32 numTextures, ITexture* depthStencil, const E_CUBE_SURFACE* cubeSurfaces, u32 numCubeSurfaces) _IRR_OVERRIDE_;
|
||||
|
||||
const core::dimension2d<u32>& getSize() const;
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace irr
|
||||
protected:
|
||||
core::dimension2d<u32> Size;
|
||||
|
||||
core::array<IDirect3DSurface9*> Surface;
|
||||
core::array<IDirect3DSurface9*> Surfaces;
|
||||
|
||||
IDirect3DSurface9* DepthStencilSurface;
|
||||
|
||||
|
Reference in New Issue
Block a user