Skip to content

A
angle
Commit 9e287141 by apatrick@chromium.org
Options

Missing file.

TBR=vangelis@chromium.org Review URL: http://codereview.appspot.com/2147046 git-svn-id: https://angleproject.googlecode.com/svn/trunk@418 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 5525502d
Showing with 8 additions and 16 deletions
src/libGLESv2/Texture.cpp
...@@ -923,12 +923,11 @@ int Texture::levelCount() const ...@@ -923,12 +923,11 @@ int Texture::levelCount() const
Texture2D::Texture2D(GLuint id) : Texture(id) Texture2D::Texture2D(GLuint id) : Texture(id)
{ {
mTexture = NULL; mTexture = NULL;
mColorbufferProxy = NULL;
} }
Texture2D::~Texture2D() Texture2D::~Texture2D()
{ {
delete mColorbufferProxy; mColorbufferProxy.set(NULL);
if (mTexture) if (mTexture)
{ {
...@@ -1400,13 +1399,12 @@ Renderbuffer *Texture2D::getColorbuffer(GLenum target) ...@@ -1400,13 +1399,12 @@ Renderbuffer *Texture2D::getColorbuffer(GLenum target)
return error(GL_INVALID_OPERATION, (Renderbuffer *)NULL); return error(GL_INVALID_OPERATION, (Renderbuffer *)NULL);
} }
if (mColorbufferProxy == NULL) if (mColorbufferProxy.get() == NULL)
{ {
mColorbufferProxy = new Renderbuffer(id(), new TextureColorbufferProxy(this, target)); mColorbufferProxy.set(new Renderbuffer(id(), new TextureColorbufferProxy(this, target)));
mColorbufferProxy->addRef();
} }
return mColorbufferProxy; return mColorbufferProxy.get();
} }
IDirect3DSurface9 *Texture2D::getRenderTarget(GLenum target) IDirect3DSurface9 *Texture2D::getRenderTarget(GLenum target)
...@@ -1424,18 +1422,13 @@ IDirect3DSurface9 *Texture2D::getRenderTarget(GLenum target) ...@@ -1424,18 +1422,13 @@ IDirect3DSurface9 *Texture2D::getRenderTarget(GLenum target)
TextureCubeMap::TextureCubeMap(GLuint id) : Texture(id) TextureCubeMap::TextureCubeMap(GLuint id) : Texture(id)
{ {
mTexture = NULL; mTexture = NULL;
for (int i = 0; i < 6; i++)
{
mFaceProxies[i] = NULL;
}
} }
TextureCubeMap::~TextureCubeMap() TextureCubeMap::~TextureCubeMap()
{ {
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
delete mFaceProxies[i]; mFaceProxies[i].set(NULL);
} }
if (mTexture) if (mTexture)
...@@ -2012,13 +2005,12 @@ Renderbuffer *TextureCubeMap::getColorbuffer(GLenum target) ...@@ -2012,13 +2005,12 @@ Renderbuffer *TextureCubeMap::getColorbuffer(GLenum target)
unsigned int face = faceIndex(target); unsigned int face = faceIndex(target);
if (mFaceProxies[face] == NULL) if (mFaceProxies[face].get() == NULL)
{ {
mFaceProxies[face] = new Renderbuffer(id(), new TextureColorbufferProxy(this, target)); mFaceProxies[face].set(new Renderbuffer(id(), new TextureColorbufferProxy(this, target)));
mFaceProxies[face]->addRef();
} }
return mFaceProxies[face]; return mFaceProxies[face].get();
} }
IDirect3DSurface9 *TextureCubeMap::getRenderTarget(GLenum target) IDirect3DSurface9 *TextureCubeMap::getRenderTarget(GLenum target)
......
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