Use packed enums for the texture types and targets, part 1
In OpenGL there are two enum "sets" used by the API that are very
similar: texture types (or bind point) and texture targets. They only
differ in that texture types have GL_TEXTURE_CUBEMAP and target have
GL_TEXTURE_CUBEMAP_[POSITIVE|NEGATIVE]_[X|Y|Z].
This is a problem because in ANGLE we use GLenum to pass around both
types of data, making it difficult to know which of type and target a
variable is.
In addition these enums are placed somewhat randomly in the space of
OpenGL enums, making it slow to have a mapping from texture types to
some data. Such a mapping is in hot-code with gl::State::mTextures.
This commit stack makes the texture types and target enums be
translated to internal packed enums right at the OpenGL entry point
and used throughout ANGLE to have type safety and performance gains.
This is the first of two commit which does the refactor for all of the
validation and stops inside gl::Context. This was the best place to
split patches without having many conversions from packed enums to GL
enums.
BUG=angleproject:2169
Change-Id: Ib43da7e71c253bd9fe210fb0ec0de61bc286e6d3
Reviewed-on: https://chromium-review.googlesource.com/758835
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index 7a10467..e854012 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -311,25 +311,25 @@
// objects all of whose names are 0.
Texture *zeroTexture2D = new Texture(mImplementation.get(), 0, GL_TEXTURE_2D);
- mZeroTextures[GL_TEXTURE_2D].set(this, zeroTexture2D);
+ mZeroTextures[TextureType::_2D].set(this, zeroTexture2D);
Texture *zeroTextureCube = new Texture(mImplementation.get(), 0, GL_TEXTURE_CUBE_MAP);
- mZeroTextures[GL_TEXTURE_CUBE_MAP].set(this, zeroTextureCube);
+ mZeroTextures[TextureType::CubeMap].set(this, zeroTextureCube);
if (getClientVersion() >= Version(3, 0))
{
// TODO: These could also be enabled via extension
Texture *zeroTexture3D = new Texture(mImplementation.get(), 0, GL_TEXTURE_3D);
- mZeroTextures[GL_TEXTURE_3D].set(this, zeroTexture3D);
+ mZeroTextures[TextureType::_3D].set(this, zeroTexture3D);
Texture *zeroTexture2DArray = new Texture(mImplementation.get(), 0, GL_TEXTURE_2D_ARRAY);
- mZeroTextures[GL_TEXTURE_2D_ARRAY].set(this, zeroTexture2DArray);
+ mZeroTextures[TextureType::_2DArray].set(this, zeroTexture2DArray);
}
if (getClientVersion() >= Version(3, 1))
{
Texture *zeroTexture2DMultisample =
new Texture(mImplementation.get(), 0, GL_TEXTURE_2D_MULTISAMPLE);
- mZeroTextures[GL_TEXTURE_2D_MULTISAMPLE].set(this, zeroTexture2DMultisample);
+ mZeroTextures[TextureType::_2DMultisample].set(this, zeroTexture2DMultisample);
for (unsigned int i = 0; i < mCaps.maxAtomicCounterBufferBindings; i++)
{
@@ -347,14 +347,14 @@
{
Texture *zeroTextureRectangle =
new Texture(mImplementation.get(), 0, GL_TEXTURE_RECTANGLE_ANGLE);
- mZeroTextures[GL_TEXTURE_RECTANGLE_ANGLE].set(this, zeroTextureRectangle);
+ mZeroTextures[TextureType::Rectangle].set(this, zeroTextureRectangle);
}
if (nativeExtensions.eglImageExternal || nativeExtensions.eglStreamConsumerExternal)
{
Texture *zeroTextureExternal =
new Texture(mImplementation.get(), 0, GL_TEXTURE_EXTERNAL_OES);
- mZeroTextures[GL_TEXTURE_EXTERNAL_OES].set(this, zeroTextureExternal);
+ mZeroTextures[TextureType::External].set(this, zeroTextureExternal);
}
mGLState.initializeZeroTextures(this, mZeroTextures);
@@ -459,10 +459,12 @@
for (auto &zeroTexture : mZeroTextures)
{
- ANGLE_TRY(zeroTexture.second->onDestroy(this));
- zeroTexture.second.set(this, nullptr);
+ if (zeroTexture.get() != nullptr)
+ {
+ ANGLE_TRY(zeroTexture->onDestroy(this));
+ zeroTexture.set(this, nullptr);
+ }
}
- mZeroTextures.clear();
SafeDelete(mSurfacelessFramebuffer);
@@ -966,7 +968,7 @@
return mState.mSamplers->isSampler(samplerName);
}
-void Context::bindTexture(GLenum target, GLuint handle)
+void Context::bindTexture(TextureType target, GLuint handle)
{
Texture *texture = nullptr;
@@ -976,7 +978,8 @@
}
else
{
- texture = mState.mTextures->checkTextureAllocation(mImplementation.get(), handle, target);
+ texture = mState.mTextures->checkTextureAllocation(mImplementation.get(), handle,
+ ToGLenum(target));
}
ASSERT(texture);
@@ -1170,13 +1173,13 @@
return mQueryMap.query(handle);
}
-Texture *Context::getTargetTexture(GLenum target) const
+Texture *Context::getTargetTexture(TextureType type) const
{
- ASSERT(ValidTextureTarget(this, target) || ValidTextureExternalTarget(this, target));
- return mGLState.getTargetTexture(target);
+ ASSERT(ValidTextureTarget(this, type) || ValidTextureExternalTarget(this, type));
+ return mGLState.getTargetTexture(type);
}
-Texture *Context::getSamplerTexture(unsigned int sampler, GLenum type) const
+Texture *Context::getSamplerTexture(unsigned int sampler, TextureType type) const
{
return mGLState.getSamplerTexture(sampler, type);
}
@@ -1725,54 +1728,55 @@
QueryRenderbufferiv(this, renderbuffer, pname, params);
}
-void Context::getTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
+void Context::getTexParameterfv(TextureType target, GLenum pname, GLfloat *params)
{
Texture *texture = getTargetTexture(target);
QueryTexParameterfv(texture, pname, params);
}
-void Context::getTexParameteriv(GLenum target, GLenum pname, GLint *params)
+void Context::getTexParameteriv(TextureType target, GLenum pname, GLint *params)
{
Texture *texture = getTargetTexture(target);
QueryTexParameteriv(texture, pname, params);
}
-void Context::getTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
+void Context::getTexLevelParameteriv(TextureTarget target, GLint level, GLenum pname, GLint *params)
{
- Texture *texture =
- getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
- QueryTexLevelParameteriv(texture, target, level, pname, params);
+ Texture *texture = getTargetTexture(TextureTargetToType(target));
+ QueryTexLevelParameteriv(texture, ToGLenum(target), level, pname, params);
}
-void Context::getTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
+void Context::getTexLevelParameterfv(TextureTarget target,
+ GLint level,
+ GLenum pname,
+ GLfloat *params)
{
- Texture *texture =
- getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
- QueryTexLevelParameterfv(texture, target, level, pname, params);
+ Texture *texture = getTargetTexture(TextureTargetToType(target));
+ QueryTexLevelParameterfv(texture, ToGLenum(target), level, pname, params);
}
-void Context::texParameterf(GLenum target, GLenum pname, GLfloat param)
+void Context::texParameterf(TextureType target, GLenum pname, GLfloat param)
{
Texture *texture = getTargetTexture(target);
SetTexParameterf(this, texture, pname, param);
onTextureChange(texture);
}
-void Context::texParameterfv(GLenum target, GLenum pname, const GLfloat *params)
+void Context::texParameterfv(TextureType target, GLenum pname, const GLfloat *params)
{
Texture *texture = getTargetTexture(target);
SetTexParameterfv(this, texture, pname, params);
onTextureChange(texture);
}
-void Context::texParameteri(GLenum target, GLenum pname, GLint param)
+void Context::texParameteri(TextureType target, GLenum pname, GLint param)
{
Texture *texture = getTargetTexture(target);
SetTexParameteri(this, texture, pname, param);
onTextureChange(texture);
}
-void Context::texParameteriv(GLenum target, GLenum pname, const GLint *params)
+void Context::texParameteriv(TextureType target, GLenum pname, const GLint *params)
{
Texture *texture = getTargetTexture(target);
SetTexParameteriv(this, texture, pname, params);
@@ -2628,7 +2632,10 @@
mState.mTextures->signalAllTexturesDirty(this);
for (auto &zeroTexture : mZeroTextures)
{
- zeroTexture.second->signalDirty(this, InitState::Initialized);
+ if (zeroTexture.get() != nullptr)
+ {
+ zeroTexture->signalDirty(this, InitState::Initialized);
+ }
}
mState.mFramebuffers->invalidateFramebufferComplenessCache();
@@ -3021,7 +3028,7 @@
handleError(readFBO->readPixels(this, area, format, type, pixels));
}
-void Context::copyTexImage2D(GLenum target,
+void Context::copyTexImage2D(TextureTarget target,
GLint level,
GLenum internalformat,
GLint x,
@@ -3036,12 +3043,12 @@
Rectangle sourceArea(x, y, width, height);
Framebuffer *framebuffer = mGLState.getReadFramebuffer();
- Texture *texture =
- getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
- handleError(texture->copyImage(this, target, level, sourceArea, internalformat, framebuffer));
+ Texture *texture = getTargetTexture(TextureTargetToType(target));
+ handleError(
+ texture->copyImage(this, ToGLenum(target), level, sourceArea, internalformat, framebuffer));
}
-void Context::copyTexSubImage2D(GLenum target,
+void Context::copyTexSubImage2D(TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -3062,12 +3069,12 @@
Rectangle sourceArea(x, y, width, height);
Framebuffer *framebuffer = mGLState.getReadFramebuffer();
- Texture *texture =
- getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
- handleError(texture->copySubImage(this, target, level, destOffset, sourceArea, framebuffer));
+ Texture *texture = getTargetTexture(TextureTargetToType(target));
+ handleError(
+ texture->copySubImage(this, ToGLenum(target), level, destOffset, sourceArea, framebuffer));
}
-void Context::copyTexSubImage3D(GLenum target,
+void Context::copyTexSubImage3D(TextureType target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -3090,12 +3097,13 @@
Framebuffer *framebuffer = mGLState.getReadFramebuffer();
Texture *texture = getTargetTexture(target);
- handleError(texture->copySubImage(this, target, level, destOffset, sourceArea, framebuffer));
+ handleError(
+ texture->copySubImage(this, ToGLenum(target), level, destOffset, sourceArea, framebuffer));
}
void Context::framebufferTexture2D(GLenum target,
GLenum attachment,
- GLenum textarget,
+ TextureTarget textarget,
GLuint texture,
GLint level)
{
@@ -3108,23 +3116,23 @@
ImageIndex index = ImageIndex::MakeInvalid();
- if (textarget == GL_TEXTURE_2D)
+ if (textarget == TextureTarget::_2D)
{
index = ImageIndex::Make2D(level);
}
- else if (textarget == GL_TEXTURE_RECTANGLE_ANGLE)
+ else if (textarget == TextureTarget::Rectangle)
{
index = ImageIndex::MakeRectangle(level);
}
- else if (textarget == GL_TEXTURE_2D_MULTISAMPLE)
+ else if (textarget == TextureTarget::_2DMultisample)
{
ASSERT(level == 0);
index = ImageIndex::Make2DMultisample();
}
else
{
- ASSERT(IsCubeMapTextureTarget(textarget));
- index = ImageIndex::MakeCube(textarget, level);
+ ASSERT(TextureTargetToType(textarget) == TextureType::CubeMap);
+ index = ImageIndex::MakeCube(ToGLenum(textarget), level);
}
framebuffer->setAttachment(this, GL_TEXTURE, attachment, index, textureObj);
@@ -3316,7 +3324,7 @@
handleError(framebuffer->invalidateSub(this, numAttachments, attachments, area));
}
-void Context::texImage2D(GLenum target,
+void Context::texImage2D(TextureTarget target,
GLint level,
GLint internalformat,
GLsizei width,
@@ -3329,13 +3337,13 @@
syncStateForTexImage();
Extents size(width, height, 1);
- Texture *texture =
- getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
- handleError(texture->setImage(this, mGLState.getUnpackState(), target, level, internalformat,
- size, format, type, reinterpret_cast<const uint8_t *>(pixels)));
+ Texture *texture = getTargetTexture(TextureTargetToType(target));
+ handleError(texture->setImage(this, mGLState.getUnpackState(), ToGLenum(target), level,
+ internalformat, size, format, type,
+ reinterpret_cast<const uint8_t *>(pixels)));
}
-void Context::texImage3D(GLenum target,
+void Context::texImage3D(TextureType target,
GLint level,
GLint internalformat,
GLsizei width,
@@ -3350,11 +3358,12 @@
Extents size(width, height, depth);
Texture *texture = getTargetTexture(target);
- handleError(texture->setImage(this, mGLState.getUnpackState(), target, level, internalformat,
- size, format, type, reinterpret_cast<const uint8_t *>(pixels)));
+ handleError(texture->setImage(this, mGLState.getUnpackState(), ToGLenum(target), level,
+ internalformat, size, format, type,
+ reinterpret_cast<const uint8_t *>(pixels)));
}
-void Context::texSubImage2D(GLenum target,
+void Context::texSubImage2D(TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -3373,13 +3382,12 @@
syncStateForTexImage();
Box area(xoffset, yoffset, 0, width, height, 1);
- Texture *texture =
- getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
- handleError(texture->setSubImage(this, mGLState.getUnpackState(), target, level, area, format,
- type, reinterpret_cast<const uint8_t *>(pixels)));
+ Texture *texture = getTargetTexture(TextureTargetToType(target));
+ handleError(texture->setSubImage(this, mGLState.getUnpackState(), ToGLenum(target), level, area,
+ format, type, reinterpret_cast<const uint8_t *>(pixels)));
}
-void Context::texSubImage3D(GLenum target,
+void Context::texSubImage3D(TextureType target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -3401,11 +3409,11 @@
Box area(xoffset, yoffset, zoffset, width, height, depth);
Texture *texture = getTargetTexture(target);
- handleError(texture->setSubImage(this, mGLState.getUnpackState(), target, level, area, format,
- type, reinterpret_cast<const uint8_t *>(pixels)));
+ handleError(texture->setSubImage(this, mGLState.getUnpackState(), ToGLenum(target), level, area,
+ format, type, reinterpret_cast<const uint8_t *>(pixels)));
}
-void Context::compressedTexImage2D(GLenum target,
+void Context::compressedTexImage2D(TextureTarget target,
GLint level,
GLenum internalformat,
GLsizei width,
@@ -3417,14 +3425,13 @@
syncStateForTexImage();
Extents size(width, height, 1);
- Texture *texture =
- getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
- handleError(texture->setCompressedImage(this, mGLState.getUnpackState(), target, level,
- internalformat, size, imageSize,
+ Texture *texture = getTargetTexture(TextureTargetToType(target));
+ handleError(texture->setCompressedImage(this, mGLState.getUnpackState(), ToGLenum(target),
+ level, internalformat, size, imageSize,
reinterpret_cast<const uint8_t *>(data)));
}
-void Context::compressedTexImage3D(GLenum target,
+void Context::compressedTexImage3D(TextureType target,
GLint level,
GLenum internalformat,
GLsizei width,
@@ -3438,12 +3445,12 @@
Extents size(width, height, depth);
Texture *texture = getTargetTexture(target);
- handleError(texture->setCompressedImage(this, mGLState.getUnpackState(), target, level,
- internalformat, size, imageSize,
+ handleError(texture->setCompressedImage(this, mGLState.getUnpackState(), ToGLenum(target),
+ level, internalformat, size, imageSize,
reinterpret_cast<const uint8_t *>(data)));
}
-void Context::compressedTexSubImage2D(GLenum target,
+void Context::compressedTexSubImage2D(TextureTarget target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -3456,14 +3463,13 @@
syncStateForTexImage();
Box area(xoffset, yoffset, 0, width, height, 1);
- Texture *texture =
- getTargetTexture(IsCubeMapTextureTarget(target) ? GL_TEXTURE_CUBE_MAP : target);
- handleError(texture->setCompressedSubImage(this, mGLState.getUnpackState(), target, level, area,
- format, imageSize,
+ Texture *texture = getTargetTexture(TextureTargetToType(target));
+ handleError(texture->setCompressedSubImage(this, mGLState.getUnpackState(), ToGLenum(target),
+ level, area, format, imageSize,
reinterpret_cast<const uint8_t *>(data)));
}
-void Context::compressedTexSubImage3D(GLenum target,
+void Context::compressedTexSubImage3D(TextureType target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -3485,12 +3491,12 @@
Box area(xoffset, yoffset, zoffset, width, height, depth);
Texture *texture = getTargetTexture(target);
- handleError(texture->setCompressedSubImage(this, mGLState.getUnpackState(), target, level, area,
- format, imageSize,
+ handleError(texture->setCompressedSubImage(this, mGLState.getUnpackState(), ToGLenum(target),
+ level, area, format, imageSize,
reinterpret_cast<const uint8_t *>(data)));
}
-void Context::generateMipmap(GLenum target)
+void Context::generateMipmap(TextureType target)
{
Texture *texture = getTargetTexture(target);
handleError(texture->generateMipmap(this));
@@ -4211,7 +4217,7 @@
mGLState.setRenderbufferBinding(this, object);
}
-void Context::texStorage2DMultisample(GLenum target,
+void Context::texStorage2DMultisample(TextureType target,
GLsizei samples,
GLenum internalformat,
GLsizei width,
@@ -4220,8 +4226,8 @@
{
Extents size(width, height, 1);
Texture *texture = getTargetTexture(target);
- handleError(texture->setStorageMultisample(this, target, samples, internalformat, size,
- ConvertToBool(fixedsamplelocations)));
+ handleError(texture->setStorageMultisample(this, ToGLenum(target), samples, internalformat,
+ size, ConvertToBool(fixedsamplelocations)));
}
void Context::getMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
@@ -4334,7 +4340,7 @@
handleError(mImplementation->dispatchComputeIndirect(this, indirect));
}
-void Context::texStorage2D(GLenum target,
+void Context::texStorage2D(TextureType target,
GLsizei levels,
GLenum internalFormat,
GLsizei width,
@@ -4342,10 +4348,10 @@
{
Extents size(width, height, 1);
Texture *texture = getTargetTexture(target);
- handleError(texture->setStorage(this, target, levels, internalFormat, size));
+ handleError(texture->setStorage(this, ToGLenum(target), levels, internalFormat, size));
}
-void Context::texStorage3D(GLenum target,
+void Context::texStorage3D(TextureType target,
GLsizei levels,
GLenum internalFormat,
GLsizei width,
@@ -4354,7 +4360,7 @@
{
Extents size(width, height, depth);
Texture *texture = getTargetTexture(target);
- handleError(texture->setStorage(this, target, levels, internalFormat, size));
+ handleError(texture->setStorage(this, ToGLenum(target), levels, internalFormat, size));
}
void Context::memoryBarrier(GLbitfield barriers)
@@ -5847,11 +5853,11 @@
return result;
}
-void Context::eGLImageTargetTexture2D(GLenum target, GLeglImageOES image)
+void Context::eGLImageTargetTexture2D(TextureType target, GLeglImageOES image)
{
Texture *texture = getTargetTexture(target);
egl::Image *imageObject = reinterpret_cast<egl::Image *>(image);
- handleError(texture->setEGLImageTarget(this, target, imageObject));
+ handleError(texture->setEGLImageTarget(this, ToGLenum(target), imageObject));
}
void Context::eGLImageTargetRenderbufferStorage(GLenum target, GLeglImageOES image)
@@ -6026,7 +6032,7 @@
UNIMPLEMENTED();
}
-void Context::getTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
+void Context::getTexParameterxv(TextureType target, GLenum pname, GLfixed *params)
{
UNIMPLEMENTED();
}
@@ -6276,12 +6282,12 @@
UNIMPLEMENTED();
}
-void Context::texParameterx(GLenum target, GLenum pname, GLfixed param)
+void Context::texParameterx(TextureType target, GLenum pname, GLfixed param)
{
UNIMPLEMENTED();
}
-void Context::texParameterxv(GLenum target, GLenum pname, const GLfixed *params)
+void Context::texParameterxv(TextureType target, GLenum pname, const GLfixed *params)
{
UNIMPLEMENTED();
}