Add validation and negative tests for multisample arrays
This adds errors for binding and allocating multisample array
textures. New tests in TextureMultisampleTest.cpp check that the
errors are generated as specified.
Tests for querying supported sample counts are also improved and
extended for multisample array textures.
BUG=angleproject:2775
TEST=angle_end2end_tests
Change-Id: I6a0fe7ae04bb3d0072f6cbe09026b05e2bc47325
Reviewed-on: https://chromium-review.googlesource.com/1188576
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/validationES31.cpp b/src/libANGLE/validationES31.cpp
index 9dc1230..e7ebf43 100644
--- a/src/libANGLE/validationES31.cpp
+++ b/src/libANGLE/validationES31.cpp
@@ -1025,65 +1025,7 @@
return false;
}
- const Caps &caps = context->getCaps();
- if (static_cast<GLuint>(width) > caps.max2DTextureSize ||
- static_cast<GLuint>(height) > caps.max2DTextureSize)
- {
- context
- ->handleError(InvalidValue()
- << "Width and height must be less than or equal to GL_MAX_TEXTURE_SIZE.");
- return false;
- }
-
- if (samples == 0)
- {
- context->handleError(InvalidValue() << "Samples may not be zero.");
- return false;
- }
-
- const TextureCaps &formatCaps = context->getTextureCaps().get(internalFormat);
- if (!formatCaps.textureAttachment)
- {
- context->handleError(InvalidEnum() << "SizedInternalformat must be color-renderable, "
- "depth-renderable, or stencil-renderable.");
- return false;
- }
-
- // The ES3.1 spec(section 8.8) states that an INVALID_ENUM error is generated if internalformat
- // is one of the unsized base internalformats listed in table 8.11.
- const InternalFormat &formatInfo = GetSizedInternalFormatInfo(internalFormat);
- if (formatInfo.internalFormat == GL_NONE)
- {
- context->handleError(
- InvalidEnum()
- << "Internalformat is one of the unsupported unsized base internalformats.");
- return false;
- }
-
- if (static_cast<GLuint>(samples) > formatCaps.getMaxSamples())
- {
- context->handleError(
- InvalidOperation()
- << "Samples must not be greater than maximum supported value for the format.");
- return false;
- }
-
- Texture *texture = context->getTargetTexture(target);
- if (!texture || texture->id() == 0)
- {
- context->handleError(InvalidOperation() << "Zero is bound to target.");
- return false;
- }
-
- if (texture->getImmutableFormat())
- {
- context->handleError(InvalidOperation() << "The value of TEXTURE_IMMUTABLE_FORMAT for "
- "the texture currently bound to target on "
- "the active texture unit is true.");
- return false;
- }
-
- return true;
+ return ValidateTexStorageMultisample(context, target, samples, internalFormat, width, height);
}
bool ValidateGetMultisamplefv(Context *context, GLenum pname, GLuint index, GLfloat *val)
@@ -2022,8 +1964,26 @@
GLsizei depth,
GLboolean fixedsamplelocations)
{
- UNIMPLEMENTED();
- return false;
+ if (!context->getExtensions().textureMultisampleArray)
+ {
+ ANGLE_VALIDATION_ERR(context, InvalidEnum(), MultisampleArrayExtensionRequired);
+ return false;
+ }
+
+ if (target != TextureType::_2DMultisampleArray)
+ {
+ ANGLE_VALIDATION_ERR(context, InvalidEnum(), TargetMustBeTexture2DMultisampleArrayANGLE);
+ return false;
+ }
+
+ if (width < 1 || height < 1 || depth < 1)
+ {
+ ANGLE_VALIDATION_ERR(context, InvalidValue(), NegativeSize);
+ return false;
+ }
+
+ return ValidateTexStorageMultisample(context, target, samples, sizedinternalformat, width,
+ height);
}
} // namespace gl