commit e83d1a93c6996ceaad179b008a31fed91ff78914
author Jamie Madill <jmadill@chromium.org> Thu Oct 24 17:49:33 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Oct 24 17:49:33 2013 -0400
tree ca357e5b530900a5c2efaaa2a1b105226a73e131
parent 632192dd8098d303fbf4d66f5d61c7363039a818

Change Texture::convertToRenderTarget to ensureRenderTarget, which tries to convert a storage to a RT if it isn't already.

TRAC #23961

Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods

src/libGLESv2/Texture.h

diff --git a/src/libGLESv2/Texture.h b/src/libGLESv2/Texture.h
index 67333bd..c28dc12 100644
--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -128,7 +128,7 @@
 
     virtual void createTexture() = 0;
     virtual void updateTexture() = 0;
-    virtual void convertToRenderTarget() = 0;
+    virtual bool ensureRenderTarget() = 0;
 
     rx::Renderer *mRenderer;
 
@@ -197,7 +197,7 @@
 
     virtual void createTexture();
     virtual void updateTexture();
-    virtual void convertToRenderTarget();
+    virtual bool ensureRenderTarget();
     virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
     virtual const rx::Image *getBaseLevelImage() const;
 
@@ -264,7 +264,7 @@
 
     virtual void createTexture();
     virtual void updateTexture();
-    virtual void convertToRenderTarget();
+    virtual bool ensureRenderTarget();
     virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
     virtual const rx::Image *getBaseLevelImage() const;
 
@@ -323,7 +323,8 @@
 
     virtual void createTexture();
     virtual void updateTexture();
-    virtual void convertToRenderTarget();
+    virtual bool ensureRenderTarget();
+
     virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
     virtual const rx::Image *getBaseLevelImage() const;
 
@@ -379,7 +380,8 @@
 
     virtual void createTexture();
     virtual void updateTexture();
-    virtual void convertToRenderTarget();
+    virtual bool ensureRenderTarget();
+
     virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
     virtual const rx::Image *getBaseLevelImage() const;