From 685dd27a259cfa0127b20a32f223d00a7c020ef1 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Fri, 29 Aug 2014 15:46:43 -0400 Subject: Replace getDepthStencil with getRenderTarget. In all places where we called this method, we treated a NULL return value as an internal error. This implies to me that we don't need the two getRenderTarget and getDepthStencil methods, since we aren't using them to check if a surface is depth or stencil. BUG=angle:732 Change-Id: I4d1dc148abf3383b1b101bbff4f4d22de27ad03e Reviewed-on: https://chromium-review.googlesource.com/213852 Tested-by: Jamie Madill Reviewed-by: Brandon Jones Reviewed-by: Shannon Woods --- src/libGLESv2/renderer/d3d/TextureD3D.cpp | 108 ------------------------ src/libGLESv2/renderer/d3d/TextureD3D.h | 4 - src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp | 2 +- src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp | 7 +- src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp | 6 +- 5 files changed, 8 insertions(+), 119 deletions(-) (limited to 'src/libGLESv2/renderer/d3d') diff --git a/src/libGLESv2/renderer/d3d/TextureD3D.cpp b/src/libGLESv2/renderer/d3d/TextureD3D.cpp index d5e3ad85..5e29e4b4 100644 --- a/src/libGLESv2/renderer/d3d/TextureD3D.cpp +++ b/src/libGLESv2/renderer/d3d/TextureD3D.cpp @@ -518,34 +518,6 @@ RenderTarget *TextureD3D_2D::getRenderTarget(GLint level, GLint layer) } updateStorageLevel(level); - - // ensure this is NOT a depth texture - if (isDepth(level)) - { - return NULL; - } - - return mTexStorage->getRenderTarget(level); -} - -RenderTarget *TextureD3D_2D::getDepthStencil(GLint level, GLint layer) -{ - ASSERT(layer == 0); - - // ensure the underlying texture is created - if (!ensureRenderTarget()) - { - return NULL; - } - - updateStorageLevel(level); - - // ensure this is actually a depth texture - if (!isDepth(level)) - { - return NULL; - } - return mTexStorage->getRenderTarget(level); } @@ -1040,35 +1012,6 @@ RenderTarget *TextureD3D_Cube::getRenderTarget(GLint level, GLint layer) } updateStorageFaceLevel(layer, level); - - // ensure this is NOT a depth texture - if (isDepth(level, layer)) - { - return NULL; - } - - return mTexStorage->getRenderTarget(target, level); -} - -RenderTarget *TextureD3D_Cube::getDepthStencil(GLint level, GLint layer) -{ - GLenum target = gl::TextureCubeMap::layerIndexToTarget(layer); - ASSERT(gl::IsCubemapTextureTarget(target)); - - // ensure the underlying texture is created - if (!ensureRenderTarget()) - { - return NULL; - } - - updateStorageFaceLevel(layer, level); - - // ensure this is a depth texture - if (!isDepth(level, layer)) - { - return NULL; - } - return mTexStorage->getRenderTarget(target, level); } @@ -1565,31 +1508,6 @@ RenderTarget *TextureD3D_3D::getRenderTarget(GLint level, GLint layer) updateStorage(); - // ensure this is NOT a depth texture - if (isDepth(level)) - { - return NULL; - } - - return mTexStorage->getRenderTarget(level, layer); -} - -RenderTarget *TextureD3D_3D::getDepthStencil(GLint level, GLint layer) -{ - // ensure the underlying texture is created - if (!ensureRenderTarget()) - { - return NULL; - } - - updateStorageLevel(level); - - // ensure this is a depth texture - if (!isDepth(level)) - { - return NULL; - } - return mTexStorage->getRenderTarget(level, layer); } @@ -2058,32 +1976,6 @@ RenderTarget *TextureD3D_2DArray::getRenderTarget(GLint level, GLint layer) } updateStorageLevel(level); - - // ensure this is NOT a depth texture - if (isDepth(level)) - { - return NULL; - } - - return mTexStorage->getRenderTarget(level, layer); -} - -RenderTarget *TextureD3D_2DArray::getDepthStencil(GLint level, GLint layer) -{ - // ensure the underlying texture is created - if (!ensureRenderTarget()) - { - return NULL; - } - - updateStorageLevel(level); - - // ensure this is a depth texture - if (!isDepth(level)) - { - return NULL; - } - return mTexStorage->getRenderTarget(level, layer); } diff --git a/src/libGLESv2/renderer/d3d/TextureD3D.h b/src/libGLESv2/renderer/d3d/TextureD3D.h index d7dcc96b..7f216307 100644 --- a/src/libGLESv2/renderer/d3d/TextureD3D.h +++ b/src/libGLESv2/renderer/d3d/TextureD3D.h @@ -114,7 +114,6 @@ class TextureD3D_2D : public TextureD3D virtual unsigned int getRenderTargetSerial(GLint level, GLint layer); virtual RenderTarget *getRenderTarget(GLint level, GLint layer); - virtual RenderTarget *getDepthStencil(GLint level, GLint layer); private: DISALLOW_COPY_AND_ASSIGN(TextureD3D_2D); @@ -172,7 +171,6 @@ class TextureD3D_Cube : public TextureD3D virtual unsigned int getRenderTargetSerial(GLint level, GLint layer); virtual RenderTarget *getRenderTarget(GLint level, GLint layer); - virtual RenderTarget *getDepthStencil(GLint level, GLint layer); private: DISALLOW_COPY_AND_ASSIGN(TextureD3D_Cube); @@ -231,7 +229,6 @@ class TextureD3D_3D : public TextureD3D virtual RenderTarget *getRenderTarget(GLint level); virtual RenderTarget *getRenderTarget(GLint level, GLint layer); - virtual RenderTarget *getDepthStencil(GLint level, GLint layer); private: DISALLOW_COPY_AND_ASSIGN(TextureD3D_3D); @@ -288,7 +285,6 @@ class TextureD3D_2DArray : public TextureD3D virtual unsigned int getRenderTargetSerial(GLint level, GLint layer); virtual RenderTarget *getRenderTarget(GLint level, GLint layer); - virtual RenderTarget *getDepthStencil(GLint level, GLint layer); private: DISALLOW_COPY_AND_ASSIGN(TextureD3D_2DArray); diff --git a/src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp b/src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp index 072b630e..ba9970bf 100644 --- a/src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp +++ b/src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp @@ -286,7 +286,7 @@ void Clear11::clearFramebuffer(const gl::ClearParameters &clearParams, gl::Frame gl::FramebufferAttachment *attachment = frameBuffer->getDepthOrStencilbuffer(); if (attachment) { - RenderTarget11 *renderTarget = RenderTarget11::makeRenderTarget11(attachment->getDepthStencil()); + RenderTarget11 *renderTarget = RenderTarget11::makeRenderTarget11(attachment->getRenderTarget()); if (!renderTarget) { ERR("Depth stencil render target pointer unexpectedly null."); diff --git a/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp b/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp index 15060cf2..3a276e1a 100644 --- a/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp +++ b/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp @@ -858,7 +858,7 @@ bool Renderer11::applyRenderTarget(gl::Framebuffer *framebuffer) ID3D11DepthStencilView* framebufferDSV = NULL; if (depthStencil) { - RenderTarget11 *depthStencilRenderTarget = RenderTarget11::makeRenderTarget11(depthStencil->getDepthStencil()); + RenderTarget11 *depthStencilRenderTarget = RenderTarget11::makeRenderTarget11(depthStencil->getRenderTarget()); if (!depthStencilRenderTarget) { ERR("render target pointer unexpectedly null."); @@ -2567,8 +2567,9 @@ bool Renderer11::blitRect(gl::Framebuffer *readTarget, const gl::Rectangle &read return gl::error(GL_OUT_OF_MEMORY, false); } - RenderTarget *readRenderTarget = readBuffer->getDepthStencil(); - RenderTarget *drawRenderTarget = drawBuffer->getDepthStencil(); + RenderTarget *readRenderTarget = readBuffer->getRenderTarget(); + RenderTarget *drawRenderTarget = drawBuffer->getRenderTarget(); + ASSERT(readRenderTarget && drawRenderTarget); if (!blitRenderbufferRect(readRect, drawRect, readRenderTarget, drawRenderTarget, filter, scissor, false, blitDepth, blitStencil)) diff --git a/src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp b/src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp index db8a267e..e26dcc7b 100644 --- a/src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp +++ b/src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp @@ -1197,7 +1197,7 @@ bool Renderer9::applyRenderTarget(gl::Framebuffer *framebuffer) if (depthStencil) { IDirect3DSurface9 *depthStencilSurface = NULL; - RenderTarget *depthStencilRenderTarget = depthStencil->getDepthStencil(); + RenderTarget *depthStencilRenderTarget = depthStencil->getRenderTarget(); if (depthStencilRenderTarget) { @@ -2520,11 +2520,11 @@ bool Renderer9::blitRect(gl::Framebuffer *readFramebuffer, const gl::Rectangle & if (readBuffer) { - readDepthStencil = RenderTarget9::makeRenderTarget9(readBuffer->getDepthStencil()); + readDepthStencil = RenderTarget9::makeRenderTarget9(readBuffer->getRenderTarget()); } if (drawBuffer) { - drawDepthStencil = RenderTarget9::makeRenderTarget9(drawBuffer->getDepthStencil()); + drawDepthStencil = RenderTarget9::makeRenderTarget9(drawBuffer->getRenderTarget()); } if (readDepthStencil) -- cgit v1.2.3