diff options
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/Texture.cpp')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/Texture.cpp | 787 |
1 files changed, 518 insertions, 269 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/Texture.cpp b/src/3rdparty/angle/src/libGLESv2/Texture.cpp index b0c0ee51bd..3ec492de07 100644 --- a/src/3rdparty/angle/src/libGLESv2/Texture.cpp +++ b/src/3rdparty/angle/src/libGLESv2/Texture.cpp @@ -1,4 +1,3 @@ -#include "precompiled.h" // // Copyright (c) 2002-2014 The ANGLE Project Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be @@ -10,23 +9,47 @@ // functionality. [OpenGL ES 2.0.24] section 3.7 page 63. #include "libGLESv2/Texture.h" - #include "libGLESv2/main.h" -#include "common/mathutil.h" -#include "common/utilities.h" +#include "libGLESv2/Context.h" #include "libGLESv2/formatutils.h" +#include "libGLESv2/ImageIndex.h" #include "libGLESv2/Renderbuffer.h" #include "libGLESv2/renderer/Image.h" #include "libGLESv2/renderer/d3d/TextureStorage.h" + #include "libEGL/Surface.h" -#include "libGLESv2/renderer/RenderTarget.h" -#include "libGLESv2/renderer/TextureImpl.h" + +#include "common/mathutil.h" +#include "common/utilities.h" namespace gl { -Texture::Texture(GLuint id, GLenum target) +bool IsMipmapFiltered(const gl::SamplerState &samplerState) +{ + switch (samplerState.minFilter) + { + case GL_NEAREST: + case GL_LINEAR: + return false; + case GL_NEAREST_MIPMAP_NEAREST: + case GL_LINEAR_MIPMAP_NEAREST: + case GL_NEAREST_MIPMAP_LINEAR: + case GL_LINEAR_MIPMAP_LINEAR: + return true; + default: UNREACHABLE(); + return false; + } +} + +bool IsPointSampled(const gl::SamplerState &samplerState) +{ + return (samplerState.magFilter == GL_NEAREST && (samplerState.minFilter == GL_NEAREST || samplerState.minFilter == GL_NEAREST_MIPMAP_NEAREST)); +} + +Texture::Texture(rx::TextureImpl *impl, GLuint id, GLenum target) : RefCountObject(id), + mTexture(impl), mUsage(GL_NONE), mImmutable(false), mTarget(target) @@ -35,6 +58,7 @@ Texture::Texture(GLuint id, GLenum target) Texture::~Texture() { + SafeDelete(mTexture); } GLenum Texture::getTarget() const @@ -45,6 +69,7 @@ GLenum Texture::getTarget() const void Texture::setUsage(GLenum usage) { mUsage = usage; + getImplementation()->setUsage(usage); } void Texture::getSamplerStateWithNativeOffset(SamplerState *sampler) @@ -52,7 +77,7 @@ void Texture::getSamplerStateWithNativeOffset(SamplerState *sampler) *sampler = mSamplerState; // Offset the effective base level by the texture storage's top level - rx::TextureStorageInterface *texture = getNativeTexture(); + rx::TextureStorage *texture = getNativeTexture(); int topLevel = texture ? texture->getTopLevel() : 0; sampler->baseLevel = topLevel + mSamplerState.baseLevel; } @@ -89,9 +114,48 @@ GLenum Texture::getBaseLevelInternalFormat() const return (baseImage ? baseImage->getInternalFormat() : GL_NONE); } +GLsizei Texture::getWidth(const ImageIndex &index) const +{ + rx::Image *image = mTexture->getImage(index); + return image->getWidth(); +} + +GLsizei Texture::getHeight(const ImageIndex &index) const +{ + rx::Image *image = mTexture->getImage(index); + return image->getHeight(); +} + +GLenum Texture::getInternalFormat(const ImageIndex &index) const +{ + rx::Image *image = mTexture->getImage(index); + return image->getInternalFormat(); +} + +GLenum Texture::getActualFormat(const ImageIndex &index) const +{ + rx::Image *image = mTexture->getImage(index); + return image->getActualFormat(); +} + +rx::TextureStorage *Texture::getNativeTexture() +{ + return getImplementation()->getNativeTexture(); +} + +void Texture::generateMipmaps() +{ + getImplementation()->generateMipmaps(); +} + +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(); + rx::TextureStorage *texture = getNativeTexture(); return texture ? texture->getTextureSerial() : 0; } @@ -102,7 +166,7 @@ bool Texture::isImmutable() const int Texture::immutableLevelCount() { - return (mImmutable ? getNativeTexture()->getStorageInstance()->getLevelCount() : 0); + return (mImmutable ? getNativeTexture()->getLevelCount() : 0); } int Texture::mipLevels() const @@ -110,17 +174,19 @@ int Texture::mipLevels() const return log2(std::max(std::max(getBaseLevelWidth(), getBaseLevelHeight()), getBaseLevelDepth())) + 1; } -Texture2D::Texture2D(rx::Texture2DImpl *impl, GLuint id) - : Texture(id, GL_TEXTURE_2D), - mTexture(impl) +const rx::Image *Texture::getBaseLevelImage() const +{ + return (getImplementation()->getLayerCount(0) > 0 ? getImplementation()->getImage(0, 0) : NULL); +} + +Texture2D::Texture2D(rx::TextureImpl *impl, GLuint id) + : Texture(impl, id, GL_TEXTURE_2D) { mSurface = NULL; } Texture2D::~Texture2D() { - SafeDelete(mTexture); - if (mSurface) { mSurface->setBoundTexture(NULL); @@ -128,31 +194,10 @@ Texture2D::~Texture2D() } } -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) - return mTexture->getImage(level)->getWidth(); + return mTexture->getImage(level, 0)->getWidth(); else return 0; } @@ -160,7 +205,7 @@ GLsizei Texture2D::getWidth(GLint level) const GLsizei Texture2D::getHeight(GLint level) const { if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) - return mTexture->getImage(level)->getHeight(); + return mTexture->getImage(level, 0)->getHeight(); else return 0; } @@ -168,7 +213,7 @@ GLsizei Texture2D::getHeight(GLint level) const GLenum Texture2D::getInternalFormat(GLint level) const { if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) - return mTexture->getImage(level)->getInternalFormat(); + return mTexture->getImage(level, 0)->getInternalFormat(); else return GL_NONE; } @@ -176,25 +221,16 @@ GLenum Texture2D::getInternalFormat(GLint level) const GLenum Texture2D::getActualFormat(GLint level) const { if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) - return mTexture->getImage(level)->getActualFormat(); + return mTexture->getImage(level, 0)->getActualFormat(); else return GL_NONE; } -void Texture2D::redefineImage(GLint level, GLenum internalformat, GLsizei width, GLsizei height) -{ - releaseTexImage(); - - mTexture->redefineImage(level, internalformat, width, height); -} - void Texture2D::setImage(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - GLenum sizedInternalFormat = IsSizedInternalFormat(internalFormat) ? internalFormat - : GetSizedInternalFormat(format, type); - redefineImage(level, sizedInternalFormat, width, height); + releaseTexImage(); - mTexture->setImage(level, width, height, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_2D, level, width, height, 1, internalFormat, format, type, unpack, pixels); } void Texture2D::bindTexImage(egl::Surface *surface) @@ -220,129 +256,189 @@ void Texture2D::releaseTexImage() void Texture2D::setCompressedImage(GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei imageSize, const void *pixels) { - // compressed formats don't have separate sized internal formats-- we can just use the compressed format directly - redefineImage(level, format, width, height); + releaseTexImage(); - mTexture->setCompressedImage(level, format, width, height, imageSize, pixels); + mTexture->setCompressedImage(GL_TEXTURE_2D, level, format, width, height, 1, imageSize, pixels); } void Texture2D::subImage(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->subImage(level, xoffset, yoffset, width, height, format, type, unpack, pixels); + mTexture->subImage(GL_TEXTURE_2D, level, xoffset, yoffset, 0, width, height, 1, format, type, unpack, pixels); } void Texture2D::subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *pixels) { - mTexture->subImageCompressed(level, xoffset, yoffset, width, height, format, imageSize, pixels); + mTexture->subImageCompressed(GL_TEXTURE_2D, level, xoffset, yoffset, 0, width, height, 1, format, imageSize, pixels); } void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source) { - GLenum sizedInternalFormat = IsSizedInternalFormat(format) ? format - : GetSizedInternalFormat(format, GL_UNSIGNED_BYTE); - redefineImage(level, sizedInternalFormat, width, height); - - mTexture->copyImage(level, format, x, y, width, height, source); -} + releaseTexImage(); -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); + mTexture->copyImage(GL_TEXTURE_2D, level, format, x, y, width, height, source); } void Texture2D::storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) { mImmutable = true; - mTexture->storage(levels, internalformat, width, height); + mTexture->storage(GL_TEXTURE_2D, levels, internalformat, width, height, 1); } // Tests for 2D texture sampling completeness. [OpenGL ES 2.0.24] section 3.8.2 page 85. -bool Texture2D::isSamplerComplete(const SamplerState &samplerState) const +bool Texture2D::isSamplerComplete(const SamplerState &samplerState, const TextureCapsMap &textureCaps, const Extensions &extensions, int clientVersion) const { - return mTexture->isSamplerComplete(samplerState); + GLsizei width = getBaseLevelWidth(); + GLsizei height = getBaseLevelHeight(); + + if (width <= 0 || height <= 0) + { + return false; + } + + if (!textureCaps.get(getInternalFormat(0)).filterable && !IsPointSampled(samplerState)) + { + return false; + } + + bool npotSupport = extensions.textureNPOT; + + if (!npotSupport) + { + if ((samplerState.wrapS != GL_CLAMP_TO_EDGE && !gl::isPow2(width)) || + (samplerState.wrapT != GL_CLAMP_TO_EDGE && !gl::isPow2(height))) + { + return false; + } + } + + if (IsMipmapFiltered(samplerState)) + { + if (!npotSupport) + { + if (!gl::isPow2(width) || !gl::isPow2(height)) + { + return false; + } + } + + if (!isMipmapComplete()) + { + return false; + } + } + + // OpenGLES 3.0.2 spec section 3.8.13 states that a texture is not mipmap complete if: + // The internalformat specified for the texture arrays is a sized internal depth or + // depth and stencil format (see table 3.13), the value of TEXTURE_COMPARE_- + // MODE is NONE, and either the magnification filter is not NEAREST or the mini- + // fication filter is neither NEAREST nor NEAREST_MIPMAP_NEAREST. + const gl::InternalFormat &formatInfo = gl::GetInternalFormatInfo(getInternalFormat(0)); + if (formatInfo.depthBits > 0 && clientVersion > 2) + { + if (samplerState.compareMode == GL_NONE) + { + if ((samplerState.minFilter != GL_NEAREST && samplerState.minFilter != GL_NEAREST_MIPMAP_NEAREST) || + samplerState.magFilter != GL_NEAREST) + { + return false; + } + } + } + + return true; } bool Texture2D::isCompressed(GLint level) const { - return IsFormatCompressed(getInternalFormat(level)); + return GetInternalFormatInfo(getInternalFormat(level)).compressed; } bool Texture2D::isDepth(GLint level) const { - return GetDepthBits(getInternalFormat(level)) > 0; + return GetInternalFormatInfo(getInternalFormat(level)).depthBits > 0; } void Texture2D::generateMipmaps() { - // Purge array levels 1 through q and reset them to represent the generated mipmap levels. - int levelCount = mipLevels(); - for (int level = 1; level < levelCount; level++) - { - redefineImage(level, getBaseLevelInternalFormat(), - std::max(getBaseLevelWidth() >> level, 1), - std::max(getBaseLevelHeight() >> level, 1)); - } + releaseTexImage(); mTexture->generateMipmaps(); } -const rx::Image *Texture2D::getBaseLevelImage() const +// Tests for 2D texture (mipmap) completeness. [OpenGL ES 2.0.24] section 3.7.10 page 81. +bool Texture2D::isMipmapComplete() const { - return mTexture->getImage(0); -} + int levelCount = mipLevels(); -unsigned int Texture2D::getRenderTargetSerial(GLint level) -{ - return mTexture->getRenderTargetSerial(level); -} + for (int level = 0; level < levelCount; level++) + { + if (!isLevelComplete(level)) + { + return false; + } + } -rx::RenderTarget *Texture2D::getRenderTarget(GLint level) -{ - return mTexture->getRenderTarget(level); + return true; } -rx::RenderTarget *Texture2D::getDepthSencil(GLint level) +bool Texture2D::isLevelComplete(int level) const { - return mTexture->getDepthSencil(level); -} + if (isImmutable()) + { + return true; + } -TextureCubeMap::TextureCubeMap(rx::TextureCubeImpl *impl, GLuint id) - : Texture(id, GL_TEXTURE_CUBE_MAP), - mTexture(impl) -{ -} + const rx::Image *baseImage = getBaseLevelImage(); -TextureCubeMap::~TextureCubeMap() -{ - SafeDelete(mTexture); -} + GLsizei width = baseImage->getWidth(); + GLsizei height = baseImage->getHeight(); -rx::TextureStorageInterface *TextureCubeMap::getNativeTexture() -{ - return mTexture->getNativeTexture(); -} + if (width <= 0 || height <= 0) + { + return false; + } -void TextureCubeMap::setUsage(GLenum usage) -{ - mUsage = usage; - mTexture->setUsage(usage); + // The base image level is complete if the width and height are positive + if (level == 0) + { + return true; + } + + ASSERT(level >= 1 && level < IMPLEMENTATION_MAX_TEXTURE_LEVELS && mTexture->getImage(level, 0) != NULL); + rx::Image *image = mTexture->getImage(level, 0); + + if (image->getInternalFormat() != baseImage->getInternalFormat()) + { + return false; + } + + if (image->getWidth() != std::max(1, width >> level)) + { + return false; + } + + if (image->getHeight() != std::max(1, height >> level)) + { + return false; + } + + return true; } -bool TextureCubeMap::hasDirtyImages() const +TextureCubeMap::TextureCubeMap(rx::TextureImpl *impl, GLuint id) + : Texture(impl, id, GL_TEXTURE_CUBE_MAP) { - return mTexture->hasDirtyImages(); } -void TextureCubeMap::resetDirty() +TextureCubeMap::~TextureCubeMap() { - mTexture->resetDirty(); } GLsizei TextureCubeMap::getWidth(GLenum target, GLint level) const { if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) - return mTexture->getImage(target, level)->getWidth(); + return mTexture->getImage(level, targetToLayerIndex(target))->getWidth(); else return 0; } @@ -350,7 +446,7 @@ GLsizei TextureCubeMap::getWidth(GLenum target, GLint level) const GLsizei TextureCubeMap::getHeight(GLenum target, GLint level) const { if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) - return mTexture->getImage(target, level)->getHeight(); + return mTexture->getImage(level, targetToLayerIndex(target))->getHeight(); else return 0; } @@ -358,7 +454,7 @@ GLsizei TextureCubeMap::getHeight(GLenum target, GLint level) const GLenum TextureCubeMap::getInternalFormat(GLenum target, GLint level) const { if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) - return mTexture->getImage(target, level)->getInternalFormat(); + return mTexture->getImage(level, targetToLayerIndex(target))->getInternalFormat(); else return GL_NONE; } @@ -366,76 +462,91 @@ GLenum TextureCubeMap::getInternalFormat(GLenum target, GLint level) const GLenum TextureCubeMap::getActualFormat(GLenum target, GLint level) const { if (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) - return mTexture->getImage(target, level)->getActualFormat(); + return mTexture->getImage(level, targetToLayerIndex(target))->getActualFormat(); else return GL_NONE; } void TextureCubeMap::setImagePosX(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->setImage(0, level, width, height, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_CUBE_MAP_POSITIVE_X, level, width, height, 1, internalFormat, format, type, unpack, pixels); } void TextureCubeMap::setImageNegX(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->setImage(1, level, width, height, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_CUBE_MAP_NEGATIVE_X, level, width, height, 1, internalFormat, format, type, unpack, pixels); } void TextureCubeMap::setImagePosY(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->setImage(2, level, width, height, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_CUBE_MAP_POSITIVE_Y, level, width, height, 1, internalFormat, format, type, unpack, pixels); } void TextureCubeMap::setImageNegY(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->setImage(3, level, width, height, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, level, width, height, 1, internalFormat, format, type, unpack, pixels); } void TextureCubeMap::setImagePosZ(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->setImage(4, level, width, height, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_CUBE_MAP_POSITIVE_Z, level, width, height, 1, internalFormat, format, type, unpack, pixels); } void TextureCubeMap::setImageNegZ(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->setImage(5, level, width, height, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, level, width, height, 1, internalFormat, format, type, unpack, pixels); } void TextureCubeMap::setCompressedImage(GLenum target, GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei imageSize, const void *pixels) { - mTexture->setCompressedImage(target, level, format, width, height, imageSize, pixels); + mTexture->setCompressedImage(target, level, format, width, height, 1, imageSize, pixels); } void TextureCubeMap::subImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->subImage(target, level, xoffset, yoffset, width, height, format, type, unpack, pixels); + mTexture->subImage(target, level, xoffset, yoffset, 0, width, height, 1, format, type, unpack, pixels); } void TextureCubeMap::subImageCompressed(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *pixels) { - 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); + mTexture->subImageCompressed(target, level, xoffset, yoffset, 0, width, height, 1, format, imageSize, pixels); } // Tests for cube texture completeness. [OpenGL ES 2.0.24] section 3.7.10 page 81. bool TextureCubeMap::isCubeComplete() const { - return mTexture->isCubeComplete(); + int baseWidth = getBaseLevelWidth(); + int baseHeight = getBaseLevelHeight(); + GLenum baseFormat = getBaseLevelInternalFormat(); + + if (baseWidth <= 0 || baseWidth != baseHeight) + { + return false; + } + + for (int faceIndex = 1; faceIndex < 6; faceIndex++) + { + const rx::Image *faceBaseImage = mTexture->getImage(0, faceIndex); + + if (faceBaseImage->getWidth() != baseWidth || + faceBaseImage->getHeight() != baseHeight || + faceBaseImage->getInternalFormat() != baseFormat ) + { + return false; + } + } + + return true; } bool TextureCubeMap::isCompressed(GLenum target, GLint level) const { - return IsFormatCompressed(getInternalFormat(target, level)); + return GetInternalFormatInfo(getInternalFormat(target, level)).compressed; } bool TextureCubeMap::isDepth(GLenum target, GLint level) const { - return GetDepthBits(getInternalFormat(target, level)) > 0; + return GetInternalFormatInfo(getInternalFormat(target, level)).depthBits > 0; } void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source) @@ -443,214 +554,307 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint 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; - mTexture->storage(levels, internalformat, size); + mTexture->storage(GL_TEXTURE_CUBE_MAP, levels, internalformat, size, size, 1); } -void TextureCubeMap::generateMipmaps() +// Tests for texture sampling completeness +bool TextureCubeMap::isSamplerComplete(const SamplerState &samplerState, const TextureCapsMap &textureCaps, const Extensions &extensions, int clientVersion) const { - mTexture->generateMipmaps(); -} + int size = getBaseLevelWidth(); -const rx::Image *TextureCubeMap::getBaseLevelImage() const -{ - // Note: if we are not cube-complete, there is no single base level image that can describe all - // cube faces, so this method is only well-defined for a cube-complete base level. - return mTexture->getImage(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0); -} + bool mipmapping = IsMipmapFiltered(samplerState); -unsigned int TextureCubeMap::getRenderTargetSerial(GLenum target, GLint level) -{ - return mTexture->getRenderTargetSerial(target, level); -} + if (!textureCaps.get(getInternalFormat(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0)).filterable && !IsPointSampled(samplerState)) + { + return false; + } -rx::RenderTarget *TextureCubeMap::getRenderTarget(GLenum target, GLint level) -{ - return mTexture->getRenderTarget(target, level); -} + if (!gl::isPow2(size) && !extensions.textureNPOT) + { + if (samplerState.wrapS != GL_CLAMP_TO_EDGE || samplerState.wrapT != GL_CLAMP_TO_EDGE || mipmapping) + { + return false; + } + } -rx::RenderTarget *TextureCubeMap::getDepthStencil(GLenum target, GLint level) -{ - return mTexture->getDepthStencil(target, level); + if (!mipmapping) + { + if (!isCubeComplete()) + { + return false; + } + } + else + { + if (!isMipmapComplete()) // Also tests for isCubeComplete() + { + return false; + } + } + + return true; } -Texture3D::Texture3D(rx::Texture3DImpl *impl, GLuint id) - : Texture(id, GL_TEXTURE_3D), - mTexture(impl) +int TextureCubeMap::targetToLayerIndex(GLenum target) { + META_ASSERT(GL_TEXTURE_CUBE_MAP_NEGATIVE_X - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 1); + META_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_Y - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 2); + META_ASSERT(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 3); + META_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_Z - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 4); + META_ASSERT(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 5); + + return target - GL_TEXTURE_CUBE_MAP_POSITIVE_X; } -Texture3D::~Texture3D() +GLenum TextureCubeMap::layerIndexToTarget(GLint layer) { - SafeDelete(mTexture); + META_ASSERT(GL_TEXTURE_CUBE_MAP_NEGATIVE_X - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 1); + META_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_Y - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 2); + META_ASSERT(GL_TEXTURE_CUBE_MAP_NEGATIVE_Y - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 3); + META_ASSERT(GL_TEXTURE_CUBE_MAP_POSITIVE_Z - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 4); + META_ASSERT(GL_TEXTURE_CUBE_MAP_NEGATIVE_Z - GL_TEXTURE_CUBE_MAP_POSITIVE_X == 5); + + return GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer; } -rx::TextureStorageInterface *Texture3D::getNativeTexture() +bool TextureCubeMap::isMipmapComplete() const { - return mTexture->getNativeTexture(); + if (isImmutable()) + { + return true; + } + + if (!isCubeComplete()) + { + return false; + } + + int levelCount = mipLevels(); + + for (int face = 0; face < 6; face++) + { + for (int level = 1; level < levelCount; level++) + { + if (!isFaceLevelComplete(face, level)) + { + return false; + } + } + } + + return true; } -void Texture3D::setUsage(GLenum usage) +bool TextureCubeMap::isFaceLevelComplete(int faceIndex, int level) const { - mUsage = usage; - mTexture->setUsage(usage); + ASSERT(level >= 0 && faceIndex < 6 && level < IMPLEMENTATION_MAX_TEXTURE_LEVELS && mTexture->getImage(level, faceIndex) != NULL); + + if (isImmutable()) + { + return true; + } + + int baseSize = getBaseLevelWidth(); + + if (baseSize <= 0) + { + return false; + } + + // "isCubeComplete" checks for base level completeness and we must call that + // to determine if any face at level 0 is complete. We omit that check here + // to avoid re-checking cube-completeness for every face at level 0. + if (level == 0) + { + return true; + } + + // Check that non-zero levels are consistent with the base level. + const rx::Image *faceLevelImage = mTexture->getImage(level, faceIndex); + + if (faceLevelImage->getInternalFormat() != getBaseLevelInternalFormat()) + { + return false; + } + + if (faceLevelImage->getWidth() != std::max(1, baseSize >> level)) + { + return false; + } + + return true; } -bool Texture3D::hasDirtyImages() const + +Texture3D::Texture3D(rx::TextureImpl *impl, GLuint id) + : Texture(impl, id, GL_TEXTURE_3D) { - return mTexture->hasDirtyImages(); } -void Texture3D::resetDirty() +Texture3D::~Texture3D() { - mTexture->resetDirty(); } GLsizei Texture3D::getWidth(GLint level) const { - return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level)->getWidth() : 0; + return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level, 0)->getWidth() : 0; } GLsizei Texture3D::getHeight(GLint level) const { - return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level)->getHeight() : 0; + return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level, 0)->getHeight() : 0; } GLsizei Texture3D::getDepth(GLint level) const { - return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level)->getDepth() : 0; + return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level, 0)->getDepth() : 0; } GLenum Texture3D::getInternalFormat(GLint level) const { - return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level)->getInternalFormat() : GL_NONE; + return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level, 0)->getInternalFormat() : GL_NONE; } GLenum Texture3D::getActualFormat(GLint level) const { - return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level)->getActualFormat() : GL_NONE; + return (level < IMPLEMENTATION_MAX_TEXTURE_LEVELS) ? mTexture->getImage(level, 0)->getActualFormat() : GL_NONE; } bool Texture3D::isCompressed(GLint level) const { - return IsFormatCompressed(getInternalFormat(level)); + return GetInternalFormatInfo(getInternalFormat(level)).compressed; } bool Texture3D::isDepth(GLint level) const { - return GetDepthBits(getInternalFormat(level)) > 0; + return GetInternalFormatInfo(getInternalFormat(level)).depthBits > 0; } void Texture3D::setImage(GLint level, GLsizei width, GLsizei height, GLsizei depth, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->setImage(level, width, height, depth, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_3D, level, width, height, depth, internalFormat, format, type, unpack, pixels); } void Texture3D::setCompressedImage(GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei depth, GLsizei imageSize, const void *pixels) { - mTexture->setCompressedImage(level, format, width, height, depth, imageSize, pixels); + mTexture->setCompressedImage(GL_TEXTURE_3D, level, format, width, height, depth, imageSize, pixels); } void Texture3D::subImage(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->subImage(level, xoffset, yoffset, zoffset, width, height, depth, format, type, unpack, pixels); + mTexture->subImage(GL_TEXTURE_3D, level, xoffset, yoffset, zoffset, width, height, depth, format, type, unpack, pixels); } void Texture3D::subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels) { - mTexture->subImageCompressed(level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pixels); + mTexture->subImageCompressed(GL_TEXTURE_3D, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pixels); } void Texture3D::storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) { mImmutable = true; - mTexture->storage(levels, internalformat, width, height, depth); + mTexture->storage(GL_TEXTURE_3D, levels, internalformat, width, height, depth); } -void Texture3D::generateMipmaps() +bool Texture3D::isSamplerComplete(const SamplerState &samplerState, const TextureCapsMap &textureCaps, const Extensions &extensions, int clientVersion) const { - mTexture->generateMipmaps(); -} + GLsizei width = getBaseLevelWidth(); + GLsizei height = getBaseLevelHeight(); + GLsizei depth = getBaseLevelDepth(); -const rx::Image *Texture3D::getBaseLevelImage() const -{ - return mTexture->getImage(0); -} + if (width <= 0 || height <= 0 || depth <= 0) + { + return false; + } -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); -} + if (!textureCaps.get(getInternalFormat(0)).filterable && !IsPointSampled(samplerState)) + { + return false; + } -bool Texture3D::isSamplerComplete(const SamplerState &samplerState) const -{ - return mTexture->isSamplerComplete(samplerState); + if (IsMipmapFiltered(samplerState) && !isMipmapComplete()) + { + return false; + } + + return true; } bool Texture3D::isMipmapComplete() const { - return mTexture->isMipmapComplete(); -} + int levelCount = mipLevels(); -unsigned int Texture3D::getRenderTargetSerial(GLint level, GLint layer) -{ - return mTexture->getRenderTargetSerial(level, layer); -} + for (int level = 0; level < levelCount; level++) + { + if (!isLevelComplete(level)) + { + return false; + } + } -rx::RenderTarget *Texture3D::getRenderTarget(GLint level) -{ - return mTexture->getRenderTarget(level); + return true; } -rx::RenderTarget *Texture3D::getRenderTarget(GLint level, GLint layer) +bool Texture3D::isLevelComplete(int level) const { - return mTexture->getRenderTarget(level, layer); -} + ASSERT(level >= 0 && level < IMPLEMENTATION_MAX_TEXTURE_LEVELS && mTexture->getImage(level, 0) != NULL); -rx::RenderTarget *Texture3D::getDepthStencil(GLint level, GLint layer) -{ - return mTexture->getDepthStencil(level, layer); -} + if (isImmutable()) + { + return true; + } -Texture2DArray::Texture2DArray(rx::Texture2DArrayImpl *impl, GLuint id) - : Texture(id, GL_TEXTURE_2D_ARRAY), - mTexture(impl) -{ -} + GLsizei width = getBaseLevelWidth(); + GLsizei height = getBaseLevelHeight(); + GLsizei depth = getBaseLevelDepth(); -Texture2DArray::~Texture2DArray() -{ - SafeDelete(mTexture); -} + if (width <= 0 || height <= 0 || depth <= 0) + { + return false; + } -rx::TextureStorageInterface *Texture2DArray::getNativeTexture() -{ - return mTexture->getNativeTexture(); -} + if (level == 0) + { + return true; + } -void Texture2DArray::setUsage(GLenum usage) -{ - mUsage = usage; - mTexture->setUsage(usage); + rx::Image *levelImage = mTexture->getImage(level, 0); + + if (levelImage->getInternalFormat() != getBaseLevelInternalFormat()) + { + return false; + } + + if (levelImage->getWidth() != std::max(1, width >> level)) + { + return false; + } + + if (levelImage->getHeight() != std::max(1, height >> level)) + { + return false; + } + + if (levelImage->getDepth() != std::max(1, depth >> level)) + { + return false; + } + + return true; } -bool Texture2DArray::hasDirtyImages() const +Texture2DArray::Texture2DArray(rx::TextureImpl *impl, GLuint id) + : Texture(impl, id, GL_TEXTURE_2D_ARRAY) { - return mTexture->hasDirtyImages(); } -void Texture2DArray::resetDirty() +Texture2DArray::~Texture2DArray() { - mTexture->resetDirty(); } GLsizei Texture2DArray::getWidth(GLint level) const @@ -680,79 +884,124 @@ GLenum Texture2DArray::getActualFormat(GLint level) const bool Texture2DArray::isCompressed(GLint level) const { - return IsFormatCompressed(getInternalFormat(level)); + return GetInternalFormatInfo(getInternalFormat(level)).compressed; } bool Texture2DArray::isDepth(GLint level) const { - return GetDepthBits(getInternalFormat(level)) > 0; + return GetInternalFormatInfo(getInternalFormat(level)).depthBits > 0; } void Texture2DArray::setImage(GLint level, GLsizei width, GLsizei height, GLsizei depth, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->setImage(level, width, height, depth, internalFormat, format, type, unpack, pixels); + mTexture->setImage(GL_TEXTURE_2D_ARRAY, level, width, height, depth, internalFormat, format, type, unpack, pixels); } void Texture2DArray::setCompressedImage(GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei depth, GLsizei imageSize, const void *pixels) { - mTexture->setCompressedImage(level, format, width, height, depth, imageSize, pixels); + mTexture->setCompressedImage(GL_TEXTURE_2D_ARRAY, level, format, width, height, depth, imageSize, pixels); } void Texture2DArray::subImage(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) { - mTexture->subImage(level, xoffset, yoffset, zoffset, width, height, depth, format, type, unpack, pixels); + mTexture->subImage(GL_TEXTURE_2D_ARRAY, level, xoffset, yoffset, zoffset, width, height, depth, format, type, unpack, pixels); } void Texture2DArray::subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels) { - mTexture->subImageCompressed(level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pixels); + mTexture->subImageCompressed(GL_TEXTURE_2D_ARRAY, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pixels); } void Texture2DArray::storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) { mImmutable = true; - mTexture->storage(levels, internalformat, width, height, depth); + mTexture->storage(GL_TEXTURE_2D_ARRAY, levels, internalformat, width, height, depth); } -void Texture2DArray::generateMipmaps() +bool Texture2DArray::isSamplerComplete(const SamplerState &samplerState, const TextureCapsMap &textureCaps, const Extensions &extensions, int clientVersion) const { - mTexture->generateMipmaps(); -} + GLsizei width = getBaseLevelWidth(); + GLsizei height = getBaseLevelHeight(); + GLsizei depth = getLayers(0); -const rx::Image *Texture2DArray::getBaseLevelImage() const -{ - return (mTexture->getLayerCount(0) > 0 ? mTexture->getImage(0, 0) : NULL); -} + if (width <= 0 || height <= 0 || depth <= 0) + { + return false; + } -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); -} + if (!textureCaps.get(getBaseLevelInternalFormat()).filterable && !IsPointSampled(samplerState)) + { + return false; + } -bool Texture2DArray::isSamplerComplete(const SamplerState &samplerState) const -{ - return mTexture->isSamplerComplete(samplerState); + if (IsMipmapFiltered(samplerState) && !isMipmapComplete()) + { + return false; + } + + return true; } bool Texture2DArray::isMipmapComplete() const { - return mTexture->isMipmapComplete(); -} + int levelCount = mipLevels(); -unsigned int Texture2DArray::getRenderTargetSerial(GLint level, GLint layer) -{ - return mTexture->getRenderTargetSerial(level, layer); -} + for (int level = 1; level < levelCount; level++) + { + if (!isLevelComplete(level)) + { + return false; + } + } -rx::RenderTarget *Texture2DArray::getRenderTarget(GLint level, GLint layer) -{ - return mTexture->getRenderTarget(level, layer); + return true; } -rx::RenderTarget *Texture2DArray::getDepthStencil(GLint level, GLint layer) +bool Texture2DArray::isLevelComplete(int level) const { - return mTexture->getDepthStencil(level, layer); + ASSERT(level >= 0 && level < IMPLEMENTATION_MAX_TEXTURE_LEVELS); + + if (isImmutable()) + { + return true; + } + + GLsizei width = getBaseLevelWidth(); + GLsizei height = getBaseLevelHeight(); + GLsizei layers = getLayers(0); + + if (width <= 0 || height <= 0 || layers <= 0) + { + return false; + } + + if (level == 0) + { + return true; + } + + if (getInternalFormat(level) != getInternalFormat(0)) + { + return false; + } + + if (getWidth(level) != std::max(1, width >> level)) + { + return false; + } + + if (getHeight(level) != std::max(1, height >> level)) + { + return false; + } + + if (getLayers(level) != layers) + { + return false; + } + + return true; } } |