Commit b38f2e5d by Jamie Madill

Remove the unused Renderer client version methods.

Previous patches enable us to get rid of this workaround. We should in subsequent patches also try to clean up code that uses the internal Renderer-only version of the context caps. BUG=angle:789 Change-Id: Ic054090303cdc3f7ee8e45e4577c157559955472 Reviewed-on: https://chromium-review.googlesource.com/227714Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 245d3602
...@@ -34,9 +34,6 @@ ...@@ -34,9 +34,6 @@
#include <sstream> #include <sstream>
#include <iterator> #include <iterator>
// TODO(jmadill): phase these out
#include "libGLESv2/renderer/d3d/RendererD3D.h"
namespace gl namespace gl
{ {
...@@ -204,11 +201,6 @@ void Context::makeCurrent(egl::Surface *surface) ...@@ -204,11 +201,6 @@ void Context::makeCurrent(egl::Surface *surface)
Framebuffer *framebufferZero = new DefaultFramebuffer(colorbufferZero, depthStencilbufferZero); Framebuffer *framebufferZero = new DefaultFramebuffer(colorbufferZero, depthStencilbufferZero);
setFramebufferZero(framebufferZero); setFramebufferZero(framebufferZero);
// Store the current client version in the renderer
// TODO(jmadill): Renderer Refactor
rx::RendererD3D *rendererD3D = rx::RendererD3D::makeRendererD3D(mRenderer);
rendererD3D->setCurrentClientVersion(mClientVersion);
} }
// NOTE: this function should not assume that this context is current! // NOTE: this function should not assume that this context is current!
......
...@@ -21,8 +21,7 @@ namespace rx ...@@ -21,8 +21,7 @@ namespace rx
{ {
RendererD3D::RendererD3D(egl::Display *display) RendererD3D::RendererD3D(egl::Display *display)
: mDisplay(display), : mDisplay(display)
mCurrentClientVersion(2)
{ {
} }
......
...@@ -139,10 +139,6 @@ class RendererD3D : public Renderer ...@@ -139,10 +139,6 @@ class RendererD3D : public Renderer
virtual TextureStorage *createTextureStorage3D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels) = 0; virtual TextureStorage *createTextureStorage3D(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels) = 0;
virtual TextureStorage *createTextureStorage2DArray(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels) = 0; virtual TextureStorage *createTextureStorage2DArray(GLenum internalformat, bool renderTarget, GLsizei width, GLsizei height, GLsizei depth, int levels) = 0;
// Current GLES client version
void setCurrentClientVersion(int clientVersion) { mCurrentClientVersion = clientVersion; }
int getCurrentClientVersion() const { return mCurrentClientVersion; }
// Buffer-to-texture and Texture-to-buffer copies // Buffer-to-texture and Texture-to-buffer copies
virtual bool supportsFastCopyBufferToTexture(GLenum internalFormat) const = 0; virtual bool supportsFastCopyBufferToTexture(GLenum internalFormat) const = 0;
virtual gl::Error fastCopyBufferToTexture(const gl::PixelUnpackState &unpack, unsigned int offset, RenderTarget *destRenderTarget, virtual gl::Error fastCopyBufferToTexture(const gl::PixelUnpackState &unpack, unsigned int offset, RenderTarget *destRenderTarget,
...@@ -191,7 +187,6 @@ class RendererD3D : public Renderer ...@@ -191,7 +187,6 @@ class RendererD3D : public Renderer
FramebufferTextureSerialArray *outSerialArray); FramebufferTextureSerialArray *outSerialArray);
gl::Texture *getIncompleteTexture(GLenum type); gl::Texture *getIncompleteTexture(GLenum type);
int mCurrentClientVersion;
gl::TextureMap mIncompleteTextures; gl::TextureMap mIncompleteTextures;
}; };
......
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