Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 5da6f44

Browse files
null77Commit Bot
authored andcommitted
Fix error string commas.
For example: 1, 2, 3, 4 became 1 = 2 = 3 = 4. These were acidentally changed to equals signs way back in this CL: 610640f "Don't use gl::Error in validation." Bug: angleproject:4067 Change-Id: I05d1c5ecc5f6fb7636f81ca59d05928dd940bf8d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1890631 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
1 parent 924dad3 commit 5da6f44

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/libANGLE/ErrorStrings.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ MSG kBlitDepthOrStencilFormatMismatch = "Depth/stencil buffer format combination
2727
MSG kBlitDimensionsOutOfRange = "BlitFramebuffer dimensions out of 32-bit integer range.";
2828
MSG kBlitExtensionDepthStencilWholeBufferBlit = "Only whole-buffer depth and stencil blits are supported by this extension.";
2929
MSG kBlitExtensionFormatMismatch = "Attempting to blit and the read and draw buffer formats don't match.";
30-
MSG kBlitExtensionFromInvalidAttachmentType = "Blits are only supported from 2D texture = renderbuffer or default framebuffer attachments in this extension.";
30+
MSG kBlitExtensionFromInvalidAttachmentType = "Blits are only supported from 2D texture, renderbuffer or default framebuffer attachments in this extension.";
3131
MSG kBlitExtensionLinear = "Linear blit not supported in this extension.";
3232
MSG kBlitExtensionMultisampledDepthOrStencil = "Multisampled depth/stencil blit is not supported by this extension.";
3333
MSG kBlitExtensionMultisampledWholeBufferBlit = "Only whole-buffer blit is supported from a multisampled read buffer in this extension.";
3434
MSG kBlitExtensionNotAvailable = "Blit extension not available.";
3535
MSG kBlitExtensionScaleOrFlip = "Scaling and flipping in BlitFramebufferANGLE not supported by this implementation.";
36-
MSG kBlitExtensionToInvalidAttachmentType = "Blits are only supported to 2D texture = renderbuffer or default framebuffer attachments in this extension.";
36+
MSG kBlitExtensionToInvalidAttachmentType = "Blits are only supported to 2D texture, renderbuffer or default framebuffer attachments in this extension.";
3737
MSG kBlitFeedbackLoop = "Blit feedback loop: the read and draw framebuffers are the same.";
3838
MSG kBlitFramebufferMissing = "Read and draw framebuffers must both exist for a blit to succeed.";
3939
MSG kBlitFromMultiview = "Attempt to read from a multi-view framebuffer.";
@@ -48,8 +48,8 @@ MSG kBlitOnlyNearestForNonColor = "Only nearest filtering can be used when blitt
4848
MSG kBlitSameImageColor = "Read and write color attachments cannot be the same image.";
4949
MSG kBlitSameImageDepthOrStencil = "Read and write depth stencil attachments cannot be the same image.";
5050
MSG kBlitToMultiview = "Attempt to write to a multi-view framebuffer.";
51-
MSG kBlitTypeMismatchFixedOrFloat = "If the read buffer contains fixed-point or floating-point values = the draw buffer must as well.";
52-
MSG kBlitTypeMismatchFixedPoint = "If the read buffer contains fixed-point values = the draw buffer must as well.";
51+
MSG kBlitTypeMismatchFixedOrFloat = "If the read buffer contains fixed-point or floating-point values, the draw buffer must as well.";
52+
MSG kBlitTypeMismatchFixedPoint = "If the read buffer contains fixed-point values, the draw buffer must as well.";
5353
MSG kBlitTypeMismatchSignedInteger = "If the read buffer contains signed integer values the draw buffer must as well.";
5454
MSG kBlitTypeMismatchUnsignedInteger = "If the read buffer contains unsigned integer values the draw buffer must as well.";
5555
MSG kBufferAlreadyMapped = "Buffer is already mapped.";
@@ -118,8 +118,8 @@ MSG kExceedsMaxVertexAttribBindings = "Index must be within [0, MAX_VERTEX_ATTRI
118118
MSG kExceedsMaxVertexAttribStride = "Stride must be within [0, MAX_VERTEX_ATTRIB_STRIDE).";
119119
MSG kExceedsNumExtensions = "Index must be within [0, NUM_EXTENSIONS).";
120120
MSG kExceedsNumRequestableExtensions = "Index must be within [0, NUM_REQUESTABLE_EXTENSIONS_ANGLE).";
121-
MSG kExpectedProgramName = "Expected a program name = but found a shader name.";
122-
MSG kExpectedShaderName = "Expected a shader name = but found a program name.";
121+
MSG kExpectedProgramName = "Expected a program name, but found a shader name.";
122+
MSG kExpectedShaderName = "Expected a shader name, but found a program name.";
123123
MSG kExtensionNotEnabled = "Extension is not enabled.";
124124
MSG kExtensionNotDisablable = "Extension is not disablable.";
125125
MSG kExtensionNotRequestable = "Extension is not requestable.";
@@ -176,7 +176,7 @@ MSG kInvalidBufferUsage = "Invalid buffer usage enum.";
176176
MSG kInvalidClearMask = "Invalid mask bits.";
177177
MSG kInvalidClientState = "Invalid client vertex array type.";
178178
MSG kInvalidClipPlane = "Invalid clip plane.";
179-
MSG kInvalidCombinedImageUnit = "Specified unit must be in [GL_TEXTURE0 = GL_TEXTURE0 + GL_MAX_COMBINED_IMAGE_UNITS)";
179+
MSG kInvalidCombinedImageUnit = "Specified unit must be in [GL_TEXTURE0, GL_TEXTURE0 + GL_MAX_COMBINED_IMAGE_UNITS)";
180180
MSG kInvalidComponents = "Invalid components.";
181181
MSG kInvalidCompressedFormat = "Not a valid compressed texture format.";
182182
MSG kInvalidCompressedImageSize = "Invalid compressed image size.";
@@ -214,7 +214,7 @@ MSG kInvalidFogDensity = "Invalid fog density (must be nonnegative).";
214214
MSG kInvalidFogMode = "Invalid fog mode.";
215215
MSG kInvalidFogParameter = "Invalid fog parameter.";
216216
MSG kInvalidFormat = "Invalid format.";
217-
MSG kInvalidFormatCombination = "Invalid combination of format = type and internalFormat.";
217+
MSG kInvalidFormatCombination = "Invalid combination of format, type and internalFormat.";
218218
MSG kInvalidFragmentInputBinding = "No such binding.";
219219
MSG kInvalidFramebufferAttachmentParameter = "Invalid parameter name for framebuffer attachment.";
220220
MSG kInvalidFramebufferLayer = "Framebuffer layer cannot be less than 0 or greater than GL_MAX_FRAMEBUFFER_LAYERS_EXT.";
@@ -240,7 +240,7 @@ MSG kInvalidMemoryBarrierBit = "Invalid memory barrier bit.";
240240
MSG kInvalidMipLevel = "Level of detail outside of range.";
241241
MSG kInvalidMipLevels = "Invalid level count.";
242242
MSG kInvalidMultisampledFramebufferOperation = "Invalid operation on multisampled framebuffer";
243-
MSG kInvalidMultitextureUnit = "Specified unit must be in [GL_TEXTURE0 = GL_TEXTURE0 + GL_MAX_TEXTURE_UNITS)";
243+
MSG kInvalidMultitextureUnit = "Specified unit must be in [GL_TEXTURE0, GL_TEXTURE0 + GL_MAX_TEXTURE_UNITS)";
244244
MSG kInvalidName = "Invalid name.";
245245
MSG kInvalidNameCharacters = "Name contains invalid characters.";
246246
MSG kInvalidPathCoefficientsArray = "No coefficients array given.";
@@ -274,7 +274,7 @@ MSG kInvalidProgramInterface = "Invalid program interface.";
274274
MSG kInvalidProgramName = "Program object expected.";
275275
MSG kInvalidProgramResourceIndex = "Invalid program resource index.";
276276
MSG kInvalidProgramResourceProperty = "Invalid program resource property.";
277-
MSG kInvalidProjectionMatrix = "Invalid projection matrix. Left/right = top/bottom = near/far intervals cannot be zero = and near/far cannot be less than zero.";
277+
MSG kInvalidProjectionMatrix = "Invalid projection matrix. Left/right, top/bottom, near/far intervals cannot be zero, and near/far cannot be less than zero.";
278278
MSG kInvalidPropCount = "Invalid propCount.";
279279
MSG kInvalidPropertyForProgramInterface = "Not an allowed program resource property for this program interface";
280280
MSG kInvalidProvokingVertex = "Invalid provoking vertex.";
@@ -327,13 +327,13 @@ MSG kInvalidTransformFeedbackName = "name is not a valid transform feedback.";
327327
MSG kInvalidType = "Invalid type.";
328328
MSG kInvalidUniformCount = "Only array uniforms may have count > 1.";
329329
MSG kInvalidUniformLocation = "Invalid uniform location";
330-
MSG kInvalidUnpackAlignment = "Unpack alignment must be 1 = 2 = 4 = or 8.";
330+
MSG kInvalidUnpackAlignment = "Unpack alignment must be 1, 2, 4 or 8.";
331331
MSG kInvalidVaryingLocation = "Location exceeds max varying.";
332332
MSG kInvalidVertexArray = "Vertex array does not exist.";
333333
MSG kInvalidVertexArrayName = "name is not a valid vertex array.";
334334
MSG kInvalidVertexAttribSize2101010 = "Type is INT_2_10_10_10_REV or UNSIGNED_INT_2_10_10_10_REV and size is not 4.";
335335
MSG kInvalidVertexAttribSize1010102 = "Type is INT_10_10_10_2_OES or UNSIGNED_INT_10_10_10_2_OES and size is not 3 or 4.";
336-
MSG kInvalidVertexAttrSize = "Vertex attribute size must be 1 = 2 = 3 = or 4.";
336+
MSG kInvalidVertexAttrSize = "Vertex attribute size must be 1, 2, 3, or 4.";
337337
MSG kInvalidVertexPointerSize = "Size for built-in vertex attribute is outside allowed range.";
338338
MSG kInvalidVertexPointerStride = "Invalid stride for built-in vertex attribute.";
339339
MSG kInvalidVertexPointerType = "Invalid type for built-in vertex attribute.";
@@ -373,7 +373,7 @@ MSG kNegativeBaseViewIndex = "Negative baseViewIndex.";
373373
MSG kNegativeBufferSize = "Negative buffer size.";
374374
MSG kNegativeBufSize = "Invalid bufSize.";
375375
MSG kNegativeCount = "Negative count.";
376-
MSG kNegativeHeightWidthDepth = "Cannot have negative height = width = or depth.";
376+
MSG kNegativeHeightWidthDepth = "Cannot have negative height, width, or depth.";
377377
MSG kNegativeLayer = "Negative layer.";
378378
MSG kNegativeLength = "Negative length.";
379379
MSG kNegativeLevel = "Level is negative.";
@@ -405,7 +405,7 @@ MSG kObjectNotGenerated = "Object cannot be used because it has not been generat
405405
MSG kOffsetAlignment = "offset must be a multiple of 4.";
406406
MSG kOffsetAndSizeAlignment = "Offset and size must be multiple of 4.";
407407
MSG kOffsetMustBeMultipleOfType = "Offset must be a multiple of the passed in datatype.";
408-
MSG kOffsetMustBeMultipleOfUint = "Offset must be a multiple of the size = in basic machine units = of uint";
408+
MSG kOffsetMustBeMultipleOfUint = "Offset must be a multiple of sizeof(uint) in basic machine units.";
409409
MSG kOffsetOverflow = "Offset overflows texture dimensions.";
410410
MSG kOtherQueryActive = "Other query is active.";
411411
MSG kOutsideOfBounds = "Parameter outside of bounds.";
@@ -427,7 +427,7 @@ MSG kReadBufferNone = "Read buffer is GL_NONE.";
427427
MSG kReadBufferNotAttached = "Read buffer has no attachment.";
428428
MSG kRectangleTextureCompressed = "Rectangle texture cannot have a compressed format.";
429429
MSG kRelativeOffsetTooLarge = "relativeOffset cannot be greater than MAX_VERTEX_ATTRIB_RELATIVE_OFFSET.";
430-
MSG kRenderableInternalFormat = "SizedInternalformat must be color-renderable = depth-renderable = or stencil-renderable.";
430+
MSG kRenderableInternalFormat = "SizedInternalformat must be color-renderable, depth-renderable, or stencil-renderable.";
431431
MSG kRenderbufferNotBound = "A renderbuffer must be bound.";
432432
MSG kResourceMaxRenderbufferSize = "Desired resource size is greater than max renderbuffer size.";
433433
MSG kResourceMaxTextureSize = "Desired resource size is greater than max texture size.";
@@ -463,7 +463,7 @@ MSG kTextureWidthOrHeightOutOfRange = "Width and height must be less than or equ
463463
MSG kTransfomFeedbackAlreadyActive = "Transform feedback is already active.";
464464
MSG kTransformFeedbackActiveDelete = "Attempt to delete an active transform feedback.";
465465
MSG kTransformFeedbackActiveDuringLink = "Cannot link program while program is associated with an active transform feedback object.";
466-
MSG kTransformFeedbackBufferDoubleBound = "A transform feedback buffer that would be written to is also bound to a non-transform-feedback target = which would cause undefined behavior.";
466+
MSG kTransformFeedbackBufferDoubleBound = "A transform feedback buffer that would be written to is also bound to a non-transform-feedback target, which would cause undefined behavior.";
467467
MSG kTransformFeedbackBufferMultipleOutputs = "Transform feedback has a buffer bound to multiple outputs.";
468468
MSG kTransformFeedbackBufferTooSmall = "Not enough space in bound transform feedback buffers.";
469469
MSG kTransformFeedbackDoesNotExist = "Transform feedback object that does not exist.";
@@ -493,7 +493,7 @@ MSG kVertexShaderTypeMismatch = "Vertex shader input type does not match the typ
493493
MSG kViewportNegativeSize = "Viewport size cannot be negative.";
494494
MSG kViewsExceedMaxArrayLayers = "baseViewIndex+numViews cannot be greater than GL_MAX_ARRAY_TEXTURE_LAYERS.";
495495
MSG kWebgl2NameLengthLimitExceeded = "Location lengths must not be greater than 1024 characters.";
496-
MSG kWebglBindAttribLocationReservedPrefix = "Attributes that begin with 'webgl_' = or '_webgl_' are not allowed.";
496+
MSG kWebglBindAttribLocationReservedPrefix = "Attributes that begin with 'webgl_', or '_webgl_' are not allowed.";
497497
MSG kWebglNameLengthLimitExceeded = "Location name lengths must not be greater than 256 characters.";
498498
MSG kZeroBoundToTarget = "Zero is bound to target.";
499499
// clang-format on

0 commit comments

Comments
 (0)