Removing D3D-isms from gl::Texture
BUG=angle:688
Change-Id: I0cdc758000993f2d54240c69a84f5ae149306d9e
Reviewed-on: https://chromium-review.googlesource.com/209332
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>
diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index b0c0ee5..53ebf09 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -20,7 +20,6 @@
#include "libGLESv2/renderer/d3d/TextureStorage.h"
#include "libEGL/Surface.h"
#include "libGLESv2/renderer/RenderTarget.h"
-#include "libGLESv2/renderer/TextureImpl.h"
namespace gl
{
@@ -89,6 +88,22 @@
return (baseImage ? baseImage->getInternalFormat() : GL_NONE);
}
+// Tests for texture sampling completeness
+bool Texture::isSamplerComplete(const SamplerState &samplerState) const
+{
+ return getImplementation()->isSamplerComplete(samplerState);
+}
+
+rx::TextureStorageInterface *Texture::getNativeTexture()
+{
+ return getImplementation()->getNativeTexture();
+}
+
+void Texture::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source)
+{
+ getImplementation()->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, source);
+}
+
unsigned int Texture::getTextureSerial()
{
rx::TextureStorageInterface *texture = getNativeTexture();
@@ -128,27 +143,12 @@
}
}
-rx::TextureStorageInterface *Texture2D::getNativeTexture()
-{
- return mTexture->getNativeTexture();
-}
-
void Texture2D::setUsage(GLenum usage)
{
mUsage = usage;
mTexture->setUsage(usage);
}
-bool Texture2D::hasDirtyImages() const
-{
- return mTexture->hasDirtyImages();
-}
-
-void Texture2D::resetDirty()
-{
- mTexture->resetDirty();
-}
-
GLsizei Texture2D::getWidth(GLint level) const
{
if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS)
@@ -245,11 +245,6 @@
mTexture->copyImage(level, format, x, y, width, height, source);
}
-void Texture2D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source)
-{
- mTexture->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, source);
-}
-
void Texture2D::storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
{
mImmutable = true;
@@ -257,12 +252,6 @@
mTexture->storage(levels, internalformat, width, height);
}
-// Tests for 2D texture sampling completeness. [OpenGL ES 2.0.24] section 3.8.2 page 85.
-bool Texture2D::isSamplerComplete(const SamplerState &samplerState) const
-{
- return mTexture->isSamplerComplete(samplerState);
-}
-
bool Texture2D::isCompressed(GLint level) const
{
return IsFormatCompressed(getInternalFormat(level));
@@ -318,27 +307,12 @@
SafeDelete(mTexture);
}
-rx::TextureStorageInterface *TextureCubeMap::getNativeTexture()
-{
- return mTexture->getNativeTexture();
-}
-
void TextureCubeMap::setUsage(GLenum usage)
{
mUsage = usage;
mTexture->setUsage(usage);
}
-bool TextureCubeMap::hasDirtyImages() const
-{
- return mTexture->hasDirtyImages();
-}
-
-void TextureCubeMap::resetDirty()
-{
- mTexture->resetDirty();
-}
-
GLsizei TextureCubeMap::getWidth(GLenum target, GLint level) const
{
if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS)
@@ -416,12 +390,6 @@
mTexture->subImageCompressed(target, level, xoffset, yoffset, width, height, format, imageSize, pixels);
}
-// Tests for cube map sampling completeness. [OpenGL ES 2.0.24] section 3.8.2 page 86.
-bool TextureCubeMap::isSamplerComplete(const SamplerState &samplerState) const
-{
- return mTexture->isSamplerComplete(samplerState);
-}
-
// Tests for cube texture completeness. [OpenGL ES 2.0.24] section 3.7.10 page 81.
bool TextureCubeMap::isCubeComplete() const
{
@@ -443,11 +411,6 @@
mTexture->copyImage(target, level, format, x, y, width, height, source);
}
-void TextureCubeMap::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source)
-{
- mTexture->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, source);
-}
-
void TextureCubeMap::storage(GLsizei levels, GLenum internalformat, GLsizei size)
{
mImmutable = true;
@@ -493,27 +456,12 @@
SafeDelete(mTexture);
}
-rx::TextureStorageInterface *Texture3D::getNativeTexture()
-{
- return mTexture->getNativeTexture();
-}
-
void Texture3D::setUsage(GLenum usage)
{
mUsage = usage;
mTexture->setUsage(usage);
}
-bool Texture3D::hasDirtyImages() const
-{
- return mTexture->hasDirtyImages();
-}
-
-void Texture3D::resetDirty()
-{
- mTexture->resetDirty();
-}
-
GLsizei Texture3D::getWidth(GLint level) const
{
return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level)->getWidth() : 0;
@@ -586,30 +534,11 @@
return mTexture->getImage(0);
}
-void Texture3D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source)
-{
- mTexture->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, source);
-}
-
-bool Texture3D::isSamplerComplete(const SamplerState &samplerState) const
-{
- return mTexture->isSamplerComplete(samplerState);
-}
-
-bool Texture3D::isMipmapComplete() const
-{
- return mTexture->isMipmapComplete();
-}
-
unsigned int Texture3D::getRenderTargetSerial(GLint level, GLint layer)
{
return mTexture->getRenderTargetSerial(level, layer);
}
-rx::RenderTarget *Texture3D::getRenderTarget(GLint level)
-{
- return mTexture->getRenderTarget(level);
-}
rx::RenderTarget *Texture3D::getRenderTarget(GLint level, GLint layer)
{
@@ -632,27 +561,12 @@
SafeDelete(mTexture);
}
-rx::TextureStorageInterface *Texture2DArray::getNativeTexture()
-{
- return mTexture->getNativeTexture();
-}
-
void Texture2DArray::setUsage(GLenum usage)
{
mUsage = usage;
mTexture->setUsage(usage);
}
-bool Texture2DArray::hasDirtyImages() const
-{
- return mTexture->hasDirtyImages();
-}
-
-void Texture2DArray::resetDirty()
-{
- mTexture->resetDirty();
-}
-
GLsizei Texture2DArray::getWidth(GLint level) const
{
return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS && mTexture->getLayerCount(level) > 0) ? mTexture->getImage(level, 0)->getWidth() : 0;
@@ -725,21 +639,6 @@
return (mTexture->getLayerCount(0) > 0 ? mTexture->getImage(0, 0) : NULL);
}
-void Texture2DArray::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source)
-{
- mTexture->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, source);
-}
-
-bool Texture2DArray::isSamplerComplete(const SamplerState &samplerState) const
-{
- return mTexture->isSamplerComplete(samplerState);
-}
-
-bool Texture2DArray::isMipmapComplete() const
-{
- return mTexture->isMipmapComplete();
-}
-
unsigned int Texture2DArray::getRenderTargetSerial(GLint level, GLint layer)
{
return mTexture->getRenderTargetSerial(level, layer);