Made Image11::getStagingTexture private and removed the undefined…

Made Image11::getStagingTexture private and removed the undefined Image11::updateStagingTexture method. TRAC #13332 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1971 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent c22e3604
...@@ -111,13 +111,6 @@ bool Image11::isDirty() const ...@@ -111,13 +111,6 @@ bool Image11::isDirty() const
return (mStagingTexture && mDirty); return (mStagingTexture && mDirty);
} }
ID3D11Texture2D *Image11::getStagingTexture()
{
createStagingTexture();
return mStagingTexture;
}
bool Image11::updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height) bool Image11::updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
{ {
TextureStorage11_2D *storage11 = TextureStorage11_2D::makeTextureStorage11_2D(storage->getStorageInstance()); TextureStorage11_2D *storage11 = TextureStorage11_2D::makeTextureStorage11_2D(storage->getStorageInstance());
...@@ -362,6 +355,13 @@ void Image11::copy(GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width ...@@ -362,6 +355,13 @@ void Image11::copy(GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width
} }
} }
ID3D11Texture2D *Image11::getStagingTexture()
{
createStagingTexture();
return mStagingTexture;
}
void Image11::createStagingTexture() void Image11::createStagingTexture()
{ {
if (mStagingTexture) if (mStagingTexture)
......
...@@ -37,7 +37,6 @@ class Image11 : public Image ...@@ -37,7 +37,6 @@ class Image11 : public Image
static void generateMipmap(Image11 *dest, Image11 *src); static void generateMipmap(Image11 *dest, Image11 *src);
virtual bool isDirty() const; virtual bool isDirty() const;
ID3D11Texture2D *getStagingTexture();
virtual bool updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height); virtual bool updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
virtual bool updateSurface(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height); virtual bool updateSurface(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
...@@ -61,8 +60,8 @@ class Image11 : public Image ...@@ -61,8 +60,8 @@ class Image11 : public Image
private: private:
DISALLOW_COPY_AND_ASSIGN(Image11); DISALLOW_COPY_AND_ASSIGN(Image11);
ID3D11Texture2D *getStagingTexture();
void createStagingTexture(); void createStagingTexture();
bool updateStagingTexture(GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
Renderer11 *mRenderer; Renderer11 *mRenderer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment