From 51d8f48c31a03ca5ff06644935d846ffe456f07a Mon Sep 17 00:00:00 2001 From: Boris Zanin Date: Fri, 21 Jun 2019 10:58:59 +0200 Subject: [PATCH] Remove unessential non-ascii symbols from source Several files contain symbols like zero width space, unusual apostrophe, dash and several national symbols instead of English. This might be error prone (please see more details in the issue). Replace them to allow upcoming non-ascii validator to pass. Components: Framework VK-GL-CTS issue: 1836 Change-Id: I3a274f14d117d5b1362f6ceeb20f096c8680b362 --- .../docs/specs/CTS_ARB_post_depth_coverage.txt | 2 +- .../common/glcRobustBufferAccessBehaviorTests.cpp | 6 ++--- .../modules/gl/gl4cDirectStateAccessTests.hpp | 12 +++++----- .../gl/gl4cDirectStateAccessTexturesTests.cpp | 4 ++-- .../gl/gl4cIncompleteTextureAccessTests.hpp | 26 +++++++++++----------- .../esextcTessellationShaderPrimitiveCoverage.cpp | 4 ++-- .../vulkan/api/vktApiBufferViewAccessTests.cpp | 2 +- .../vulkan/api/vktApiGetMemoryCommitment.cpp | 2 +- .../spirv_assembly/vktSpvAsmComputeShaderCase.cpp | 2 +- .../vktSpvAsmGraphicsShaderTestUtil.cpp | 2 +- framework/delibs/debase/deFloat16.c | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/external/openglcts/docs/specs/CTS_ARB_post_depth_coverage.txt b/external/openglcts/docs/specs/CTS_ARB_post_depth_coverage.txt index c255355..533f20c 100644 --- a/external/openglcts/docs/specs/CTS_ARB_post_depth_coverage.txt +++ b/external/openglcts/docs/specs/CTS_ARB_post_depth_coverage.txt @@ -27,7 +27,7 @@ Dependencies Overview The test verifies that when ARB_post_depth_coverage is available one can - use post_depth_coverage layout and gl_SampleMaskIn​ is affected according + use post_depth_coverage layout and gl_SampleMaskIn is affected according to the extension specification. Tests diff --git a/external/openglcts/modules/common/glcRobustBufferAccessBehaviorTests.cpp b/external/openglcts/modules/common/glcRobustBufferAccessBehaviorTests.cpp index 00f013c..7e5d45f 100644 --- a/external/openglcts/modules/common/glcRobustBufferAccessBehaviorTests.cpp +++ b/external/openglcts/modules/common/glcRobustBufferAccessBehaviorTests.cpp @@ -1805,7 +1805,7 @@ void TexelFetchTest::prepareTexture(const Functions& gl, bool is_source, glw::GL "${VERSION}\n" "\n" "layout (local_size_x = ${LOCAL_SIZE}, local_size_y = ${LOCAL_SIZE}, local_size_z = 1) in;\n" - "layout (${QUALIFIER​S}) writeonly uniform highp uimage2DMS uni_image;\n" + "layout (${QUALIFIERS}) writeonly uniform highp uimage2DMS uni_image;\n" "\n" "void main()\n" "{\n" @@ -1822,12 +1822,12 @@ void TexelFetchTest::prepareTexture(const Functions& gl, bool is_source, glw::GL if (m_context_is_es) { m_specializationMap["LOCAL_SIZE"] = "16"; - m_specializationMap["QUALIFIER​S"] = "binding = 0, r32ui"; + m_specializationMap["QUALIFIERS"] = "binding = 0, r32ui"; } else { m_specializationMap["LOCAL_SIZE"] = "1"; - m_specializationMap["QUALIFIER​S"] = "location = 0"; + m_specializationMap["QUALIFIERS"] = "location = 0"; } Program program(gl); diff --git a/external/openglcts/modules/gl/gl4cDirectStateAccessTests.hpp b/external/openglcts/modules/gl/gl4cDirectStateAccessTests.hpp index 8e11775..ece5ae5 100644 --- a/external/openglcts/modules/gl/gl4cDirectStateAccessTests.hpp +++ b/external/openglcts/modules/gl/gl4cDirectStateAccessTests.hpp @@ -6220,7 +6220,7 @@ private: * MAX_TEXTURE_SIZE. * * Check that INVALID_VALUE is generated by TextureSubImage1D if - * xoffset<â�’b, or if (xoffset+width)>(wâ�’b), where w is the TEXTURE_WIDTH, + * xoffset<-b, or if (xoffset+width)>(w-b), where w is the TEXTURE_WIDTH, * and b is the width of the TEXTURE_BORDER of the texture image being * modified. Note that w includes twice the border width. * Check that INVALID_VALUE is generated by TextureSubImage1D if width is @@ -6266,8 +6266,8 @@ private: * is greater than log2 max, where max is the returned value of * MAX_TEXTURE_SIZE. * Check that INVALID_VALUE is generated by TextureSubImage2D if - * xoffset<â�’b, (xoffset+width)>(wâ�’b), yoffset<â�’b, or - * (yoffset+height)>(hâ�’b), where w is the TEXTURE_WIDTH, h is the + * xoffset<-b, (xoffset+width)>(w-b), yoffset<-b, or + * (yoffset+height)>(h-b), where w is the TEXTURE_WIDTH, h is the * TEXTURE_HEIGHT, and b is the border width of the texture image being * modified. Note that w and h include twice the border width. * Check that INVALID_VALUE is generated by TextureSubImage2D if width or @@ -6316,8 +6316,8 @@ private: * MAX_TEXTURE_SIZE. * * Check that INVALID_VALUE is generated by TextureSubImage3D if - * xoffset<â�’b, (xoffset+width)>(wâ�’b), yoffset<â�’b, or - * (yoffset+height)>(hâ�’b), or zoffset<â�’b, or (zoffset+depth)>(dâ�’b), where w + * xoffset<-b, (xoffset+width)>(w-b), yoffset<-b, or + * (yoffset+height)>(h-b), or zoffset<-b, or (zoffset+depth)>(d-b), where w * is the TEXTURE_WIDTH, h is the TEXTURE_HEIGHT, d is the TEXTURE_DEPTH * and b is the border width of the texture image being modified. Note * that w, h, and d include twice the border width. @@ -6782,7 +6782,7 @@ private: * the integer formats in table 8.3 and the internal format is integer. * * Check that INVALID_OPERATION error is generated if a pixel pack buffer - * object is bound and packing the texture image into the buffer’s memory + * object is bound and packing the texture image into the buffer's memory * would exceed the size of the buffer. * * Check that INVALID_OPERATION error is generated if a pixel pack buffer diff --git a/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp b/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp index 552177b..4ba81bd 100644 --- a/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp +++ b/external/openglcts/modules/gl/gl4cDirectStateAccessTexturesTests.cpp @@ -13310,7 +13310,7 @@ tcu::TestNode::IterateResult ImageQueryErrorsTest::iterate() "format is not one of the integer formats in table 8.3 and the internal format is integer."); /* Check that INVALID_OPERATION error is generated if a pixel pack buffer - object is bound and packing the texture image into the buffer’s memory + object is bound and packing the texture image into the buffer's memory would exceed the size of the buffer. */ gl.bindBuffer(GL_PIXEL_PACK_BUFFER, buffer); GLU_EXPECT_NO_ERROR(gl.getError(), "glBindBuffer has failed"); @@ -13318,7 +13318,7 @@ tcu::TestNode::IterateResult ImageQueryErrorsTest::iterate() gl.getTextureImage(texture_2D, 0, s_reference_format, s_reference_type, s_reference_size, glu::BufferOffsetAsPointer(1 * sizeof(GLuint))); is_ok &= CheckErrorAndLog(m_context, GL_INVALID_OPERATION, "glGetTextureImage", - "a pixel pack buffer object is bound and packing the texture image into the buffer’s " + "a pixel pack buffer object is bound and packing the texture image into the buffer's " "memory would exceed the size of the buffer."); gl.bindBuffer(GL_PIXEL_PACK_BUFFER, 0); diff --git a/external/openglcts/modules/gl/gl4cIncompleteTextureAccessTests.hpp b/external/openglcts/modules/gl/gl4cIncompleteTextureAccessTests.hpp index fc83273..3f3cbc7 100644 --- a/external/openglcts/modules/gl/gl4cIncompleteTextureAccessTests.hpp +++ b/external/openglcts/modules/gl/gl4cIncompleteTextureAccessTests.hpp @@ -76,23 +76,23 @@ private: * Compare the values with expected value. * * Repeat the steps for following samplers: - * - sampler1D​, - * - sampler2D​, - * - sampler3D​, - * - samplerCube,​ + * - sampler1D, + * - sampler2D, + * - sampler3D, + * - samplerCube, * - sampler2DRect, - * - sampler1DArray​, - * - sampler2DArray​, + * - sampler1DArray, + * - sampler2DArray, * - samplerCubeArray - * expecting ​(0.0, 0.0, 0.0, 1.0) and: - * - sampler1DShadow​, - * - sampler2DShadow​, + * expecting (0.0, 0.0, 0.0, 1.0) and: + * - sampler1DShadow, + * - sampler2DShadow, * - samplerCubeShadow, * - sampler2DRectShadow, - * - sampler1DArrayShadow​, - * - sampler2DArrayShadow​, - * - samplerCubeArrayShadow​ - * expecting ​0.0. + * - sampler1DArrayShadow, + * - sampler2DArrayShadow, + * - samplerCubeArrayShadow + * expecting 0.0. */ class SamplerTest : public deqp::TestCase { diff --git a/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderPrimitiveCoverage.cpp b/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderPrimitiveCoverage.cpp index 8487729..acda0c3 100644 --- a/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderPrimitiveCoverage.cpp +++ b/external/openglcts/modules/glesext/tessellation_shader/esextcTessellationShaderPrimitiveCoverage.cpp @@ -90,7 +90,7 @@ const char* TessellationShaderPrimitiveCoverage::m_quad_tessellation_tes_code = "void main()\n" "{\n" " gl_Position = gl_in[0].gl_Position * (1.0 - gl_TessCoord.x) * (1.0 - " - "gl_TessCoord.y)\n" /* Specifying the vertex’s position */ + "gl_TessCoord.y)\n" /* Specifying the vertex's position */ " + gl_in[1].gl_Position * ( gl_TessCoord.x) * (1.0 - " "gl_TessCoord.y)\n" /* using the bilinear interpolation */ " + gl_in[2].gl_Position * ( gl_TessCoord.x) * ( " @@ -136,7 +136,7 @@ const char* TessellationShaderPrimitiveCoverage::m_triangles_tessellation_tes_co "\n" "void main()\n" "{\n" - " gl_Position = gl_in[0].gl_Position * gl_TessCoord.x\n" /* Specifying the vertex’s position */ + " gl_Position = gl_in[0].gl_Position * gl_TessCoord.x\n" /* Specifying the vertex's position */ " + gl_in[1].gl_Position * gl_TessCoord.y\n" /* using the barycentric interpolation */ " + gl_in[2].gl_Position * gl_TessCoord.z;\n" "}\n"; diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp index e681824..7ca24d9 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp @@ -246,7 +246,7 @@ BufferViewTestInstance::BufferViewTestInstance (Context& context, descriptorLayoutParams = { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, // VkStructureType sType; - DE_NULL, // cost void* pNexŧ; + DE_NULL, // const void* pNext; (VkDescriptorSetLayoutCreateFlags)0, DE_LENGTH_OF_ARRAY(layoutBindings), // deUint32 count; layoutBindings // const VkDescriptorSetLayoutBinding pBinding; diff --git a/external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp b/external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp index 0dfa6e2..0bfe1f3 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiGetMemoryCommitment.cpp @@ -201,7 +201,7 @@ tcu::TestStatus MemoryCommitmentTestInstance::iterate(void) const VkDescriptorSetLayoutCreateInfo descriptorLayoutParams = { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO, // VkStructureType sType; - DE_NULL, // cost void* pNexŧ; + DE_NULL, // const void* pNext; (VkDescriptorSetLayoutCreateFlags)0, DE_LENGTH_OF_ARRAY(layoutBindings), // deUint32 count; layoutBindings // const VkDescriptorSetLayoutBinding pBinding; diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp index 377e576..bb82074 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp @@ -642,7 +642,7 @@ tcu::TestStatus SpvAsmComputeShaderInstance::iterate (void) VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, // VkSamplerAddressMode addressModeV; VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, // VkSamplerAddressMode addressModeW; 0.0f, // float mipLodBias; - VK_FALSE, // VkBool32 anistoropyÉnable; + VK_FALSE, // VkBool32 anistoropyEnable; 1.0f, // float maxAnisotropy; VK_FALSE, // VkBool32 compareEnable; VK_COMPARE_OP_ALWAYS, // VkCompareOp compareOp; diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp index 39212f3..e009a83 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp @@ -3698,7 +3698,7 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, // VkSamplerAddressMode addressModeV; VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, // VkSamplerAddressMode addressModeW; 0.0f, // float mipLodBias; - VK_FALSE, // VkBool32 anistoropyÉnable; + VK_FALSE, // VkBool32 anistoropyEnable; 1.0f, // float maxAnisotropy; (hasDepthComponent) ? VK_TRUE : VK_FALSE, // VkBool32 compareEnable; VK_COMPARE_OP_LESS, // VkCompareOp compareOp; diff --git a/framework/delibs/debase/deFloat16.c b/framework/delibs/debase/deFloat16.c index dd195e9..3c2630a 100644 --- a/framework/delibs/debase/deFloat16.c +++ b/framework/delibs/debase/deFloat16.c @@ -312,7 +312,7 @@ deFloat16 deFloat32To16Round (float val32, deRoundingMode mode) /* According to IEEE Std 754-2008 Section 7.4, * * roundTiesToEven and roundTiesToAway carry all overflows to Inf with the sign * of the intermediate result. - * * roundTowardZero carries all overflows to the format’s largest finite number + * * roundTowardZero carries all overflows to the format's largest finite number * with the sign of the intermediate result. */ if (mode == DE_ROUNDINGMODE_TO_ZERO) @@ -469,7 +469,7 @@ deFloat16 deFloat64To16Round (double val64, deRoundingMode mode) /* According to IEEE Std 754-2008 Section 7.4, * * roundTiesToEven and roundTiesToAway carry all overflows to Inf with the sign * of the intermediate result. - * * roundTowardZero carries all overflows to the format’s largest finite number + * * roundTowardZero carries all overflows to the format's largest finite number * with the sign of the intermediate result. */ if (mode == DE_ROUNDINGMODE_TO_ZERO) -- 2.7.4