Removes getSurface function from base RenderTarget
TRAC #22134
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1480 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/RenderTarget.h b/src/libGLESv2/renderer/RenderTarget.h
index 5827607..a9e61ad 100644
--- a/src/libGLESv2/renderer/RenderTarget.h
+++ b/src/libGLESv2/renderer/RenderTarget.h
@@ -30,9 +30,7 @@
GLenum getInternalFormat() { return mInternalFormat; }
GLenum getActualFormat() { return mActualFormat; }
GLsizei getSamples() { return mSamples; }
-
- virtual IDirect3DSurface9 *getSurface() = 0; // D3D9_REPLACE - temporary pass-through function
-
+
struct Desc {
GLsizei width;
GLsizei height;
diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index f67c91b..e675fa2 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -1007,7 +1007,7 @@
RenderTarget *renderTarget = renderbufferObject->getRenderTarget();
if (renderTarget)
{
- renderTargetSurface = renderTarget->getSurface();
+ renderTargetSurface = RenderTarget9::makeRenderTarget9(renderTarget)->getSurface();
}
if (!renderTargetSurface)
@@ -1061,7 +1061,7 @@
if (depthStencilRenderTarget)
{
- depthStencilSurface = depthStencilRenderTarget->getSurface();
+ depthStencilSurface = RenderTarget9::makeRenderTarget9(depthStencilRenderTarget)->getSurface();
}
if (!depthStencilSurface)