Improve Debugging Strings

CONTRIBUTORS

@@ -71,6 +71,7 @@ Intel Corporation
  Bryan Bernhart
  Yunchao He
  Xinghua Cao
+ Brandon Jones
 
 Klarälvdalens Datakonsult AB
  Milian Wolff

src/libANGLE/ErrorStrings.h

+//
+// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// ErrorStrings.h: Contains mapping of commonly used error messages
+
+#ifndef LIBANGLE_ERRORSTRINGS_H_
+#define LIBANGLE_ERRORSTRINGS_H_
+
+#define ERRMSG(name, message) \
+    static const constexpr char *kError##name = static_cast<const char *>(message);
+#define ANGLE_VALIDATION_ERR(context, error, errorName) \
+    context->handleError(error << kError##errorName)
+
+namespace gl
+{
+ERRMSG(ActiveTextureRange, "Cannot be less than 0 or greater than maximum number of textures.");
+ERRMSG(BufferNotBound, "A buffer must be bound.");
+ERRMSG(ClearInvalidMask, "Invalid mask bits.");
+ERRMSG(CubemapFacesEqualDimensions, "Each cubemap face must have equal width and height.");
+ERRMSG(CubemapIncomplete,
+       "Texture is not cubemap complete. All cubemaps faces must be defined and be the same size.");
+ERRMSG(DefaultFramebufferTarget, "It is invalid to change default FBO's attachments");
+ERRMSG(EnumNotSupported, "Enum is not currently supported.");
+ERRMSG(EnumRequiresGLES31, "Enum requires GLES 3.1");
+ERRMSG(ExceedsMaxElement, "Element value exceeds maximum element index.");
+ERRMSG(ExpectedProgramName, "Expected a program name, but found a shader name.");
+ERRMSG(ExpectedShaderName, "Expected a shader name, but found a program name.");
+ERRMSG(ExtensionNotEnabled, "Extension is not enabled.");
+ERRMSG(FramebufferIncompleteAttachment,
+       "Attachment type must be compatible with attachment object.");
+ERRMSG(FramebufferInvalidAttachment, "Invalid Attachment Type");
+ERRMSG(GenerateMipmapNotAllowed, "Compressed textures do not support mipmap generation.");
+ERRMSG(IndexExceedsMax, "Index exceeds MAX_VERTEX_ATTRIBS");
+ERRMSG(InsufficientBufferSize, "Insufficient buffer size.");
+ERRMSG(IntegerOverflow, "Integer overflow.");
+ERRMSG(InvalidBlendEquation, "Invalid blend equation.");
+ERRMSG(InvalidBlendFunction, "Invalid blend function.");
+ERRMSG(InvalidBorder, "Border must be 0.");
+ERRMSG(InvalidBufferTypes, "Invalid buffer target enum.");
+ERRMSG(InvalidBufferUsage, "Invalid buffer usage enum.");
+ERRMSG(InvalidClearMask, "Invalid mask bits.");
+ERRMSG(InvalidConstantColor,
+       "CONSTANT_COLOR (or ONE_MINUS_CONSTANT_COLOR) and CONSTANT_ALPHA (or "
+       "ONE_MINUS_CONSTANT_ALPHA) cannot be used together as source and destination factors in the "
+       "blend function.");
+ERRMSG(InvalidCullMode, "Cull mode not recognized.");
+ERRMSG(InvalidDepthRange, "Near value cannot be greater than far.");
+ERRMSG(InvalidDrawMode, "Invalid draw mode.");
+ERRMSG(InvalidDrawModeTransformFeedback,
+       "Draw mode must match current transform feedback object's draw mode.");
+ERRMSG(InvalidFormat, "Invalid format.");
+ERRMSG(InvalidFramebufferTarget, "Invalid framebuffer target.");
+ERRMSG(InvalidFramebufferTextureLevel, "Mipmap level must be 0 when attaching a texture.");
+ERRMSG(InvalidInternalFormat, "Invalid internal format.");
+ERRMSG(InvalidMipLevel, "Level of detail outside of range.");
+ERRMSG(InvalidNameCharacters, "Name contains invalid characters.");
+ERRMSG(InvalidPrecision, "Invalid or unsupported precision type.");
+ERRMSG(InvalidProgramName, "Program object expected.");
+ERRMSG(InvalidRenderbufferInternalFormat, "Invalid renderbuffer internalformat.");
+ERRMSG(InvalidRenderbufferTarget, "Invalid renderbuffer target.");
+ERRMSG(InvalidRenderbufferTextureParameter, "Invalid parameter name for renderbuffer attachment.");
+ERRMSG(InvalidRenderbufferWidthHeight,
+       "Renderbuffer width and height cannot be negative and cannot exceed maximum texture size.");
+ERRMSG(InvalidShaderName, "Shader object expected.");
+ERRMSG(InvalidShaderType, "Invalid shader type.");
+ERRMSG(InvalidStencil, "Invalid stencil.");
+ERRMSG(InvalidTextureFilterParam, "Texture filter not recognized.");
+ERRMSG(InvalidTextureTarget, "Invalid or unsupported texture target.");
+ERRMSG(InvalidType, "Invalid type.");
+ERRMSG(InvalidTypePureInt, "Invalid type, should be integer");
+ERRMSG(InvalidUnpackAlignment, "Unpack alignment must be 1, 2, 4, or 8.");
+ERRMSG(InvalidVertexAttrSize, "Vertex attribute size must be 1, 2, 3, or 4.");
+ERRMSG(MismatchedFormat, "Format must match internal format.");
+ERRMSG(MismatchedTypeAndFormat, "Invalid format and type combination.");
+ERRMSG(MismatchedVariableProgram, "Variable is not part of the current program.");
+ERRMSG(MissingReadAttachment, "Missing read attachment.");
+ERRMSG(MustHaveElementArrayBinding, "Must have element array buffer binding.");
+ERRMSG(NameBeginsWithGL, "Attributes that begin with 'gl_' are not allowed.");
+ERRMSG(NegativeBufferSize, "Negative buffer size.");
+ERRMSG(NegativeCount, "Negative count.");
+ERRMSG(NegativeLength, "Negative length.");
+ERRMSG(NegativeOffset, "Negative offset.");
+ERRMSG(NegativeSize, "Cannot have negative height or width.");
+ERRMSG(NegativeStart, "Cannot have negative start.");
+ERRMSG(NegativeStride, "Cannot have negative stride.");
+ERRMSG(ObjectNotGenerated, "Object cannot be used because it has not been generated.");
+ERRMSG(OffsetMustBeMultipleOfType, "Offset must be a multiple of the passed in datatype.");
+ERRMSG(OutsideOfBounds, "Parameter outside of bounds.");
+ERRMSG(ParamOverflow, "The provided parameters overflow with the provided buffer.");
+ERRMSG(ProgramDoesNotExist, "Program doesn't exist.");
+ERRMSG(ProgramNotBound, "A program must be bound.");
+ERRMSG(ProgramNotLinked, "Program not linked.");
+ERRMSG(RenderbufferNotBound, "A renderbuffer must be bound.");
+ERRMSG(ResourceMaxTextureSize, "Desired resource size is greater than max texture size.");
+ERRMSG(ShaderAttachmentHasShader, "Shader attachment already has a shader.");
+ERRMSG(ShaderSourceInvalidCharacters, "Shader source contains invalid characters.");
+ERRMSG(ShaderToDetachMustBeAttached,
+       "Shader to be detached must be currently attached to the program.");
+ERRMSG(SourceTextureTooSmall, "The specified dimensions are outside of the bounds of the texture.");
+ERRMSG(StencilReferenceMaskOrMismatch,
+       "Stencil reference and mask values must be the same for front facing and back facing "
+       "triangles.");
+ERRMSG(StrideMustBeMultipleOfType, "Stride must be a multiple of the passed in datatype.");
+ERRMSG(TextureNotBound, "A texture must be bound.");
+ERRMSG(TextureNotPow2, "The texture is a non-power-of-two texture.");
+ERRMSG(TypeMustMatchOriginalType,
+       "Passed in texture target and format must match the one originally used to define the "
+       "texture.");
+ERRMSG(TypeNotUnsignedShortByte, "Only UNSIGNED_SHORT and UNSIGNED_BYTE types are supported.");
+ERRMSG(UniformSizeDoesNotMatchMethod, "Uniform size does not match uniform method.");
+ERRMSG(ViewportNegativeSize, "Viewport size cannot be negative.");
+ERRMSG(WebglBindAttribLocationReservedPrefix,
+       "Attributes that begin with 'webgl_', or '_webgl_' are not allowed.");
+}
+#undef ERRMSG
+#endif  // LIBANGLE_ERRORSTRINGS_H_

src/libANGLE/validationES.h

@@ -40,7 +40,7 @@ bool ValidFramebufferTarget(GLenum target);
 bool ValidBufferTarget(const ValidationContext *context, GLenum target);
 bool ValidBufferParameter(const ValidationContext *context, GLenum pname, GLsizei *numParams);
 bool ValidMipLevel(const ValidationContext *context, GLenum target, GLint level);
-bool ValidImageSizeParameters(const ValidationContext *context,
+bool ValidImageSizeParameters(ValidationContext *context,
                               GLenum target,
                               GLint level,
                               GLsizei width,
@@ -602,8 +602,6 @@ bool ValidateRobustCompressedTexImageBase(ValidationContext *context,
                                           GLsizei imageSize,
                                           GLsizei dataSize);
 
-// Error messages shared here for use in testing.
-extern const char *g_ExceedsMaxElementErrorMessage;
 }  // namespace gl
 
 #endif  // LIBANGLE_VALIDATION_ES_H_

src/libANGLE/validationES_unittest.cpp

@@ -11,6 +11,7 @@
 #include <gtest/gtest.h>
 
 #include "libANGLE/ContextState.h"
+#include "libANGLE/ErrorStrings.h"
 #include "libANGLE/VaryingPacking.h"
 #include "libANGLE/renderer/FramebufferImpl_mock.h"
 #include "libANGLE/renderer/ProgramImpl_mock.h"
@@ -106,7 +107,8 @@ TEST(ValidationESTest, DISABLED_DrawElementsWithMaxIndexGivesError)
                                                 textureCaps, extensions, limitations, false);
 
     // Set the expectation for the validation error here.
-    Error expectedError(gl::InvalidOperation() << g_ExceedsMaxElementErrorMessage);
+
+    Error expectedError(gl::InvalidOperation() << kErrorExceedsMaxElement);
     EXPECT_CALL(testContext, handleError(expectedError)).Times(1);
 
     // Call once with maximum index, and once with an excessive index.