TextureGL implementation.
BUG=angleproject:884
Change-Id: I877c0a9f753dacff96bbb82486bee71d1996ecb7
Reviewed-on: https://chromium-review.googlesource.com/252982
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/renderer/gl/TextureGL.cpp b/src/libANGLE/renderer/gl/TextureGL.cpp
index ad22400..5b4f04e 100644
--- a/src/libANGLE/renderer/gl/TextureGL.cpp
+++ b/src/libANGLE/renderer/gl/TextureGL.cpp
@@ -9,73 +9,194 @@
#include "libANGLE/renderer/gl/TextureGL.h"
#include "common/debug.h"
+#include "common/utilities.h"
#include "libANGLE/State.h"
+#include "libANGLE/angletypes.h"
+#include "libANGLE/formatutils.h"
+#include "libANGLE/renderer/gl/BufferGL.h"
+#include "libANGLE/renderer/gl/FunctionsGL.h"
+#include "libANGLE/renderer/gl/StateManagerGL.h"
namespace rx
{
-TextureGL::TextureGL()
- : TextureImpl()
-{}
+static void SetUnpackStateForTexImage(StateManagerGL *stateManager, const gl::PixelUnpackState &unpack)
+{
+ const gl::Buffer *unpackBuffer = unpack.pixelBuffer.get();
+ if (unpackBuffer != nullptr)
+ {
+ UNIMPLEMENTED();
+ }
+ if (unpack.skipRows != 0 || unpack.skipPixels != 0 || unpack.imageHeight != 0 || unpack.skipImages != 0)
+ {
+ UNIMPLEMENTED();
+ }
+ stateManager->setPixelUnpackState(unpack.alignment, unpack.rowLength);
+}
+
+static bool UseTexImage2D(GLenum textureType)
+{
+ return textureType == GL_TEXTURE_2D || textureType == GL_TEXTURE_CUBE_MAP;
+}
+
+static bool UseTexImage3D(GLenum textureType)
+{
+ return textureType == GL_TEXTURE_2D_ARRAY || textureType == GL_TEXTURE_3D;
+}
+
+static bool CompatableTextureTarget(GLenum textureType, GLenum textureTarget)
+{
+ if (textureType != GL_TEXTURE_CUBE_MAP)
+ {
+ return textureType == textureTarget;
+ }
+ else
+ {
+ return gl::IsCubeMapTextureTarget(textureType);
+ }
+}
+
+TextureGL::TextureGL(GLenum type, const FunctionsGL *functions, StateManagerGL *stateManager)
+ : TextureImpl(),
+ mTextureType(type),
+ mFunctions(functions),
+ mStateManager(stateManager),
+ mAppliedSamplerState(),
+ mTextureID(0)
+{
+ ASSERT(mFunctions);
+ ASSERT(mStateManager);
+
+ mFunctions->genTextures(1, &mTextureID);
+}
TextureGL::~TextureGL()
-{}
+{
+ if (mTextureID)
+ {
+ mFunctions->deleteTextures(1, &mTextureID);
+ mTextureID = 0;
+ }
+}
void TextureGL::setUsage(GLenum usage)
{
- UNIMPLEMENTED();
+ // GL_ANGLE_texture_usage not implemented for desktop GL
+ UNREACHABLE();
}
gl::Error TextureGL::setImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size, GLenum format, GLenum type,
const gl::PixelUnpackState &unpack, const uint8_t *pixels)
{
- if (unpack.skipRows != 0 || unpack.skipPixels != 0 || unpack.imageHeight != 0 || unpack.skipImages != 0)
+ ASSERT(CompatableTextureTarget(mTextureType, target));
+
+ SetUnpackStateForTexImage(mStateManager, unpack);
+
+ mStateManager->bindTexture(mTextureType, mTextureID);
+ if (UseTexImage2D(mTextureType))
{
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION, "unimplemented pixel store state");
+ ASSERT(size.depth == 1);
+ mFunctions->texImage2D(target, level, internalFormat, size.width, size.height, 0, format, type, pixels);
+ }
+ else if (UseTexImage3D(mTextureType))
+ {
+ mFunctions->texImage3D(target, level, internalFormat, size.width, size.height, size.depth, 0, format, type, pixels);
+ }
+ else
+ {
+ UNREACHABLE();
}
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION);
+ return gl::Error(GL_NO_ERROR);
}
gl::Error TextureGL::setSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format, GLenum type,
const gl::PixelUnpackState &unpack, const uint8_t *pixels)
{
- if (unpack.skipRows != 0 || unpack.skipPixels != 0 || unpack.imageHeight != 0 || unpack.skipImages != 0)
+ ASSERT(CompatableTextureTarget(mTextureType, target));
+
+ SetUnpackStateForTexImage(mStateManager, unpack);
+
+ mStateManager->bindTexture(mTextureType, mTextureID);
+ if (UseTexImage2D(mTextureType))
{
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION, "unimplemented pixel store state");
+ ASSERT(area.z == 0 && area.depth == 1);
+ mFunctions->texSubImage2D(target, level, area.x, area.y, area.width, area.height, format, type, pixels);
+ }
+ else if (UseTexImage3D(mTextureType))
+ {
+ mFunctions->texSubImage3D(target, level, area.x, area.y, area.z, area.width, area.height, area.depth,
+ format, type, pixels);
+ }
+ else
+ {
+ UNREACHABLE();
}
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION);
+ return gl::Error(GL_NO_ERROR);
}
gl::Error TextureGL::setCompressedImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size,
const gl::PixelUnpackState &unpack, const uint8_t *pixels)
{
- if (unpack.skipRows != 0 || unpack.skipPixels != 0 || unpack.imageHeight != 0 || unpack.skipImages != 0)
+ ASSERT(CompatableTextureTarget(mTextureType, target));
+
+ SetUnpackStateForTexImage(mStateManager, unpack);
+
+ const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(internalFormat);
+ size_t depthPitch = internalFormatInfo.computeDepthPitch(GL_UNSIGNED_BYTE, size.width, size.height,
+ unpack.alignment, unpack.rowLength);
+ size_t dataSize = internalFormatInfo.computeBlockSize(GL_UNSIGNED_BYTE, size.width, size.height) * depthPitch;
+
+ mStateManager->bindTexture(mTextureType, mTextureID);
+ if (UseTexImage2D(mTextureType))
{
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION, "unimplemented pixel store state");
+ ASSERT(size.depth == 1);
+ mFunctions->compressedTexImage2D(target, level, internalFormat, size.width, size.height, 0, dataSize, pixels);
+ }
+ else if (UseTexImage3D(mTextureType))
+ {
+ mFunctions->compressedTexImage3D(target, level, internalFormat, size.width, size.height, size.depth, 0,
+ dataSize, pixels);
+ }
+ else
+ {
+ UNREACHABLE();
}
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION);
+ return gl::Error(GL_NO_ERROR);
}
gl::Error TextureGL::setCompressedSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format,
const gl::PixelUnpackState &unpack, const uint8_t *pixels)
{
- if (unpack.skipRows != 0 || unpack.skipPixels != 0 || unpack.imageHeight != 0 || unpack.skipImages != 0)
+ ASSERT(CompatableTextureTarget(mTextureType, target));
+
+ SetUnpackStateForTexImage(mStateManager, unpack);
+
+ const gl::InternalFormat &internalFormatInfo = gl::GetInternalFormatInfo(format);
+ size_t depthPitch = internalFormatInfo.computeDepthPitch(GL_UNSIGNED_BYTE, area.width, area.height,
+ unpack.alignment, unpack.rowLength);
+ size_t dataSize = internalFormatInfo.computeBlockSize(GL_UNSIGNED_BYTE, area.width, area.height) * depthPitch;
+
+ mStateManager->bindTexture(mTextureType, mTextureID);
+ if (UseTexImage2D(mTextureType))
{
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION, "unimplemented pixel store state");
+ ASSERT(area.z == 0 && area.depth == 1);
+ mFunctions->compressedTexSubImage2D(target, level, area.x, area.y, area.width, area.height, format, dataSize,
+ pixels);
+ }
+ else if (UseTexImage3D(mTextureType))
+ {
+ mFunctions->compressedTexSubImage3D(target, level, area.x, area.y, area.z, area.width, area.height, area.depth,
+ format, dataSize, pixels);
+ }
+ else
+ {
+ UNREACHABLE();
}
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION);
+ return gl::Error(GL_NO_ERROR);
}
gl::Error TextureGL::copyImage(GLenum target, size_t level, const gl::Rectangle &sourceArea, GLenum internalFormat,
@@ -94,14 +215,32 @@
gl::Error TextureGL::setStorage(GLenum target, size_t levels, GLenum internalFormat, const gl::Extents &size)
{
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION);
+ // TODO: emulate texture storage with TexImage calls if on GL version <4.2 or the
+ // ARB_texture_storage extension is not available.
+
+ mStateManager->bindTexture(mTextureType, mTextureID);
+ if (UseTexImage2D(mTextureType))
+ {
+ ASSERT(size.depth == 1);
+ mFunctions->texStorage2D(target, levels, internalFormat, size.width, size.height);
+ }
+ else if (UseTexImage3D(mTextureType))
+ {
+ mFunctions->texStorage3D(target, levels, internalFormat, size.width, size.height, size.depth);
+ }
+ else
+ {
+ UNREACHABLE();
+ }
+
+ return gl::Error(GL_NO_ERROR);
}
gl::Error TextureGL::generateMipmaps()
{
- UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION);
+ mStateManager->bindTexture(mTextureType, mTextureID);
+ mFunctions->generateMipmap(mTextureType);
+ return gl::Error(GL_NO_ERROR);
}
void TextureGL::bindTexImage(egl::Surface *surface)
@@ -114,4 +253,45 @@
UNIMPLEMENTED();
}
+template <typename T>
+static inline void SyncSamplerStateMember(const FunctionsGL *functions, const gl::SamplerState &newState,
+ gl::SamplerState &curState, GLenum textureType, GLenum name,
+ T(gl::SamplerState::*samplerMember))
+{
+ if (curState.*samplerMember != newState.*samplerMember)
+ {
+ curState.*samplerMember = newState.*samplerMember;
+ functions->texParameterf(textureType, name, curState.*samplerMember);
+ }
+}
+
+void TextureGL::syncSamplerState(const gl::SamplerState &samplerState) const
+{
+ if (mAppliedSamplerState != samplerState)
+ {
+ mStateManager->bindTexture(mTextureType, mTextureID);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_MIN_FILTER, &gl::SamplerState::minFilter);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_MAG_FILTER, &gl::SamplerState::magFilter);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_WRAP_S, &gl::SamplerState::wrapS);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_WRAP_T, &gl::SamplerState::wrapT);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_WRAP_R, &gl::SamplerState::wrapR);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_MAX_ANISOTROPY_EXT, &gl::SamplerState::maxAnisotropy);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_BASE_LEVEL, &gl::SamplerState::baseLevel);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_MAX_LEVEL, &gl::SamplerState::maxLevel);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_MIN_LOD, &gl::SamplerState::minLod);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_MAX_LOD, &gl::SamplerState::maxLod);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_COMPARE_MODE, &gl::SamplerState::compareMode);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_COMPARE_FUNC, &gl::SamplerState::compareFunc);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_SWIZZLE_R, &gl::SamplerState::swizzleRed);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_SWIZZLE_G, &gl::SamplerState::swizzleGreen);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_SWIZZLE_B, &gl::SamplerState::swizzleBlue);
+ SyncSamplerStateMember(mFunctions, samplerState, mAppliedSamplerState, mTextureType, GL_TEXTURE_SWIZZLE_A, &gl::SamplerState::swizzleAlpha);
+ }
+}
+
+GLuint TextureGL::getTextureID() const
+{
+ return mTextureID;
+}
+
}