diff --git a/.github/actions/setup-test-runner/action.yml b/.github/actions/setup-test-runner/action.yml index d17924b3..8ee10532 100644 --- a/.github/actions/setup-test-runner/action.yml +++ b/.github/actions/setup-test-runner/action.yml @@ -45,7 +45,7 @@ runs: sudo tee /etc/apt/apt.conf.d/80-mobilegl-ci-network > /dev/null fi # Cores go through zstd: a unit run's intentional aborts (death tests) left hundreds - # of raw cores in /tmp and filled the disk. The handler keeps honouring each + # of raw cores in /tmp and filled the disk. The handler keeps honoring each # process's RLIMIT_CORE (%c), so only steps that raise it with ulimit -c get cores; # read one with 'zstd -d core...zst' first. if [ ! -f /.dockerenv ] && command -v sudo > /dev/null && command -v zstd > /dev/null; then diff --git a/.github/workflows/apk.yml b/.github/workflows/apk.yml index b740f8e0..32d52e24 100644 --- a/.github/workflows/apk.yml +++ b/.github/workflows/apk.yml @@ -23,7 +23,7 @@ env: # Software-rendered CI submissions may exceed the interactive GPU hang budget. MOBILEGL_GPU_HANG_BUDGET_MS: "0" -# ONE LIVE RUN PER BRANCH, as in test.yml: a superseded push is cancelled rather than left queued +# ONE LIVE RUN PER BRANCH, as in test.yml: a superseded push is canceled rather than left queued # behind its successor; a manual dispatch gets a group of its own; dev queues rather than cancels. concurrency: group: ${{ github.workflow }}-${{ github.event_name == 'workflow_dispatch' && github.run_id || github.ref }} @@ -438,7 +438,7 @@ jobs: strategy: fail-fast: false # The account runs at most 20 jobs at once, shared with Test. These ~230 emulator jobs are - # the longer of the two runs, so they may take the whole pool: what is minimised is when the + # the longer of the two runs, so they may take the whole pool: what is minimized is when the # later of APK and Test finishes, not Test alone. max-parallel: 20 matrix: ${{ fromJSON(needs.trace-cases.outputs.android) }} @@ -829,7 +829,7 @@ jobs: # Fail before deletion if either paginated inventory cannot be read. # 50 rows per page: the jobs endpoint answers HTTP 502 for 90+ rows on a re-run attempt of a run this size. gh api --paginate "repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/jobs?per_page=50" \ - --jq '.jobs[] | select(.name | startswith("retrace (")) | select(.conclusion == "failure" or .conclusion == "cancelled" or .conclusion == "timed_out" or .conclusion == "action_required") | .name' \ + --jq '.jobs[] | select(.name | startswith("retrace (")) | select(.conclusion == "failure" or .conclusion == "canceled" or .conclusion == "timed_out" or .conclusion == "action_required") | .name' \ > "${RUNNER_TEMP}/cleanup-jobs.txt" gh api --paginate "repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/artifacts?per_page=100" \ --jq '.artifacts[] | select(.name | startswith("MobileGL-trace-fixture-") or startswith("MobileGL-android-retrace-result-") or startswith("trace-fixture-") or startswith("retrace-result-")) | [.id, .name] | @tsv' \ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4c987113..268ecfd6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1544,7 +1544,7 @@ jobs: - name: Spawn/split lane parity (9.2) run: python3 scripts/ci/spawn_lane_parity.py "${SPLIT_BUILD_DIR}" - # P8-A (ID-P8-2): every monolith case, tails normalised, is on a gated split arm or is named + # P8-A (ID-P8-2): every monolith case, tails normalized, is on a gated split arm or is named # with a reason class in scripts/data/split_coverage_exemptions.txt. The same `ctest -N` # cost as the parity step above, and the question it cannot answer: parity compares the # split arms with EACH OTHER, so a case missing from all three passes it. @@ -1553,7 +1553,7 @@ jobs: python3 scripts/ci/split_coverage.py --self-test python3 scripts/ci/split_coverage.py "${SPLIT_BUILD_DIR}" - # P8-SE: PipeCatalogueTest's unmigrated-emulation list equals the MGPipeUnmigratedEmulation + # P8-SE: PipeCatalogTest's unmigrated-emulation list equals the MGPipeUnmigratedEmulation # call sites in the tree, one site per name. A source lint: no build needed. - name: Unmigrated-emulation list against its call sites (P8-SE) run: | @@ -3626,7 +3626,7 @@ jobs: # an unchecked process substitution. # 50 rows per page: the jobs endpoint answers HTTP 502 for 90+ rows on a re-run attempt of a run this size. gh api --paginate "repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/jobs?per_page=50" \ - --jq '.jobs[] | select((.name | startswith("retrace (")) or (.name | startswith("retrace verify (")) or (.name | startswith("retrace split (")) or (.name | startswith("retrace shipped library ("))) | select(.conclusion == "failure" or .conclusion == "cancelled" or .conclusion == "timed_out" or .conclusion == "action_required") | .name' \ + --jq '.jobs[] | select((.name | startswith("retrace (")) or (.name | startswith("retrace verify (")) or (.name | startswith("retrace split (")) or (.name | startswith("retrace shipped library ("))) | select(.conclusion == "failure" or .conclusion == "canceled" or .conclusion == "timed_out" or .conclusion == "action_required") | .name' \ > "${RUNNER_TEMP}/cleanup-jobs.txt" gh api --paginate "repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/artifacts?per_page=100" \ --jq '.artifacts[] | select(.name | startswith("trace-fixture-") or startswith("retrace-result-") or startswith("retrace-split-result-") or startswith("retrace-shipped-result-")) | [.id, .name] | @tsv' \ @@ -3688,7 +3688,7 @@ jobs: # The seven generators all read MG_Pipe/*.def, so regenerating and diffing is what # keeps the two interface tables, the wire records, the verify comparators, the # PipeInputs field ids, the read-inventory coverage and the render-state member list - # from drifting apart from the catalogue. The generated files are committed + # from drifting apart from the catalog. The generated files are committed # deliberately: the build must not depend on python. - name: Configure runner environment uses: ./.github/actions/setup-test-runner diff --git a/CMakeLists.txt b/CMakeLists.txt index b5b0ca06..ad0347af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ option(MOBILEGL_EXTMEM_PROBE_AS_SERVER "Spike only (P11 B2 step 1): also package # The PipeInputs strangler (ARCHITECTURE.md 9.2) is finished: since P13 every build pushes, and # there is neither an option nor a macro for it (W3a removed the option, W3b the `#if` guards and # the definition). A -DMOBILEGL_PIPE_PUSH=OFF (or the OFF that every pre-P13 build tree holds in its -# cache, the old default) is named and dropped rather than honoured: a warning, not an error, so an +# cache, the old default) is named and dropped rather than honored: a warning, not an error, so an # existing tree reconfigures. The RUNTIME MOBILEGL_PIPE_PUSH environment bitmask is unrelated. if (DEFINED CACHE{MOBILEGL_PIPE_PUSH} AND NOT "$CACHE{MOBILEGL_PIPE_PUSH}") message(WARNING "MobileGL: MOBILEGL_PIPE_PUSH=OFF asks for the pull build, which P13 retired; " @@ -78,7 +78,7 @@ if (ANDROID) # Read the level back from the compiler target triple first. Its trailing # number (aarch64-none-linux-android26) is precisely what clang turns into # __ANDROID_API__, so it cannot disagree with the compile itself, and it is - # already past every NDK normalisation step - codename aliases, "latest", + # already past every NDK normalization step - codename aliases, "latest", # and per-ABI minimum pull-ups. ANDROID_PLATFORM_LEVEL is the fallback for # generators/languages where the triple variable is not populated. # @@ -257,7 +257,7 @@ string(SUBSTRING "${GIT_COMMIT_HASH_FULL}" 0 7 GIT_COMMIT_HASH_SHORT) # # GIT_COMMIT_HASH_SHORT MAY NOT MOVE. It is baked into glGetString(GL_VERSION) # (MG_Impl/GLImpl/Getter/GL_Getter.cpp), so redefining it changes an APPLICATION-VISIBLE GL -# string and the pull build's .rodata - a behaviour leak and a G1 break at once. The handshake +# string and the pull build's .rodata - a behavior leak and a G1 break at once. The handshake # gets its own pair instead, consumed only by the ABI fingerprint, which no pull build compiles. # # PRESENT IS A FIRST-CLASS INPUT, not the emptiness of VALUE. "this build has no stamp" and @@ -633,7 +633,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED AND # A NORMAL variable, deliberately not `CACHE BOOL ... FORCE`: forcing OFF into the cache # made the plain re-configure after `git submodule update` stay OFF with no message at # all. Shadowing the cache entry for this configure only keeps the operator's ON where it - # was, so the next configure - with the submodule there - honours it. + # was, so the next configure - with the submodule there - honors it. set(MOBILEGL_BUILD_DISAGGREGATED OFF) # And with it the shim option, or the `-DMOBILEGL_BUILD_DISAGGREGATED_INPROC=1` below # would still be defined over a build with no MG_Remote in it at all. @@ -659,7 +659,7 @@ list(APPEND SOURCE_FILES # VisitFields tables. Push-only for the same G1 reason as the three above - in # monolith the archive never crosses (create_shader_state hands the two structs over # by pointer beside the record), so the codec is live code only in the VERIFY lane, - # where the applier serialises, deserialises and field-compares before storing. + # where the applier serializes, deserializes and field-compares before storing. MobileGL/MG_State/GLState/ProgramState/ProgramArtifactsCodec.cpp # P5's contract (integrator ruling R-17, package c1): the MONOLITH arm of the # client->wire routing - the thirty-seven adapters that install gMGPipeScreen / diff --git a/MobileGL/Init.cpp b/MobileGL/Init.cpp index d39e5eaa..bb9f5798 100644 --- a/MobileGL/Init.cpp +++ b/MobileGL/Init.cpp @@ -145,7 +145,7 @@ namespace MobileGL { // ORDER is the fix - not a wait, and not a friendlier default mask. // // MG_State::Init() constructs GLContext, and GLContext's TextureState constructor - // materialises one default texture object per target (GL 3.3 core 3.8, + // materializes one default texture object per target (GL 3.3 core 3.8, // TextureState.cpp:62-71). TextureObjectBase's constructor emits resource_create for // every one of them (TextureState/TextureObject.cpp:168-169), and that emission is // gated, through PipeFill's FamilyIsLive, on diff --git a/MobileGL/MG_Backend/DirectGLES/DirectGLESBlit.cpp b/MobileGL/MG_Backend/DirectGLES/DirectGLESBlit.cpp index 7c5088c3..3075918b 100644 --- a/MobileGL/MG_Backend/DirectGLES/DirectGLESBlit.cpp +++ b/MobileGL/MG_Backend/DirectGLES/DirectGLESBlit.cpp @@ -980,15 +980,15 @@ namespace MobileGL::MG_Backend::DirectGLES { // only attachment is depth it never can, because the color emulation has no attachment // to take a format from (KHR-GL33.framebuffer_blit's depth config test blits // COLOR|DEPTH|STENCIL across depth-only framebuffers and kept reading the clear value). - const GLbitfield colourBit = mask & static_cast(GL_COLOR_BUFFER_BIT); + const GLbitfield colorBit = mask & static_cast(GL_COLOR_BUFFER_BIT); const GLbitfield dsBits = mask & static_cast(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); // The color group's one emulation is the multisample resolve that also converts format, // which is the shape this names. It used to double as an early-out for the whole // function, which is what cost a depth-only mask its single-aspect retry. const Bool multisampleResolve = readSamples > 0 && drawSamples <= 0; - if (colourBit != 0) { + if (colorBit != 0) { DrainBlitErrors(); - g_GLESFuncs.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, colourBit, filter); + g_GLESFuncs.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, colorBit, filter); if (g_GLESFuncs.glGetError() != GL_NO_ERROR) { const Bool emulated = multisampleResolve && ResolveThenBlit(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, filter); diff --git a/MobileGL/MG_Backend/DirectGLES/DirectGLESBuffers.cpp b/MobileGL/MG_Backend/DirectGLES/DirectGLESBuffers.cpp index 75571be3..dbc591da 100644 --- a/MobileGL/MG_Backend/DirectGLES/DirectGLESBuffers.cpp +++ b/MobileGL/MG_Backend/DirectGLES/DirectGLESBuffers.cpp @@ -367,9 +367,9 @@ namespace MobileGL::MG_Backend::DirectGLES { if (g_GLESFuncs.glMapBufferRange == nullptr || g_GLESFuncs.glUnmapBuffer == nullptr) return; const SizeT packedStride = program->GetTransformFeedbackPackedStride(); - const SizeT modelledVertices = + const SizeT modeledVertices = static_cast(MG_Pipe::gPipeInputs->GetTransformFeedbackCapturedVertices()); - const SizeT vertices = std::min(modelledVertices, xfb.scatterCapacityVertices); + const SizeT vertices = std::min(modeledVertices, xfb.scatterCapacityVertices); if (packedStride == 0 || vertices == 0) { // The scatter path redirected the DRIVER's capture into the scratch buffer, // so bailing here leaves the application's buffers holding their pre-draw @@ -380,7 +380,7 @@ namespace MobileGL::MG_Backend::DirectGLES { MGLOG_E_ONCE("EndTransformFeedback: scattered capture discarded - packedStride=%zu, " "CPU-modeled captured vertices=%zu, scratch capacity=%zu. The capture buffers keep " "their pre-draw contents.", - packedStride, modelledVertices, xfb.scatterCapacityVertices); + packedStride, modeledVertices, xfb.scatterCapacityVertices); return; } diff --git a/MobileGL/MG_Backend/DirectGLES/DirectGLESState.cpp b/MobileGL/MG_Backend/DirectGLES/DirectGLESState.cpp index ff4976a8..af809858 100644 --- a/MobileGL/MG_Backend/DirectGLES/DirectGLESState.cpp +++ b/MobileGL/MG_Backend/DirectGLES/DirectGLESState.cpp @@ -1146,7 +1146,7 @@ namespace MobileGL::MG_Backend::DirectGLES { // // The ORDERING that made this read come from the frontend is preserved and is what // makes reading a record legal here: the client emits every set_* BEFORE the verb and - // the server specialises AT the verb, so by the time this runs the record already + // the server specializes AT the verb, so by the time this runs the record already // describes the framebuffer this draw will use - which is exactly the property the // frontend read was buying (a program compiled against a stale count would otherwise // not be relinked until the draw after the one that needed it). diff --git a/MobileGL/MG_Backend/DirectGLES/Managers.cpp b/MobileGL/MG_Backend/DirectGLES/Managers.cpp index a0550f51..a099a6c6 100644 --- a/MobileGL/MG_Backend/DirectGLES/Managers.cpp +++ b/MobileGL/MG_Backend/DirectGLES/Managers.cpp @@ -845,7 +845,7 @@ namespace MobileGL::MG_Backend::DirectGLES { // Bit 12 depends on NOTHING, and that is said out loud rather than left as an absence: // a ShaderCso handle names no texture and no buffer, the archive rides beside the // record as a companion pointer, and the eight extra inputs the server still - // specialises on (D-H5) are read from state this backend already holds. + // specializes on (D-H5) are read from state this backend already holds. const Bool bitSet = (MG_Config::Features.PipePush & MG_Pipe::kMGPipeSubsystemPrograms) != 0; const BufferImpl::PipeSubsystemArmVerdict verdict = BufferImpl::ClassifyPipeSubsystemArm( bitSet, /*legacyMemosEnabled=*/true, /*legacyArmSurvivesLegacyMemos=*/false); diff --git a/MobileGL/MG_Backend/DirectGLES/Managers.h b/MobileGL/MG_Backend/DirectGLES/Managers.h index fae5c65e..b36b3121 100644 --- a/MobileGL/MG_Backend/DirectGLES/Managers.h +++ b/MobileGL/MG_Backend/DirectGLES/Managers.h @@ -1934,7 +1934,7 @@ namespace MobileGL::MG_Backend::DirectGLES { // texture that never asks for the stencil aspect never emits the call. The // depth/stencil readback and replicate-blit emulations also write this parameter // raw, but only ever on their own scratch textures (never on an application - // texture), so they cannot desynchronise this cache. + // texture), so they cannot desynchronize this cache. GLenum m_cacheDepthStencilTextureMode = GL_DEPTH_COMPONENT; Uint16 m_syncedSamplerVersion = 0; Uint16 m_syncedTextureParamsVersion = 0; diff --git a/MobileGL/MG_Backend/DirectGLES/ManagersBuffers.cpp b/MobileGL/MG_Backend/DirectGLES/ManagersBuffers.cpp index bae9df74..0be68182 100644 --- a/MobileGL/MG_Backend/DirectGLES/ManagersBuffers.cpp +++ b/MobileGL/MG_Backend/DirectGLES/ManagersBuffers.cpp @@ -963,7 +963,7 @@ namespace MobileGL::MG_Backend::DirectGLES { return; } // The kill-switch arm, and it reads the application's REAL flags per call - - // which is why MGPFlushRange carries them unnormalised. + // which is why MGPFlushRange carries them unnormalized. const Flags appAccess{ static_cast>(record.AccessFlags)}; const Bool invalidate = (appAccess & BufferMappingAccessBit::InvalidateRange) || diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VkBufferManager.cpp b/MobileGL/MG_Backend/DirectVulkan/Renderer/VkBufferManager.cpp index 16ef2f13..7520646d 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VkBufferManager.cpp +++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/VkBufferManager.cpp @@ -416,7 +416,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { // // A streamed `glBufferSubData -> draw` pair is only correct if the write is ordered // against every draw that still reads the bytes it overwrites; a write this predicate - // answers "idle" is applied as an unsynchronised host memcpy, and a draw still reading + // answers "idle" is applied as an unsynchronized host memcpy, and a draw still reading // the range then renders bytes that are not its own - silently, with no log line, no GL // error and no Fatal. That was the OpenRA device divergence (magma-b3.md §2). // diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRendererDevice.cpp b/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRendererDevice.cpp index adaccdd9..da60e268 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRendererDevice.cpp +++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRendererDevice.cpp @@ -1657,7 +1657,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { MakeWireDepthResolveDeviceIdentity(m_physicalDevice.properties, renderPassArmAvailable, knob); static WireDepthResolveArmCache s_choices; const WireDepthResolveArmChoice resolved = s_choices.Resolve(identity, [&]() { - if (knob == WireDepthResolveProbeKnob::Unrecognised) + if (knob == WireDepthResolveProbeKnob::Unrecognized) MGLOG_W("DirectVulkan: MGITEST_MAGMA_DEPTH_RESOLVE_PROBE=%s is not `bug`, `clean` or " "`elide-subject`; the resolve probe runs as if it were unset", knobValue); diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRendererSubmit.cpp b/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRendererSubmit.cpp index 903d1d39..06da663c 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRendererSubmit.cpp +++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanRendererSubmit.cpp @@ -707,7 +707,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { } // Only provokingVertexModePerPipeline lets modes differ inside one render pass instance; // elsewhere every pipeline takes GL's default so the render pass stays self-consistent, and - // glProvokingVertex(GL_FIRST_VERTEX_CONVENTION) goes unhonoured. Honoring it there would + // glProvokingVertex(GL_FIRST_VERTEX_CONVENTION) goes unhonored. Honoring it there would // mean ending the render pass on every glProvokingVertex change; not worth it until a target // device actually lacks the property. if (!m_provokingVertexModePerPipeline) { diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/WireDepthMipmap.vert b/MobileGL/MG_Backend/DirectVulkan/Renderer/WireDepthMipmap.vert index 295411a3..49170e1c 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/WireDepthMipmap.vert +++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/WireDepthMipmap.vert @@ -10,9 +10,9 @@ // Native Vulkan depth mip generation: no GL program, registry entry, or runtime transpilation. // // The geometry is WireColorBlit.vert's, unchanged - the same quad, the same push-constant -// rect, the same GL-bottom-left to native-image mapping - so a depth mip and a colour blit +// rect, the same GL-bottom-left to native-image mapping - so a depth mip and a color blit // place their fragments identically and only the fragment stage differs. The block carries -// one member more than the colour blit's, and the fragment stage is the member's only +// one member more than the color blit's, and the fragment stage is the member's only // reader: a push-constant block must be declared identically in every stage of one pipeline, // so it is declared here too rather than split into a second range. layout(push_constant) uniform DepthMipmapRect { diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/WireDepthResolveArm.h b/MobileGL/MG_Backend/DirectVulkan/Renderer/WireDepthResolveArm.h index 5909d25f..96819563 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/WireDepthResolveArm.h +++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/WireDepthResolveArm.h @@ -163,7 +163,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { ForceBug, ForceClean, ElideSubject, - Unrecognised + Unrecognized }; inline WireDepthResolveProbeKnob ParseWireDepthResolveProbeKnob(const char* value) { @@ -171,7 +171,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { if (std::strcmp(value, "bug") == 0) return WireDepthResolveProbeKnob::ForceBug; if (std::strcmp(value, "clean") == 0) return WireDepthResolveProbeKnob::ForceClean; if (std::strcmp(value, "elide-subject") == 0) return WireDepthResolveProbeKnob::ElideSubject; - return WireDepthResolveProbeKnob::Unrecognised; + return WireDepthResolveProbeKnob::Unrecognized; } // One packed format's worth of readings: the control resolved both aspects; the render pass diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/WireFramebuffer.cpp b/MobileGL/MG_Backend/DirectVulkan/Renderer/WireFramebuffer.cpp index 388cfea6..305edf25 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/WireFramebuffer.cpp +++ b/MobileGL/MG_Backend/DirectVulkan/Renderer/WireFramebuffer.cpp @@ -2424,7 +2424,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { const Bool depthArmTakesShape = planar && layersInRange && (props.optimalTilingFeatures & depthPassFeatures) == depthPassFeatures; // The color arm's shape (the two shader shapes are explained at the color arm below). - const Bool colour = resource->aspect == VK_IMAGE_ASPECT_COLOR_BIT; + const Bool color = resource->aspect == VK_IMAGE_ASPECT_COLOR_BIT; // The shader arm samples through a sampler2D and writes a vec4, which is what // BlitWireColorImage's own float check enforces; naming it here rather than letting the // blit return false is what puts the reason in the decline line. @@ -2434,15 +2434,14 @@ namespace MobileGL::MG_Backend::DirectVulkan { forcedShaderTier < 2 && (resource->usageFlags & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) != 0; const Bool viaScratch = !attachable && renderableFormat && (resource->usageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT) != 0; - const Bool colourArmTakesShape = - colour && planar && layersInRange && sampledFloat && (attachable || viaScratch); + const Bool colorArmTakesShape = color && planar && layersInRange && sampledFloat && (attachable || viaScratch); // P8-F: `mipmap-shader-format-or-shape` IS A NAMED DECLINE, NOT A FATAL (rule I (a)). // The monolith arm has always answered this chain with a decline (VulkanRenderer.cpp's // GenerateMipmap: a format without blit support is skipped and the chain left unwritten), // and a shape no shader arm takes is a coverage gap in this backend, not a broken record. // The leading word stays, so every device-log grep keyed on it still finds the line. const Bool shaderArmTakesShape = - resource->aspect == VK_IMAGE_ASPECT_DEPTH_BIT ? depthArmTakesShape : colourArmTakesShape; + resource->aspect == VK_IMAGE_ASPECT_DEPTH_BIT ? depthArmTakesShape : colorArmTakesShape; if (!nativeBlit && !shaderArmTakesShape) { const String detail = MagmaWireShapeDetail("mipmap-shader-format-or-shape", format, resource->format, props, resource->aspect, @@ -2519,7 +2518,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { // the texels still come from GPU contents rather than from a staged shadow. // // Which of the two (`attachable` or `viaScratch`), and whether either takes the - // shape at all, was decided before the growth (colourArmTakesShape, P8-F). + // shape at all, was decided before the growth (colorArmTakesShape, P8-F). for (Uint32 level = base + 1; level < base + count; ++level) { for (Uint32 layer = baseLayer; layer < baseLayer + layerCount; ++layer) { WireImage source{}; diff --git a/MobileGL/MG_Impl/GLImpl/Debug/GL_Debug.cpp b/MobileGL/MG_Impl/GLImpl/Debug/GL_Debug.cpp index 4193fdab..eb0dbb64 100644 --- a/MobileGL/MG_Impl/GLImpl/Debug/GL_Debug.cpp +++ b/MobileGL/MG_Impl/GLImpl/Debug/GL_Debug.cpp @@ -94,7 +94,7 @@ namespace MobileGL::MG_Impl::GLImpl { // has a frontend name check - so this is answered exactly rather than waved through. // GL_DISPLAY_LIST is deliberately absent: it exists only in the compatibility profile, // which MobileGL does not expose, so it falls to the INVALID_ENUM path below. - Bool ValidateLabelledObject(GLenum identifier, GLuint name, Bool& outIdentifierKnown) { + Bool ValidateLabeledObject(GLenum identifier, GLuint name, Bool& outIdentifierKnown) { outIdentifierKnown = true; auto* context = MG_State::pGLContext.get(); switch (identifier) { @@ -206,7 +206,7 @@ namespace MobileGL::MG_Impl::GLImpl { void ObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar* label) { Bool identifierKnown = false; - const Bool objectExists = ValidateLabelledObject(identifier, name, identifierKnown); + const Bool objectExists = ValidateLabeledObject(identifier, name, identifierKnown); if (!identifierKnown) { RecordDebugError(ErrorCode::InvalidEnum, __func__, std::format("identifier {} is not a labellable object type.", @@ -237,7 +237,7 @@ namespace MobileGL::MG_Impl::GLImpl { return; } Bool identifierKnown = false; - const Bool objectExists = ValidateLabelledObject(identifier, name, identifierKnown); + const Bool objectExists = ValidateLabeledObject(identifier, name, identifierKnown); if (!identifierKnown) { RecordDebugError(ErrorCode::InvalidEnum, __func__, std::format("identifier {} is not a labellable object type.", @@ -254,7 +254,7 @@ namespace MobileGL::MG_Impl::GLImpl { const auto& labels = State().objectLabels; const auto it = labels.find(MakeObjectLabelKey(identifier, name)); const String& text = it != labels.end() ? it->second : String{}; - // GL 4.6 core 20.5: the returned length excludes the NUL, and an unlabelled object hands + // GL 4.6 core 20.5: the returned length excludes the NUL, and an unlabeled object hands // back an empty string with length 0 rather than an error. SizeT copied = 0; if (label != nullptr && bufSize > 0) { diff --git a/MobileGL/MG_Impl/GLImpl/Framebuffer/GL_Framebuffer.cpp b/MobileGL/MG_Impl/GLImpl/Framebuffer/GL_Framebuffer.cpp index 3666b9d3..eba8df20 100644 --- a/MobileGL/MG_Impl/GLImpl/Framebuffer/GL_Framebuffer.cpp +++ b/MobileGL/MG_Impl/GLImpl/Framebuffer/GL_Framebuffer.cpp @@ -504,7 +504,7 @@ namespace MobileGL::MG_Impl::GLImpl { // a real FramebufferObject for framebuffer 0, so a null test can never see this - the // object is always there, and framebuffer 0 has to be recognized by identity instead, // the same comparison DrawBuffers_State makes. Without this an attach onto the default - // framebuffer silently REPLACED its color attachment, permanently desynchronising it + // framebuffer silently REPLACED its color attachment, permanently desynchronizing it // from what the swapchain keeps publishing. const auto& defaultFramebufferInfo = FramebufferImpl::pDefaultFramebufferInfo; if (!framebufferObject || diff --git a/MobileGL/MG_Impl/Pipe/CsoCache.h b/MobileGL/MG_Impl/Pipe/CsoCache.h index 6337a33c..2de966b2 100644 --- a/MobileGL/MG_Impl/Pipe/CsoCache.h +++ b/MobileGL/MG_Impl/Pipe/CsoCache.h @@ -14,7 +14,7 @@ // 396 pipeline bytes, probes, and confirms a hit with a memcmp: a bare 64-bit match could alias // two render states onto one CSO, which is silently wrong pixels. A miss mints a slot and emits // create_render_state with every pipeline chunk. 64 entries, LRU, about 26 KB per context; the -// counters give the hit rate. kMGPipeBehaviourNoCsoContentAddressing (bit 63 of +// counters give the hit rate. kMGPipeBehaviorNoCsoContentAddressing (bit 63 of // MOBILEGL_PIPE_PUSH) disables reuse as a negative control, which CsoContentAddressingScenario // keeps exercised. #include @@ -55,7 +55,7 @@ namespace MobileGL::MG_Pipe { MGPipeGatherPipelineBytes(params, bytes.data()); ++m_counters.Binds; - const Bool contentAddressed = (MG_Config::Features.PipePush & kMGPipeBehaviourNoCsoContentAddressing) == 0; + const Bool contentAddressed = (MG_Config::Features.PipePush & kMGPipeBehaviorNoCsoContentAddressing) == 0; if (contentAddressed) { const Uint64 hash = s_hashForTest != nullptr ? s_hashForTest(bytes.data()) : MGPipeHashPipelineBytes(bytes.data()); diff --git a/MobileGL/MG_Impl/Pipe/PipeFill.cpp b/MobileGL/MG_Impl/Pipe/PipeFill.cpp index fa97dda8..b26dd6ca 100644 --- a/MobileGL/MG_Impl/Pipe/PipeFill.cpp +++ b/MobileGL/MG_Impl/Pipe/PipeFill.cpp @@ -523,7 +523,7 @@ namespace MobileGL::MG_Pipe { Bool InHook = false; // a re-read that re-enters an accessor is not re-verified Optional Corrupt; std::atomic Divergences{0}; - Uint64 Summarised = 0; // how many of them the summary line has reported so far + Uint64 Summarized = 0; // how many of them the summary line has reported so far // THE SUMMARY IS WRITTEN FROM MobileGL::Destroy, NOT FROM HERE (V1 fix round 2). This // is a namespace-scope static, so this destructor runs from __run_exit_handlers, AFTER // DestroyImpl has called MG_Util::Debug::Close(). Close nulls the role's sink; Log.cpp's @@ -538,8 +538,8 @@ namespace MobileGL::MG_Pipe { ~VerifyState() { FlushSummary(); } void FlushSummary() { const Uint64 count = Divergences.load(std::memory_order_relaxed); - if (count == 0 || count == Summarised) return; - Summarised = count; + if (count == 0 || count == Summarized) return; + Summarized = count; MGLOG_E("MGPipe: verify summary - %llu divergence(s) survived MOBILEGL_PIPE_VERIFY_FATAL=0", static_cast(count)); } @@ -1742,7 +1742,7 @@ namespace MobileGL::MG_Pipe { // not consulted, and under spawn a silent no-op that leaks every one of those objects. // The parameter type is the route's, which is byte-identical to the applier's // (const MGPHandleOnly&, void return), so the fix is `&MGPipeRoute` at the five call - // sites; PipeCatalogue.FrontendNeverTakesAnApplierAddress checks MG_Impl in every unit lane. + // sites; PipeCatalog.FrontendNeverTakesAnApplierAddress checks MG_Impl in every unit lane. Bool EmitDeleteIfPublished(MGPipeKind kind, MGPipeHandle handle, void (*route)(const MGPHandleOnly&)) { if (!MGPipeHandleIsPublished(kind, handle)) return false; route(HandleOnly(kind, handle)); @@ -2908,7 +2908,7 @@ namespace MobileGL::MG_Pipe { // textures/sampler/image/global constants - and that document is explicit that the // order is code organization and NOT a contract: all of a verb's set_*/bind_* must // complete before the verb, and apart from "a resource create precedes a bind to it" - // there is no ordering requirement between them. The server specialises the shader and + // there is no ordering requirement between them. The server specializes the shader and // the pipeline lazily at the verb, from everything it holds at that moment, which is // what makes deriving the fragColor broadcast count from the framebuffer record legal // at the verb rather than at the FBO sync. @@ -3198,7 +3198,7 @@ namespace MobileGL::MG_Pipe { // program, then textures / sampler / image / global constants - which is why it stands // before the render-state block rather than after it. That order is explicitly code // organization and not a contract (all of a verb's set_*/bind_* complete before the - // verb, and the server specialises lazily AT the verb from everything it then holds), + // verb, and the server specializes lazily AT the verb from everything it then holds), // so nothing about the P2 and P3a emissions changes by standing after it; what it buys // is that the file reads in the order the design states. // diff --git a/MobileGL/MG_Impl/Pipe/ProgramEmit.h b/MobileGL/MG_Impl/Pipe/ProgramEmit.h index 5013da6c..44589b6c 100644 --- a/MobileGL/MG_Impl/Pipe/ProgramEmit.h +++ b/MobileGL/MG_Impl/Pipe/ProgramEmit.h @@ -13,7 +13,7 @@ // set_dispatch_program and set_global_constants. create_shader_state is emitted from the // GetProgramForDraw() / GetProgramForDispatch() join the verb makes anyway; the tracker's // shutter reads GetCurrentProgram() so asking "did the shader move" never forces a compile. -// The record carries the artifacts only; the server specialises at the verb for the draw-FBO +// The record carries the artifacts only; the server specializes at the verb for the draw-FBO // clamp masks, fragColor broadcast, storage-block bindings, atomic counters, image formats and // patch parameters (ARCHITECTURE.md §7). In monolith the artifacts ride beside the record as // companion pointers with Size 0 blob refs, so the codec runs only in the verify build. diff --git a/MobileGL/MG_IntegrationTest/CMakeLists.txt b/MobileGL/MG_IntegrationTest/CMakeLists.txt index 642bfeee..561e7953 100644 --- a/MobileGL/MG_IntegrationTest/CMakeLists.txt +++ b/MobileGL/MG_IntegrationTest/CMakeLists.txt @@ -282,7 +282,7 @@ function(mgl_itest_find_driver_json outVar) endif() endforeach() endforeach() - # Nothing recognised as hardware. Report the first non-software entry if there + # Nothing recognized as hardware. Report the first non-software entry if there # is one; otherwise report nothing, so the warning below fires. foreach(candidate IN LISTS candidates) get_filename_component(leaf "${candidate}" NAME) @@ -347,7 +347,7 @@ option(MOBILEGL_ITEST_REQUIRE_GPU # configured before this change would keep injecting EGL_PLATFORM=x11 and go on # binding to a window system - silently, and only on the machines that have one. # Someone reproducing a platform-specific bug sets EGL_PLATFORM in their own -# environment, which the harness still honours. +# environment, which the harness still honors. set(MGL_ITEST_COMMON_ENV "") if (MOBILEGL_ITEST_EGL_VENDOR) @@ -394,7 +394,7 @@ endfunction() # One lane of the integration binary: the cases FILTER selects, registered as PREFIX # with the environment ENV (a list joined by mgl_itest_join_environment). LABELS defaults to -# integration-gpu and TIMEOUT to the scenario timeout. LOCK serialises lanes that share a resource +# integration-gpu and TIMEOUT to the scenario timeout. LOCK serializes lanes that share a resource # such as a log file; TEST_LIST names the ctest-time variable listing the lane's tests; FAIL_REGEX # and FIXTURES set those properties; PROPERTIES passes further property pairs through. function(mgl_itest_lane prefix filter) @@ -518,7 +518,7 @@ endfunction() # DirectGLES' Track H arm, probed by the subsystem bit it is gated on rather than by # SlotTables.h existing: the bit is declared in the contract (kMGPipeSubsystemEsprytSlots, MG_Pipe/MGPipe.h) and the -# backend has to name it to honour MOBILEGL_PIPE_PUSH's default mask, whatever files package C +# backend has to name it to honor MOBILEGL_PIPE_PUSH's default mask, whatever files package C # spreads the slot tables across. mgl_itest_probe_for_symbol(MGL_ITEST_ESPRYT_SLOTS "${MGL_ITEST_ROOT}/MobileGL/MG_Backend/DirectGLES" "kMGPipeSubsystemEsprytSlots") @@ -603,7 +603,7 @@ endif() # P4a's THIRD re-key question, per backend, and it is not either of the two above. Bits 5/6 # re-keyed each backend's VERTEX-INPUT memos and bit 7/8 the BUFFER's; P4a re-keys six OBJECT # classes - texture, renderbuffer, framebuffer, sampler CSO, sampler view, shader CSO - behind -# four new subsystem bits, and a backend has to NAME one of those constants to honour +# four new subsystem bits, and a backend has to NAME one of those constants to honor # MOBILEGL_PIPE_PUSH's default mask. A P4a case that read either older marker would arm its # Handles arm on a tree where nothing about a texture is keyed on a handle: green for a re-key # that does not exist. Probed by the constants rather than by a file, for the reason the block @@ -938,7 +938,7 @@ mgl_itest_lane("DirectVulkan.OptimisticShaderStatus." "AsyncCompileScenario.Iris # The negative control for the DirectGLES gl_ViewportIndex emulation, in a process that # has it switched off. One case, because it is the only one the switch may touch: with -# the emulation off the three positive cases in the same fixture describe behaviour the +# the emulation off the three positive cases in the same fixture describe behavior the # backend does not have, so a whole-scenario registration would be three guaranteed reds. # DirectGLES only - the flag steers nothing on DirectVulkan, which routes natively. mgl_itest_lane("DirectGLES.NoViewportArrayEmulation." "ViewportArrayScenario.WithoutTheEmulationEveryIndexCollapsesOntoViewportZero" @@ -1029,7 +1029,7 @@ mgl_itest_lane("DirectVulkan.HandleRecycle.Handles." "HandleRecycleScenario.*" LABELS "integration-gpu\;integration-monolith-control" ENV "${MGL_ITEST_VULKAN_HANDLE_HANDLES_ENVIRONMENT}") # --- CSO content-addressing negative control ---------------------------------------------- # The On and Off masks differ only in bit 63 of MOBILEGL_PIPE_PUSH -# (kMGPipeBehaviourNoCsoContentAddressing); the rest of each mask is the default 0x3fff, because +# (kMGPipeBehaviorNoCsoContentAddressing); the rest of each mask is the default 0x3fff, because # subsystem bits 0-13 are fixed on. The cases read the csom / csob counters from the library log, # so each lane has a private log path (ARCHITECTURE.md §16.1). MOBILEGL_PIPE_STATS_PERIOD=1 writes # one summary line per eglSwapBuffers, so two swaps bracket exactly the workload. @@ -1144,7 +1144,7 @@ mgl_itest_lane("DirectGLES.MapPersistentRoundtrips." "StorageBufferRegrowScenari mgl_itest_lane("DirectGLES.MapPersistentRoundtrips." "LargeArenaAdoptionScenario.AnAdoptionCostsExactlyOneMapPersistentRoundtrip" LABELS "integration-gpu\;integration-monolith-control" ENV "${MGL_ITEST_GLES_MPR_ARENA_ENVIRONMENT}") -# LargeArenaAdoption's three behavioural cases under BOTH arms of the same A/B. This file is where +# LargeArenaAdoption's three behavioral cases under BOTH arms of the same A/B. This file is where # an adopted store's whole life is exercised - the NULL-data definition that adopts it, an # in-flight SubData, a readback and a GPU write - so if the handle path and the legacy # BufferBackendOps path disagree about any of it, one of these two lanes goes red and names which. @@ -1254,7 +1254,7 @@ mgl_itest_lane("DirectGLES.TextureUploadShape." "TextureUploadShapeScenario.TheE LOCK texture-upload-shape-DirectGLES.log ENV "${MGL_ITEST_GLES_TEXTURE_UPLOAD_SHAPE_ENVIRONMENT}") # --- TextureParamsWithoutASamplerViewScenario needs no lane of its own --------------------- -# Its observable is a sampled colour, not a counter or a log, and its claim is about the shipping +# Its observable is a sampled color, not a counter or a log, and its claim is about the shipping # configuration, so the ambient DirectGLES. / DirectVulkan. registrations at the default mask are # the arms it needs. The DirectVulkan entries skip in SetUp: the scenario covers Espryt's # SyncAttachmentObject / SyncNeccessaryTextures pair. @@ -1285,7 +1285,7 @@ if (MOBILEGL_PIPE_VERIFY) # PipeVerifyArmingScenario.Armed reads the library's log, and the log is a per-LANE resource: it # is opened fopen(path, "w"), so every process in a lane truncates it. In the ambient Verify. # lane that is 400-odd processes on one path, run `-j 4` in CI, and a whole-file read there - # races a neighbour's bring-up. Every other log-reading scenario in this file (UnlocatedIoBlocks, + # races a neighbor's bring-up. Every other log-reading scenario in this file (UnlocatedIoBlocks, # the primgen reroute, the point-size demotion) is registered exactly like this for the same # reason. MGITEST_PIPE_ARMING_LANE is a harness marker - the library never reads it - and it is # what makes the case skip in the ambient lane instead of racing there. @@ -1326,7 +1326,7 @@ if (MOBILEGL_PIPE_VERIFY) # The whole suite again, per backend, with the comparator armed. Same scenarios, same # assertions, but every backend read of frontend state is now checked against a snapshot taken # from the live context at the verb boundary - which is what "the 742 integration entries - # prove push equals pull" means. Labelled integration-gpu as well so a verify build's + # prove push equals pull" means. Labeled integration-gpu as well so a verify build's # `ctest -L integration-gpu` still describes the whole registration set. mgl_itest_lane("DirectGLES.Verify." "-${MGL_ITEST_GLES_VIEW_FILTER}:${MGL_ITEST_SPLIT_ARM_ONLY_FILTER}" LABELS "integration-gpu\;integration-verify\;integration-monolith-control" TIMEOUT ${MGL_ITEST_VERIFY_TIMEOUT} ENV "${MGL_ITEST_GLES_VERIFY_ENVIRONMENT}") @@ -2266,7 +2266,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED) # the whole-binary discovery. mgl_itest_register_split_arms("CopyImageStoreReadbackScenario.*" "") # The same cases with MGITEST_ESPRYT_REFUSE_TEXTURE_READBACK_EXTENT pinned: the Espryt server - # treats a colour level of exactly that extent as one the driver refused to attach (what an + # treats a color level of exactly that extent as one the driver refused to attach (what an # Adreno does for RGB16 and 16-bit SNORM), so its staged store has to answer. READ BY THE # SERVER, and it reaches all three arms: inproc sees this entry's environment, spawn copies it # into the child, and the tcp supervisor carries it in its own fixture ENVIRONMENT (appended to @@ -2346,7 +2346,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED) # MOBILEGL_IPC_STRICT_ERRORS=1 a barrier-pulled pipe-input read is Fatal{UnmigratedPipeInput}, # so these go red if GetProgramForDraw@DrawArrays or GetProgramForDispatch@DispatchCompute is # pulled again. The MultiDrawScenario case prepares a draw and checks GL errors, not pixels; - # AtomicCounterScenario dispatches. Labelled integration-split only: on the monolith arm the + # AtomicCounterScenario dispatches. Labeled integration-split only: on the monolith arm the # knob cannot trip, because the client fills every field at every verb. mgl_itest_join_environment(MGL_ITEST_GLES_SPLIT_STRICT_ENVIRONMENT "MOBILEGL_BACKEND_TYPE=DirectGLES" "MOBILEGL_TRANSPORT=inproc" "MOBILEGL_ITEST_REQUIRE_GPU=1" @@ -2476,8 +2476,8 @@ if (MOBILEGL_BUILD_DISAGGREGATED) ClipDistanceScenario.ADisabledClipDistanceRemovesNothing ClipDistanceScenario.TheEnablesAreIndependentPerDistance CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice - CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets - CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ + CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets + CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice) @@ -2494,7 +2494,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED) endforeach() # ShaderMip: MGITEST_MAGMA_FORCE_SHADER_MIPMAP makes GenerateWireMipmap skip its # native blit (tier 1) and also treat the level as not attachable (tier 2), the arms - # devices take. Lavapipe blits every colour format this binary creates, R11F_G11F_B10F + # devices take. Lavapipe blits every color format this binary creates, R11F_G11F_B10F # included, so no format choice reaches them. Own entries: the knob retargets every mipmap # in the process. A server-read knob set per entry never reaches the shared tcp fixture's # server, so knob entries skip the Tcp arm (mglItestServerEnvKnobArm) and are listed in @@ -2542,7 +2542,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED) # # TWO ENTRIES OVER ONE CASE, for the reason the ShaderMip pair gives. The plain entry is # a regression gate that runs on every driver. The forced entry is the red-once of the - # DEFENCE term: it makes the serial half of VkBufferManager's busy predicate answer + # DEFENSE term: it makes the serial half of VkBufferManager's busy predicate answer # "idle" - the state an unsound completed-serial floor put the wire arm into on the # device - so only the submission-fence half is left to order the copy. It does NOT # cover the floor fix itself (forcing the serial term bypasses the floor entirely); the @@ -2583,7 +2583,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED) # ---- P7 wave 2-B2: `multisample-blit-shape@P7`'s retirement and its decline ---------- # # SPLIT-ONLY, like the in-place copy pair below and for the same reason: the retired arm - # does something the monolith arm does not. A scaled multisample colour blit takes the + # does something the monolith arm does not. A scaled multisample color blit takes the # monolith's `vkCmdResolveImage` at 1:1 into the destination's offset - the scale is # dropped - so there is no `DirectVulkan.` reading to register these beside, and an # equality between the two arms would be an assertion that the wire arm is as wrong. @@ -2734,7 +2734,7 @@ endif() # Fatal{ReplyTooLarge, "ReadPixels 256x512 0x1908/0x1406 2097152 > 2097136"}. One entry per case # for a private log each - two processes append to it on the spawn arm. if (MOBILEGL_BUILD_DISAGGREGATED) - # P11: LargeArenaAdoptionScenario's cases that run on every Magma arm - the five behavioural + # P11: LargeArenaAdoptionScenario's cases that run on every Magma arm - the five behavioral # cases and the tier assertion (the mpr and adopt-tier-refusal cases need lane markers of their # own). The `Arena.` block below and the Buffers lane both walk it. set(MGL_ITEST_ARENA_CASES @@ -2764,7 +2764,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED) foreach(bandCase RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused TwoMiBPlusOneRowIsBanded AReadLargerThanTheWholeReplySegmentIsBanded - BandedReadsHonourPackAlignmentRowLengthAndSkips + BandedReadsHonorPackAlignmentRowLengthAndSkips BandedReadIntoAPixelPackBufferKeepsItsPadding BandedDepthAndDepthStencilReads GetTexImageLargerThanAReplySlotIsWindowed) @@ -3265,7 +3265,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED) # THE LABEL IS `integration-magma-split` AND NOT `integration-split-magma`, and that is not # a preference: `ctest -L` takes a REGEX, not an exact name, so `-L integration-split` # MATCHES a label spelled `integration-split-magma` as a substring. The obvious name would - # have left both entries in the Espryt lane while every listing showed them relabelled - a + # have left both entries in the Espryt lane while every listing showed them relabeled - a # split that looks done and is not. Measured: with that spelling # `ctest -N -L integration-split` still listed both DirectVulkan entries. if (namedBlitBackend STREQUAL "DirectVulkan") @@ -3399,7 +3399,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED) # B2's CPU mip arm x P8-E's driver-written mark: the forced-CPU knob plus E's refused-readback # knob at the base level's extent (16x16), both read by the SERVER - so inproc and spawn only, # and their own label as B's `CpuMip.` entries have (the tcp arm's server is the shared - # TcpServer.Start fixture, and the refusal there would reach every 16x16 colour readback). + # TcpServer.Start fixture, and the refusal there would reach every 16x16 color readback). foreach(mglItestArm IN ITEMS Split Spawn) string(TOUPPER "${mglItestArm}" mglItestArmUpper) string(TOLOWER "${mglItestArm}" mglItestArmLower) @@ -3409,16 +3409,16 @@ if (MOBILEGL_BUILD_DISAGGREGATED) LABELS "integration-gpu\\;integration-cpu-mip-${mglItestArmLower}" ENV "${MGL_ITEST_GLES_${mglItestArmUpper}_ENVIRONMENT}\;MGITEST_ESPRYT_FORCE_CPU_MIPMAP=1\;MGITEST_ESPRYT_REFUSE_TEXTURE_READBACK_EXTENT=16x16\;MOBILEGL_LOG_FILE_PATH=${CMAKE_CURRENT_BINARY_DIR}/p8se-cpu-mip-refused-${mglItestArmLower}-${cpuMipCase}.log") endforeach() endforeach() - # PipeCatalogueTest's unmigrated-emulation list against the call sites in the tree (a source + # PipeCatalogTest's unmigrated-emulation list against the call sites in the tree (a source # lint, so the unit lane runs it wherever the split build's unit tests run; CI also runs it # beside split_coverage.py). - add_test(NAME PipeCatalogue.UnmigratedEmulationSitesSelfTest + add_test(NAME PipeCatalog.UnmigratedEmulationSitesSelfTest COMMAND "${Python3_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/scripts/ci/unmigrated_emulation_sites.py" --self-test) - add_test(NAME PipeCatalogue.UnmigratedEmulationSitesMatchTheList + add_test(NAME PipeCatalog.UnmigratedEmulationSitesMatchTheList COMMAND "${Python3_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/scripts/ci/unmigrated_emulation_sites.py" "${CMAKE_SOURCE_DIR}") - set_tests_properties(PipeCatalogue.UnmigratedEmulationSitesSelfTest - PipeCatalogue.UnmigratedEmulationSitesMatchTheList PROPERTIES LABELS unit TIMEOUT 60) + set_tests_properties(PipeCatalog.UnmigratedEmulationSitesSelfTest + PipeCatalog.UnmigratedEmulationSitesMatchTheList PROPERTIES LABELS unit TIMEOUT 60) endif() # P8-SV: Magma split residuals (docs/archive/notes/p8/SV.md) - the 3D native mip blit's layer @@ -3615,7 +3615,7 @@ if (MOBILEGL_BUILD_DISAGGREGATED AND MOBILEGL_PIPE_VERIFY) # The arming assertion on this arm, one entry per backend, with a log path nothing else # writes to - the monolith VerifyArming. entries' shape and their reason (the case reads the - # whole file, and a path shared with 500 neighbours races them under `-j 4`). This is the + # whole file, and a path shared with 500 neighbors races them under `-j 4`). This is the # entry that cannot be green against a library with no comparator compiled in, and unlike the # monolith pair it also cannot be green against one whose comparator never survived the # server's bring-up - which is precisely what the relaxed respecify pin unblocked. diff --git a/MobileGL/MG_IntegrationTest/Harness/split_log_paths.py b/MobileGL/MG_IntegrationTest/Harness/split_log_paths.py index 0ae5cf2f..8a472a7e 100644 --- a/MobileGL/MG_IntegrationTest/Harness/split_log_paths.py +++ b/MobileGL/MG_IntegrationTest/Harness/split_log_paths.py @@ -175,7 +175,7 @@ DUALBLOCK_ALLOWED_SKIPS = { "DirectGLES cannot forward a geometry-shader-less adjacency draw", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines": "does not produce this picture yet: a flipped multisample depth resolve writes nothing", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly": + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly": "the frontend's binding-qualifier seeding does not walk an array of arrays", # ...and driver capabilities llvmpipe does not have (the runner and the host both skip them). "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable": diff --git a/MobileGL/MG_IntegrationTest/Harness/test_split_log_paths.py b/MobileGL/MG_IntegrationTest/Harness/test_split_log_paths.py index 9441a30a..12f79025 100644 --- a/MobileGL/MG_IntegrationTest/Harness/test_split_log_paths.py +++ b/MobileGL/MG_IntegrationTest/Harness/test_split_log_paths.py @@ -112,7 +112,7 @@ class ResultAccountingTest(unittest.TestCase): # different sentence, and must not ride the same row. The accepted half is asserted # FIRST: without it this case would pass on a helper that does not list the entry at all # (CI's dual-block census went red on exactly that, run 35785685692 onward). - name = "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly" + name = "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly" self.assertIn(name, helper.DUALBLOCK_ALLOWED_SKIPS) for reason, accepted in [ ("the frontend's binding-qualifier seeding does not walk an array of arrays, so " diff --git a/MobileGL/MG_IntegrationTest/Harness/verify-split-unarmed-expected.txt b/MobileGL/MG_IntegrationTest/Harness/verify-split-unarmed-expected.txt index de9fadd3..d61ea373 100644 --- a/MobileGL/MG_IntegrationTest/Harness/verify-split-unarmed-expected.txt +++ b/MobileGL/MG_IntegrationTest/Harness/verify-split-unarmed-expected.txt @@ -128,7 +128,7 @@ DirectVulkan.VerifySplit.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCoun # FRAMEBUFFER COMPLETENESS QUERIES - attach and ask, never render (2) # glCheckFramebufferStatus on an attachment of that format. Only the DirectGLES half is # here: on DirectVulkan both cases SKIP (the format is not renderable on lavapipe), and a skip is -# recognised without a name. +# recognized without a name. # -------------------------------------------------------------------------------------------- DirectGLES.VerifySplit.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete DirectGLES.VerifySplit.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete diff --git a/MobileGL/MG_IntegrationTest/Scenarios/AtomicCounterScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/AtomicCounterScenario.cpp index 25d87572..47aaac3a 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/AtomicCounterScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/AtomicCounterScenario.cpp @@ -271,7 +271,7 @@ void main() { // outside the range: offset 4 still holds the seed on the CPU side and the first dispatch's // increments on the GPU. Renaming it would put the seed back and the second dispatch would // count from there. - TEST_F(AtomicCounterScenario, APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour) { + TEST_F(AtomicCounterScenario, APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor) { if (!Ready() || IsSkipped()) return; const GLuint zero = MakeCounterBuffer(0, {0u, 0u}); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/BandedReadbackScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/BandedReadbackScenario.cpp index 1527b859..25acbd9b 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/BandedReadbackScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/BandedReadbackScenario.cpp @@ -221,7 +221,7 @@ namespace MGITest { glReadBuffer(GL_COLOR_ATTACHMENT0); ASSERT_EQ(glCheckFramebufferStatus(GL_FRAMEBUFFER), static_cast(GL_FRAMEBUFFER_COMPLETE)); - auto stripeColour = [](int x, int y) { + auto stripeColor = [](int x, int y) { const int stripe = y / 32; const int half = x / 128; return std::array{static_cast(stripe) / 16.0f, static_cast(half), @@ -231,9 +231,9 @@ namespace MGITest { glEnable(GL_SCISSOR_TEST); for (int stripe = 0; stripe < kHeight / 32; ++stripe) { for (int half = 0; half < 2; ++half) { - const auto colour = stripeColour(half * 128, stripe * 32); + const auto color = stripeColor(half * 128, stripe * 32); glScissor(half * 128, stripe * 32, 128, 32); - glClearColor(colour[0], colour[1], colour[2], colour[3]); + glClearColor(color[0], color[1], color[2], color[3]); glClear(GL_COLOR_BUFFER_BIT); } } @@ -247,7 +247,7 @@ namespace MGITest { std::string first; for (int y = 0; y < kHeight; ++y) { for (int x = 0; x < kWidth; ++x) { - const auto expected = stripeColour(x, y); + const auto expected = stripeColor(x, y); const GLfloat* got = pixels.data() + (static_cast(y) * kWidth + x) * 4; if (std::memcmp(got, expected.data(), sizeof(expected)) != 0 && bad++ == 0) { first = "(" + std::to_string(x) + "," + std::to_string(y) + ") = " + std::to_string(got[0]) + "," + @@ -278,7 +278,7 @@ namespace MGITest { // offset box so every band's own box origin is exercised as well. PACK_ALIGNMENT 8 with an odd // ROW_LENGTH pads every row, SKIP_ROWS / SKIP_PIXELS move the first byte - and the bytes GL does // NOT name must keep their sentinel, which is what a band scattered on the wrong stride breaks. - TEST_F(BandedReadbackScenario, BandedReadsHonourPackAlignmentRowLengthAndSkips) { + TEST_F(BandedReadbackScenario, BandedReadsHonorPackAlignmentRowLengthAndSkips) { if (!Ready()) return; struct PackCase { PatternFormat format; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ClearOrderScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ClearOrderScenario.cpp index 92a2f0a5..459ba7c0 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ClearOrderScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ClearOrderScenario.cpp @@ -262,7 +262,7 @@ void main() { color = tint; })"; ExpectPixel(pair.main, 4, 4, green, "the draw after the clear passes the cleared depth"); } - TEST_F(ClearOrderScenario, AColourClearThroughItsOwnFramebufferReachesAnotherFramebufferHoldingTheTexture) { + TEST_F(ClearOrderScenario, AColorClearThroughItsOwnFramebufferReachesAnotherFramebufferHoldingTheTexture) { if (!Ready() || IsSkipped()) return; const GLuint texture = NewColor(kSize, kSize, black); const GLuint own = NewFramebuffer(texture, 0); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ClearThenReadPixelsScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ClearThenReadPixelsScenario.cpp index 86fdf39f..a55909b7 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ClearThenReadPixelsScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ClearThenReadPixelsScenario.cpp @@ -98,10 +98,10 @@ void main() { o_color = vec4(0.1, 0.2, 0.3, 1.0); } DrawFullViewportQuad(program); { const Image painted = ReadPixels(width, height); - const Rgba8 centre = painted.At(width / 2, height / 2); - ASSERT_NEAR(centre.r, 26, 2) << "the setup frame did not paint; the staleness test would be vacuous"; - ASSERT_NEAR(centre.g, 51, 2); - ASSERT_NEAR(centre.b, 77, 2); + const Rgba8 center = painted.At(width / 2, height / 2); + ASSERT_NEAR(center.r, 26, 2) << "the setup frame did not paint; the staleness test would be vacuous"; + ASSERT_NEAR(center.g, 51, 2); + ASSERT_NEAR(center.b, 77, 2); } gl.EndFrame(); @@ -220,13 +220,13 @@ void main() { o_color = vec4(0.1, 0.2, 0.3, 1.0); } const Image blitted = ReadPixels(width, height); EXPECT_EQ(FirstGLError(), 0u); - const Rgba8 centre = blitted.At(width / 2, height / 2); - EXPECT_NEAR(centre.r, 26, 2) << "the blit into the default framebuffer did not survive the clear that " + const Rgba8 center = blitted.At(width / 2, height / 2); + EXPECT_NEAR(center.r, 26, 2) << "the blit into the default framebuffer did not survive the clear that " "preceded it; read back rgba(" - << static_cast(centre.r) << ", " << static_cast(centre.g) << ", " - << static_cast(centre.b) << ", " << static_cast(centre.a) << ")"; - EXPECT_NEAR(centre.g, 51, 2); - EXPECT_NEAR(centre.b, 77, 2); + << static_cast(center.r) << ", " << static_cast(center.g) << ", " + << static_cast(center.b) << ", " << static_cast(center.a) << ")"; + EXPECT_NEAR(center.g, 51, 2); + EXPECT_NEAR(center.b, 77, 2); DestroyColorFbo(source); gl.EndFrame(); @@ -323,10 +323,10 @@ void main() { o_color = vec4(0.1, 0.2, 0.3, 1.0); } EXPECT_EQ(FirstGLError(), 0u); const Image painted = ReadPixels(width, height); - const Rgba8 centre = painted.At(width / 2, height / 2); - EXPECT_NEAR(centre.r, 26, 2) << "the draw did not survive the clear that preceded it"; - EXPECT_NEAR(centre.g, 51, 2); - EXPECT_NEAR(centre.b, 77, 2); + const Rgba8 center = painted.At(width / 2, height / 2); + EXPECT_NEAR(center.r, 26, 2) << "the draw did not survive the clear that preceded it"; + EXPECT_NEAR(center.g, 51, 2); + EXPECT_NEAR(center.b, 77, 2); gl.EndFrame(); glDeleteProgram(program); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ClientVertexArrayScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ClientVertexArrayScenario.cpp index 1431a7f8..1861715f 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ClientVertexArrayScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ClientVertexArrayScenario.cpp @@ -88,7 +88,7 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } // comparison - the claim is about the vertex SOURCE, not about rasterisation. const float kQuad[] = {-1.0f, -1.0f, 1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f}; - Rgba8 CentreAfter(int width, int height) { + Rgba8 CenterAfter(int width, int height) { const Image image = ReadPixelsRect(0, 0, width, height); return image.At(width / 2, height / 2); } @@ -145,12 +145,12 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } glUseProgram(program); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - const Rgba8 centre = CentreAfter(width, height); - EXPECT_GT(static_cast(centre.g), 200) - << "the client-memory vertex array never reached the draw: the center is " << centre + const Rgba8 center = CenterAfter(width, height); + EXPECT_GT(static_cast(center.g), 200) + << "the client-memory vertex array never reached the draw: the center is " << center << ", i.e. still the clear color. The draw did not consume its owned client-vertex snapshot"; - EXPECT_LT(static_cast(centre.b), 60) - << "the quad drew, but the clear color is still showing through: " << centre; + EXPECT_LT(static_cast(center.b), 60) + << "the quad drew, but the clear color is still showing through: " << center; quad.Release(); glUseProgram(0); @@ -302,7 +302,7 @@ void main() { glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, 0); glUseProgram(program); glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr); - EXPECT_GT(CentreAfter(Gl().Width(), Gl().Height()).g, 200); + EXPECT_GT(CenterAfter(Gl().Width(), Gl().Height()).g, 200); quad.Release(); glUseProgram(0); glDeleteBuffers(1, &ebo); @@ -351,7 +351,7 @@ void main() { gl_Position = vec4(aPos + aOffset, 0.0, 1.0); } glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, 0); glUseProgram(program); glDrawArraysIndirect(GL_TRIANGLE_STRIP, nullptr); - EXPECT_GT(CentreAfter(Gl().Width(), Gl().Height()).g, 200); + EXPECT_GT(CenterAfter(Gl().Width(), Gl().Height()).g, 200); quad.Release(); glUseProgram(0); glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ClipDistanceScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ClipDistanceScenario.cpp index ec62517e..ecea596d 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ClipDistanceScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ClipDistanceScenario.cpp @@ -31,7 +31,7 @@ // clip by EVERY declared gl_ClipDistance regardless of the enables, so // AnEnabledClipDistanceRemovesTheNegativeHalf goes green there against the broken tree as well, // and the two cases that need real per-distance semantics skip (see -// DriverHonoursPerDistanceEnables). What actually pins the behavior is Adreno, through +// DriverHonorsPerDistanceEnables). What actually pins the behavior is Adreno, through // KHR-GLxx.clip_distance.functional - whose "without dynamic redeclaration" variants declare all // gl_MaxClipDistances slots and enable only the first N, i.e. exactly the subset semantics these // skipped cases assert. Read a green CI run here as "the state survives the frontend", not as @@ -183,7 +183,7 @@ void main() { fragColor = vec4(0.0, 1.0, 0.0, 1.0); } // pipeline key - a feature, not a fix, and deliberately not attempted here. The // cases that need the real semantics gate on this probe and say so when they skip, // rather than being deleted or silently weakened. - bool DriverHonoursPerDistanceEnables(GLuint program, GLuint vao) const { + bool DriverHonorsPerDistanceEnables(GLuint program, GLuint vao) const { for (int i = 0; i < 8; ++i) { glDisable(static_cast(GL_CLIP_DISTANCE0 + i)); } @@ -323,17 +323,17 @@ void main() { fragColor = vec4(0.0, 1.0, 0.0, 1.0); } EXPECT_EQ(FirstGLError(), 0u); EXPECT_TRUE(IsGreen(right)) << "with every clip distance disabled the whole triangle must survive"; - const bool driverHonoursEnables = IsGreen(left); + const bool driverHonorsEnables = IsGreen(left); glUseProgram(0); glBindVertexArray(0); glDeleteProgram(program); glDeleteVertexArrays(1, &vao); gl.EndFrame(); - if (!driverHonoursEnables) { + if (!driverHonorsEnables) { GTEST_SKIP() << "renderer " << gl.RendererString() << " clips by a DISABLED gl_ClipDistance - it does not implement per-distance enable state " - "(see DriverHonoursPerDistanceEnables). Emulating GL's semantics there needs shader-side " + "(see DriverHonorsPerDistanceEnables). Emulating GL's semantics there needs shader-side " "masking keyed on the enable mask, which is a separate feature"; } } @@ -363,7 +363,7 @@ void main() { fragColor = vec4(0.0, 1.0, 0.0, 1.0); } glDisable(GL_SCISSOR_TEST); glDisable(GL_DEPTH_TEST); glDisable(GL_CULL_FACE); - if (!DriverHonoursPerDistanceEnables(program, vao)) { + if (!DriverHonorsPerDistanceEnables(program, vao)) { glUseProgram(0); glBindVertexArray(0); glDeleteProgram(program); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/CopyImageLayeredScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/CopyImageLayeredScenario.cpp index 0aa283d4..f3e5adb0 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/CopyImageLayeredScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/CopyImageLayeredScenario.cpp @@ -227,7 +227,7 @@ namespace MGITest { // The same pair with the layer ranges offset differently on the two sides: the shape that // separates "copies more than slice 0" from "copies the RIGHT slices". A backend that read // the source range but wrote from layer 0 (or vice versa) passes the case above. - TEST_F(CopyImageLayeredScenario, ArrayToArrayHonoursDifferentLayerOffsets) { + TEST_F(CopyImageLayeredScenario, ArrayToArrayHonorsDifferentLayerOffsets) { if (!Ready() || IsSkipped()) return; const GLuint source = MakeTexture(GL_TEXTURE_2D_ARRAY, 1, SourceColor); @@ -247,7 +247,7 @@ namespace MGITest { // 3d -> 3d. Neither endpoint has array layers at all: the depth travels on extent.depth and // the offsets on srcOffset.z/dstOffset.z, with both layer counts pinned to 1. - TEST_F(CopyImageLayeredScenario, VolumeToVolumeHonoursNonZeroZ) { + TEST_F(CopyImageLayeredScenario, VolumeToVolumeHonorsNonZeroZ) { if (!Ready() || IsSkipped()) return; const GLuint source = MakeTexture(GL_TEXTURE_3D, 1, SourceColor); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/CrossFrameBufferScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/CrossFrameBufferScenario.cpp index 43f9a4f1..455497ae 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/CrossFrameBufferScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/CrossFrameBufferScenario.cpp @@ -579,7 +579,7 @@ void main() { const std::vector allRed = SceneVertices(/*leftQuadIsGreen=*/false); const GLsizeiptr leftQuadBytes = GLsizeiptr(kLeftQuadVertexCount * sizeof(Vertex)); - int centreSampleMissed = 0; + int centerSampleMissed = 0; std::string missedVertices; for (int staleVertex = 0; staleVertex < kLeftQuadVertexCount; ++staleVertex) { // Every left-quad vertex turns green except this one. @@ -608,21 +608,21 @@ void main() { // What the old two-pixel form of ExpectHalves would have concluded. if (std::strcmp(image.ColorName(w / 4, h / 2), "green") == 0) { - ++centreSampleMissed; + ++centerSampleMissed; if (!missedVertices.empty()) missedVertices += ","; missedVertices += std::to_string(staleVertex); } } - EXPECT_GT(centreSampleMissed, 0) + EXPECT_GT(centerSampleMissed, 0) << "no single-vertex staleness was invisible to a center sample, so this negative control " << "is no longer demonstrating anything - re-derive it before trusting it"; - if (centreSampleMissed > 0) { - RecordProperty("centre_sample_blind_to_stale_vertices", missedVertices); + if (centerSampleMissed > 0) { + RecordProperty("center_sample_blind_to_stale_vertices", missedVertices); std::fprintf(stderr, "[itest] whole-region scan caught all %d single-stale-vertex cases; a center " "sample alone was blind to %d of them (vertices %s)\n", - kLeftQuadVertexCount, centreSampleMissed, missedVertices.c_str()); + kLeftQuadVertexCount, centerSampleMissed, missedVertices.c_str()); } EXPECT_EQ(FirstGLError(), GLenum(GL_NO_ERROR)); } diff --git a/MobileGL/MG_IntegrationTest/Scenarios/CsoContentAddressingScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/CsoContentAddressingScenario.cpp index 90c60203..560784dc 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/CsoContentAddressingScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/CsoContentAddressingScenario.cpp @@ -10,7 +10,7 @@ // // P2's render-state CSO is content-addressed: the client hashes the 396 pipeline bytes, probes a // 64-entry cache, memcmps a hash hit and reuses the handle. The whole design is measured against -// a knob that turns that off - kMGPipeBehaviourNoCsoContentAddressing, bit 63 of the runtime +// a knob that turns that off - kMGPipeBehaviorNoCsoContentAddressing, bit 63 of the runtime // MOBILEGL_PIPE_PUSH bitmask - so that "push is slower" can be told apart from "the CSO design is // slower" (P2 brief D.4.5). A measurement knob has one characteristic failure mode: it stops // steering anything and every later number is quietly taken against a switch that does nothing. @@ -305,7 +305,7 @@ void main() { oColor = vec4(0.0, 1.0, 0.0, 1.0); } << "with content addressing on the cache must be answering binds it did not mint. " << window.line; } else if (m_lane == kLaneNoContentAddressing) { EXPECT_EQ(window.mints, window.binds) - << "kMGPipeBehaviourNoCsoContentAddressing (bit 63 of MOBILEGL_PIPE_PUSH) must make every " + << "kMGPipeBehaviorNoCsoContentAddressing (bit 63 of MOBILEGL_PIPE_PUSH) must make every " "bind mint a fresh CSO - the map is never probed and no handle is ever reused. Equal " "counters are the only reading that proves the bit STEERED anything: if it were " "ignored, this arm would report the same bounded mint count as the other one. It " diff --git a/MobileGL/MG_IntegrationTest/Scenarios/DepthStencilReadbackMatrixScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/DepthStencilReadbackMatrixScenario.cpp index 93adb7ef..861d6397 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/DepthStencilReadbackMatrixScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/DepthStencilReadbackMatrixScenario.cpp @@ -636,9 +636,9 @@ namespace MGITest { EXPECT_EQ(FirstGLError(), 0u); ExpectAllDepth(top, 0.25f, "flipped resolve: the destination's top band"); // Color went the same way up, through the arm that could already do this. - std::array colour{}; - glReadPixels(kWidth / 2, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, colour.data()); - EXPECT_EQ(colour, (std::array{0, 255, 0, 255})) + std::array color{}; + glReadPixels(kWidth / 2, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, color.data()); + EXPECT_EQ(color, (std::array{0, 255, 0, 255})) << "flipped resolve: color and depth must agree about which way up the blit landed"; // THE STENCIL ASPECT, NARROW AND OFFSET ON BOTH SIDES. The copy-out moves one aspect @@ -1280,7 +1280,7 @@ namespace MGITest { // The PACK pixel-store parameters apply to a depth read exactly as they do to a color // one, and the gap regions they create must be left alone. - TEST_F(DepthStencilReadbackMatrixScenario, DepthReadbackHonoursThePackPixelStoreParameters) { + TEST_F(DepthStencilReadbackMatrixScenario, DepthReadbackHonorsThePackPixelStoreParameters) { if (!Ready()) return; DepthSource source = MakeTextureSource(GL_DEPTH_COMPONENT24); ASSERT_TRUE(SourceIsUsable()); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/DepthStencilReadbackScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/DepthStencilReadbackScenario.cpp index ad27db88..2e613912 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/DepthStencilReadbackScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/DepthStencilReadbackScenario.cpp @@ -112,11 +112,11 @@ namespace MGITest { glClearDepth(0.25); glClear(GL_DEPTH_BUFFER_BIT); - const float centre = ReadDepthAt(width / 2, height / 2); + const float center = ReadDepthAt(width / 2, height / 2); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_NEAR(centre, 0.25f, 1.0f / 4096.0f) - << "glReadPixels(GL_DEPTH_COMPONENT) of the default framebuffer returned " << centre - << (std::fabs(centre - kDepthPoison) < 1e-6f ? " - the destination was never written at all" : ""); + EXPECT_NEAR(center, 0.25f, 1.0f / 4096.0f) + << "glReadPixels(GL_DEPTH_COMPONENT) of the default framebuffer returned " << center + << (std::fabs(center - kDepthPoison) < 1e-6f ? " - the destination was never written at all" : ""); gl.EndFrame(); } @@ -139,10 +139,10 @@ namespace MGITest { glClearStencil(3); glClear(GL_STENCIL_BUFFER_BIT); - const int centre = ReadStencilAt(width / 2, height / 2); + const int center = ReadStencilAt(width / 2, height / 2); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_EQ(centre, 3) << "glReadPixels(GL_STENCIL_INDEX) of the default framebuffer returned " << centre - << (centre == kStencilPoison ? " - the destination was never written at all" : ""); + EXPECT_EQ(center, 3) << "glReadPixels(GL_STENCIL_INDEX) of the default framebuffer returned " << center + << (center == kStencilPoison ? " - the destination was never written at all" : ""); gl.EndFrame(); } diff --git a/MobileGL/MG_IntegrationTest/Scenarios/DualSourceBlendScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/DualSourceBlendScenario.cpp index 38ec6ff6..cc39a8f3 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/DualSourceBlendScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/DualSourceBlendScenario.cpp @@ -198,11 +198,11 @@ void main() const Image image = ReadPixels(kExtent, kExtent); ASSERT_FALSE(image.Empty()); - const Rgba8 centre = image.At(kExtent / 2, kExtent / 2); - const int red = static_cast(centre.r); + const Rgba8 center = image.At(kExtent / 2, kExtent / 2); + const int red = static_cast(center.r); const bool blended = red > 100 && red < 160; const bool declined = red > 245; - EXPECT_TRUE(blended || declined) << "got " << centre + EXPECT_TRUE(blended || declined) << "got " << center << ", which is neither the dual-source blend (~128) nor the declined " << "straight-through source (255) - the SRC1 factors were mistranslated"; Gl().EndFrame(); @@ -227,9 +227,9 @@ void main() const Image image = ReadPixels(kExtent, kExtent); ASSERT_FALSE(image.Empty()); - const Rgba8 centre = image.At(kExtent / 2, kExtent / 2); - EXPECT_GT(static_cast(centre.r), 245) - << "got " << centre << ": blending is disabled, so the source has to be written straight through"; + const Rgba8 center = image.At(kExtent / 2, kExtent / 2); + EXPECT_GT(static_cast(center.r), 245) + << "got " << center << ": blending is disabled, so the source has to be written straight through"; Gl().EndFrame(); } diff --git a/MobileGL/MG_IntegrationTest/Scenarios/F1WireScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/F1WireScenario.cpp index 0b1e9d5a..97bdeee4 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/F1WireScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/F1WireScenario.cpp @@ -1209,7 +1209,7 @@ void main() { color = value; } if (Gl().BackendName() != "DirectVulkan") GTEST_SKIP() << "Magma short-UBO compatibility policy"; Attach(GL_RGBA8); const char* fragment = R"(#version 430 core -layout(std140, binding=3) uniform ShortColour { vec4 value; vec4 tail; }; +layout(std140, binding=3) uniform ShortColor { vec4 value; vec4 tail; }; layout(location=0) out vec4 color; void main() { color = value + tail; } )"; @@ -1265,7 +1265,7 @@ void main() { color = value + tail; } if (Gl().BackendName() != "DirectVulkan") GTEST_SKIP() << "Magma short-UBO compatibility policy"; Attach(GL_RGBA8); const char* fragment = R"(#version 430 core -layout(std140, binding=3) uniform ShortColour { vec4 value; vec4 tail; }; +layout(std140, binding=3) uniform ShortColor { vec4 value; vec4 tail; }; layout(location=0) out vec4 color; void main() { color = value + tail; } )"; @@ -2136,17 +2136,16 @@ void main() { color = vec4(0.5, 0.5, 0.5, 1.0); } for (int layer = 0; layer < 2; ++layer) for (int y = 0; y < 8; ++y) for (int x = 0; x < 8; ++x) { - const auto colour = layer == 0 ? InPlaceQuadrant(x, y) : kInPlaceMagenta; + const auto color = layer == 0 ? InPlaceQuadrant(x, y) : kInPlaceMagenta; const size_t at = (static_cast(layer) * 64 + y * 8 + x) * 4; - std::copy(colour.begin(), colour.end(), level0.begin() + at); + std::copy(color.begin(), color.end(), level0.begin() + at); } glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, 8, 8, 2, GL_RGBA, GL_UNSIGNED_BYTE, level0.data()); std::vector level1(4 * 4 * 2 * 4); for (int layer = 0; layer < 2; ++layer) for (int at = 0; at < 16; ++at) { - const auto colour = layer == 0 ? kInPlaceCyan : kInPlaceWhite; - std::copy(colour.begin(), colour.end(), - level1.begin() + (static_cast(layer) * 16 + at) * 4); + const auto color = layer == 0 ? kInPlaceCyan : kInPlaceWhite; + std::copy(color.begin(), color.end(), level1.begin() + (static_cast(layer) * 16 + at) * 4); } glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 1, 0, 0, 0, 4, 4, 2, GL_RGBA, GL_UNSIGNED_BYTE, level1.data()); return name; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/FragmentOutputArrayIndexScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/FragmentOutputArrayIndexScenario.cpp index 2c879df3..798bcfe0 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/FragmentOutputArrayIndexScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/FragmentOutputArrayIndexScenario.cpp @@ -139,14 +139,14 @@ void main() { std::vector bytes(static_cast(kSize) * kSize * 4, 0); glReadBuffer(GL_COLOR_ATTACHMENT0 + index); glReadPixels(0, 0, kSize, kSize, GL_RGBA, GL_UNSIGNED_BYTE, bytes.data()); - std::vector centre(4, -1.0f); + std::vector center(4, -1.0f); // The middle pixel: the quad covers the whole target, so every pixel is the same, // and the middle one cannot be a rasterization edge case. const std::size_t offset = (static_cast(kSize / 2) * kSize + kSize / 2) * 4; for (int i = 0; i < 4; ++i) { - centre[static_cast(i)] = static_cast(bytes[offset + i]) / 255.0f; + center[static_cast(i)] = static_cast(bytes[offset + i]) / 255.0f; } - return centre; + return center; } GLuint m_fbo = 0; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/GenerateMipmapServerScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/GenerateMipmapServerScenario.cpp index bfe53431..d2757736 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/GenerateMipmapServerScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/GenerateMipmapServerScenario.cpp @@ -216,8 +216,8 @@ void main() { o_color = gl_FragCoord.y < u_split ? u_bottom : u_top; } return texels; } - static std::vector Flat(const Format& format, int edge, const Rgb& colour, float depth) { - return Halves(format, edge, colour, colour, depth, depth); + static std::vector Flat(const Format& format, int edge, const Rgb& color, float depth) { + return Halves(format, edge, color, color, depth, depth); } static void DefineLevel(const Format& format, int level, int edge, const std::vector& texels) { @@ -273,8 +273,8 @@ void main() { o_color = gl_FragCoord.y < u_split ? u_bottom : u_top; } if (std::abs(got.r - want) > 2) return; continue; } - const Rgb& colour = low ? bottom : top; - const int want[3] = {ToByte(colour[0]), ToByte(colour[1]), ToByte(colour[2])}; + const Rgb& color = low ? bottom : top; + const int want[3] = {ToByte(color[0]), ToByte(color[1]), ToByte(color[2])}; const int have[3] = {got.r, got.g, got.b}; for (int c = 0; c < 3; ++c) { EXPECT_NEAR(have[c], want[c], 2) @@ -285,9 +285,9 @@ void main() { o_color = gl_FragCoord.y < u_split ? u_bottom : u_top; } } } - static void ExpectFlat(const Image& image, const Format& format, const Rgb& colour, float depth, + static void ExpectFlat(const Image& image, const Format& format, const Rgb& color, float depth, const std::string& what) { - ExpectHalves(image, format, colour, colour, depth, depth, what); + ExpectHalves(image, format, color, color, depth, depth, what); } void Generate() { diff --git a/MobileGL/MG_IntegrationTest/Scenarios/Glsl420DeclarationScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/Glsl420DeclarationScenario.cpp index 6e846057..812c236c 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/Glsl420DeclarationScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/Glsl420DeclarationScenario.cpp @@ -324,10 +324,10 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } } glUseProgram(0); - const Rgba8 centre = DrawAndRead(program); + const Rgba8 center = DrawAndRead(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_EQ(centre.r, 0) << "sampler array elements that read the wrong texture: " << BadElements(centre.r); - EXPECT_EQ(centre.g, 255) << "the draw did not reach the fragment stage at all"; + EXPECT_EQ(center.r, 0) << "sampler array elements that read the wrong texture: " << BadElements(center.r); + EXPECT_EQ(center.g, 255) << "the draw did not reach the fragment stage at all"; } // An array of ARRAYS of samplers is the shape the two reflections count differently: @@ -341,7 +341,7 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } // Deliberately weak on the pixels for that reason: what is asserted on every backend is that // the program builds, the draw raises no GL error, and the process survives. Where the // descriptors do resolve, the colors are checked too. - TEST_F(Glsl420DeclarationScenario, AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly) { + TEST_F(Glsl420DeclarationScenario, AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly) { if (!Ready()) return; static const std::uint8_t colors[kElements][4] = { @@ -372,7 +372,7 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } } glUseProgram(0); - const Rgba8 centre = DrawAndRead(program); + const Rgba8 center = DrawAndRead(program); EXPECT_EQ(FirstGLError(), 0u) << "declining a descriptor array must not raise a GL error"; if (!MultiDimensionalSamplerArraysAreDeclined()) { @@ -386,14 +386,14 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } // painted nothing, which is the documented Magma outcome. A non-zero red channel is the // third: the draw DID reach the fragment stage and elements read the wrong textures, // which is exactly the silent mismatch this decline exists to prevent. - if (centre.g == 255) { - EXPECT_EQ(centre.r, 0) << "elements of the array of arrays that read the wrong texture: " - << BadElements(centre.r); + if (center.g == 255) { + EXPECT_EQ(center.r, 0) << "elements of the array of arrays that read the wrong texture: " + << BadElements(center.r); return; } - EXPECT_EQ(centre.r, 0) << "the array of arrays was not resolved, but the draw still painted " + EXPECT_EQ(center.r, 0) << "the array of arrays was not resolved, but the draw still painted " "a mismatch instead of being declined: " - << BadElements(centre.r); + << BadElements(center.r); } // Instance k of a uniform block array sits on buffer binding point N+k - again both as @@ -420,10 +420,10 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } } EXPECT_EQ(FirstGLError(), 0u) << "the block queries left a GL error behind"; - const Rgba8 centre = DrawAndRead(program); + const Rgba8 center = DrawAndRead(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_EQ(centre.r, 0) << "block array instances that read the wrong buffer: " << BadElements(centre.r); - EXPECT_EQ(centre.g, 255) << "the draw did not reach the fragment stage at all"; + EXPECT_EQ(center.r, 0) << "block array instances that read the wrong buffer: " << BadElements(center.r); + EXPECT_EQ(center.g, 255) << "the draw did not reach the fragment stage at all"; } // 'invariant' written on a fragment input at #version 420. The same source compiles at @@ -434,10 +434,10 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } const GLuint program = Build(kInvariantInVS, kInvariantInFS); if (program == 0) return; - const Rgba8 centre = DrawAndRead(program); + const Rgba8 center = DrawAndRead(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_EQ(centre.g, 255) << "the invariant-qualified varying did not arrive"; - EXPECT_EQ(centre.r, 0); + EXPECT_EQ(center.g, 255) << "the invariant-qualified varying did not arrive"; + EXPECT_EQ(center.r, 0); } // A #version 420 shader may call atomicCounterIncrement() with no extension at all. The @@ -477,9 +477,9 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } << " yet; the compile above is what this case pins"; } - const Rgba8 centre = DrawAndRead(program); + const Rgba8 center = DrawAndRead(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_EQ(centre.g, 255) << "the atomic-counter shader linked but painted nothing"; + EXPECT_EQ(center.g, 255) << "the atomic-counter shader linked but painted nothing"; } // `layout(location = 0, index = 0)` is the GL default written out loud, and an application @@ -495,11 +495,11 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, 1.0); } const GLuint program = Build(kQuadVS, kExplicitColorIndexFS); if (program == 0) return; - const Rgba8 centre = DrawAndRead(program); + const Rgba8 center = DrawAndRead(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_EQ(centre.g, 255) << "a fragment output declared layout(location = 0, index = 0) painted " + EXPECT_EQ(center.g, 255) << "a fragment output declared layout(location = 0, index = 0) painted " "nothing; its stage was almost certainly refused by the driver"; - EXPECT_EQ(centre.r, 0u); + EXPECT_EQ(center.r, 0u); } } // namespace MGITest diff --git a/MobileGL/MG_IntegrationTest/Scenarios/HandleRecycleScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/HandleRecycleScenario.cpp index 40b47c42..cd453563 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/HandleRecycleScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/HandleRecycleScenario.cpp @@ -165,7 +165,7 @@ namespace MGITest { // MGITEST_HANDLE_ARM would otherwise downgrade that lane's Handles or AbaControl assertion // to the Legacy one, which passes - a lane reporting green for an arm it never ran. Same // shape as CsoContentAddressingScenario's FAIL() on an unknown MGITEST_CSO_LANE. - bool ArmNameIsRecognised() { + bool ArmNameIsRecognized() { const char* name = std::getenv(kArmMarker); return name == nullptr || std::strcmp(name, "handles") == 0 || std::strcmp(name, "legacy") == 0 || std::strcmp(name, "aba") == 0; @@ -440,7 +440,7 @@ void main() { oColor = texture(uTex, vUv); } void SetUp() override { ScenarioTest::SetUp(); if (!Ready()) return; - if (!ArmNameIsRecognised()) { + if (!ArmNameIsRecognized()) { const char* raw = std::getenv(kArmMarker); FAIL() << "unknown " << kArmMarker << " value '" << (raw != nullptr ? raw : "") << "': the arms are handles / legacy / aba. Reading an unrecognized name " diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ImageLoadStoreSsoScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ImageLoadStoreSsoScenario.cpp index b7609c0d..fa1e3529 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ImageLoadStoreSsoScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ImageLoadStoreSsoScenario.cpp @@ -137,7 +137,7 @@ void main() // the whole span instead, which cost seven for those four elements and had to be // declined on a stage that could not afford them - hence the budget gate that used // to be here.) DirectVulkan needs no rewrite at all. - bool PerElementImageUnitsAreHonoured() const { + bool PerElementImageUnitsAreHonored() const { if (Gl().BackendName() == "DirectVulkan") return true; GLint maxFragmentImageUniforms = 0; glGetIntegerv(GL_MAX_FRAGMENT_IMAGE_UNIFORMS, &maxFragmentImageUniforms); @@ -172,7 +172,7 @@ void main() TEST_F(ImageLoadStoreSsoScenario, PerElementImageUnitsReachAPipelineDraw) { if (!Ready()) return; if (!ImagesAreUsable()) GTEST_SKIP() << "fewer than 8 image units"; - if (!PerElementImageUnitsAreHonoured()) { + if (!PerElementImageUnitsAreHonored()) { GTEST_SKIP() << "fewer than 4 fragment image uniforms: the array under test does not fit"; } HeadlessGL& gl = Gl(); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ImageSizeAfterRespecScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ImageSizeAfterRespecScenario.cpp index 8b58b751..60fe124d 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ImageSizeAfterRespecScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ImageSizeAfterRespecScenario.cpp @@ -152,7 +152,7 @@ void main() } // Draw once with `expected` pushed to the shader and report the center pixel. - void DrawAndReadCentre(int expectedWidth, int expectedHeight, unsigned char (¢re)[4]) { + void DrawAndReadCenter(int expectedWidth, int expectedHeight, unsigned char (¢er)[4]) { const GLint location = glGetUniformLocation(m_program, "g_expected_size"); ASSERT_NE(location, -1) << "the program has no g_expected_size uniform"; glUseProgram(m_program); @@ -171,7 +171,7 @@ void main() const std::size_t offset = (static_cast(kTargetSize / 2) * kTargetSize + kTargetSize / 2) * 4; for (int i = 0; i < 4; ++i) { - centre[i] = pixels[offset + static_cast(i)]; + center[i] = pixels[offset + static_cast(i)]; } } @@ -207,12 +207,12 @@ void main() glBindImageTexture(0, m_image, 0, GL_FALSE, 0, GL_READ_ONLY, GL_RGBA8); ASSERT_EQ(FirstGLError(), 0u) << "binding the image texture errored"; - unsigned char centre[4] = {0, 0, 0, 0}; - DrawAndReadCentre(32, 32, centre); - EXPECT_EQ(static_cast(centre[0]), 0) - << "the FIRST draw already disagrees about imageSize(): got (" << static_cast(centre[0]) << ", " - << static_cast(centre[1]) << ", " << static_cast(centre[2]) << ")"; - EXPECT_EQ(static_cast(centre[1]), 255); + unsigned char center[4] = {0, 0, 0, 0}; + DrawAndReadCenter(32, 32, center); + EXPECT_EQ(static_cast(center[0]), 0) + << "the FIRST draw already disagrees about imageSize(): got (" << static_cast(center[0]) << ", " + << static_cast(center[1]) << ", " << static_cast(center[2]) << ")"; + EXPECT_EQ(static_cast(center[1]), 255); // The re-spec. The image unit is deliberately NOT re-bound: GL 4.6 core 8.26 says the // unit references the texture object, so this alone has to be visible to the next draw. @@ -220,12 +220,12 @@ void main() glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr); ASSERT_EQ(FirstGLError(), 0u) << "re-specifying the image texture errored"; - DrawAndReadCentre(16, 16, centre); - EXPECT_EQ(static_cast(centre[0]), 0) + DrawAndReadCenter(16, 16, center); + EXPECT_EQ(static_cast(center[0]), 0) << "after the re-spec the draw still sees the OLD image size; center pixel was (" - << static_cast(centre[0]) << ", " << static_cast(centre[1]) << ", " << static_cast(centre[2]) + << static_cast(center[0]) << ", " << static_cast(center[1]) << ", " << static_cast(center[2]) << ")"; - EXPECT_EQ(static_cast(centre[1]), 255); + EXPECT_EQ(static_cast(center[1]), 255); } } // namespace MGITest diff --git a/MobileGL/MG_IntegrationTest/Scenarios/IntegerBorderColorScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/IntegerBorderColorScenario.cpp index 52160942..dd26d08c 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/IntegerBorderColorScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/IntegerBorderColorScenario.cpp @@ -267,7 +267,7 @@ void main() // The floor, and the control that keeps the two tests below from passing vacuously: an INSIDE // sample has to fetch the texture's own texel. If this fails the sampler, the shader or the // integer readback is broken and nothing about the border color has been measured. - TEST_F(IntegerBorderColorScenario, InsideTexelsAreUnaffectedByTheBorderColour) { + TEST_F(IntegerBorderColorScenario, InsideTexelsAreUnaffectedByTheBorderColor) { if (!Ready()) GTEST_SKIP(); glBindTexture(GL_TEXTURE_2D, m_sourceTexture); @@ -284,7 +284,7 @@ void main() // The regression, texture-object spelling. glTexParameterIiv is the entry point the frontend // already accepted and then flattened into the same FloatVec4 every other spelling wrote. - TEST_F(IntegerBorderColorScenario, TexParameterIivBorderColourSurvivesToAnIntegerSampler) { + TEST_F(IntegerBorderColorScenario, TexParameterIivBorderColorSurvivesToAnIntegerSampler) { if (!Ready()) GTEST_SKIP(); glBindTexture(GL_TEXTURE_2D, m_sourceTexture); @@ -299,7 +299,7 @@ void main() // and a separate code path in both backends (BackendSamplerObject::Sync on DirectGLES, and the // sampler cache key on DirectVulkan, where a border color that is not part of the key would // alias two samplers that differ only in it). - TEST_F(IntegerBorderColorScenario, SamplerParameterIivBorderColourSurvivesToAnIntegerSampler) { + TEST_F(IntegerBorderColorScenario, SamplerParameterIivBorderColorSurvivesToAnIntegerSampler) { if (!Ready()) GTEST_SKIP(); glGenSamplers(1, &m_sampler); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/IoBlockNameCollisionScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/IoBlockNameCollisionScenario.cpp index a857906f..a71092f8 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/IoBlockNameCollisionScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/IoBlockNameCollisionScenario.cpp @@ -282,7 +282,7 @@ void main() // Clears to BLUE, so "the draw painted nothing" is a color of its own rather // than something that could be mistaken for a zeroed payload. - Rgba8 DrawAndReadCentre(GLuint program) const { + Rgba8 DrawAndReadCenter(GLuint program) const { glViewport(0, 0, Gl().Width(), Gl().Height()); glClearColor(0.0f, 0.0f, 1.0f, 1.0f); glClear(GL_COLOR_BUFFER_BIT); @@ -344,9 +344,9 @@ void main() << Gl().BackendName() << ", so there is no block to carry through: " << BuildLog(); } - const Rgba8 centre = DrawAndReadCentre(program); + const Rgba8 center = DrawAndReadCenter(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_TRUE(IsGreen(centre)) << "the control pipeline did not deliver its payload: " << centre; + EXPECT_TRUE(IsGreen(center)) << "the control pipeline did not deliver its payload: " << center; } TEST_F(IoBlockNameCollisionScenario, OneBlockNameInBothDirectionsStillCarriesThePayload) { @@ -368,12 +368,12 @@ void main() "desktop GLSL, but the program did not build: " << BuildLog(); - const Rgba8 centre = DrawAndReadCentre(program); + const Rgba8 center = DrawAndReadCenter(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_TRUE(IsGreen(centre)) + EXPECT_TRUE(IsGreen(center)) << "the payload did not survive the stage that names its input and output block " "the same: " - << centre + << center << " (blue: nothing drew; red: the plain varying was lost too; black: " "the block arrived empty)"; } diff --git a/MobileGL/MG_IntegrationTest/Scenarios/LayeredAttachmentBarrierScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/LayeredAttachmentBarrierScenario.cpp index 58fc4851..cda7fc0a 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/LayeredAttachmentBarrierScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/LayeredAttachmentBarrierScenario.cpp @@ -320,12 +320,12 @@ void main() { o_color = vec4(0.1, 0.2, 0.8, 1.0); } glClearDepth(0.375); glClear(GL_DEPTH_BUFFER_BIT); - const float centre = ReadDepthAt(kWidth / 2, kHeight / 2); + const float center = ReadDepthAt(kWidth / 2, kHeight / 2); glBindFramebuffer(GL_FRAMEBUFFER, 0); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_NEAR(centre, 0.375f, 1.0f / 4096.0f) - << "glReadPixels(GL_DEPTH_COMPONENT) off layer " << kSubjectLayer << " returned " << centre - << (std::fabs(centre - kDepthPoison) < 1e-6f ? " - the destination was never written at all" : ""); + EXPECT_NEAR(center, 0.375f, 1.0f / 4096.0f) + << "glReadPixels(GL_DEPTH_COMPONENT) off layer " << kSubjectLayer << " returned " << center + << (std::fabs(center - kDepthPoison) < 1e-6f ? " - the destination was never written at all" : ""); } // The depth leg of the blit path, both endpoints above layer 0. Verified by reading the diff --git a/MobileGL/MG_IntegrationTest/Scenarios/LayeredAttachmentShapeScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/LayeredAttachmentShapeScenario.cpp index 93ccc320..b78874e9 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/LayeredAttachmentShapeScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/LayeredAttachmentShapeScenario.cpp @@ -909,7 +909,7 @@ void main() // // The draw goes into a scratch 2D target, never into the layered attachment, so the // materialize path is the only consumer that can fire. - TEST_F(LayeredAttachmentShapeScenario, LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace) { + TEST_F(LayeredAttachmentShapeScenario, LayeredCubeMapClearMaterializedBySamplingReachesEveryFace) { if (!Ready()) return; const GLuint program = BuildProgram(nullptr, kCubeSampleFragmentSource); @@ -974,7 +974,7 @@ void main() // The 1D-array half of the same divergence. Pre-existing rather than introduced by this // branch (the clear copy never had ToVulkanLevelExtent), and fixed by the same hoist. - TEST_F(LayeredAttachmentShapeScenario, LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer) { + TEST_F(LayeredAttachmentShapeScenario, LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer) { if (!Ready()) return; const GLuint program = BuildProgram(nullptr, kOneDArraySampleFragmentSource); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/LayeredTextureReadbackScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/LayeredTextureReadbackScenario.cpp index 06dfa3b4..6abe7d91 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/LayeredTextureReadbackScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/LayeredTextureReadbackScenario.cpp @@ -56,7 +56,7 @@ namespace MGITest { constexpr int kCubeLayerFaces = 12; // two cubes, which is what the conformance case uses // A value no store writes, so "the store never landed" and "the store wrote the wrong // thing" cannot be confused - and so a readback served from the stale CPU shadow is - // recognisable on sight. + // recognizable on sight. constexpr GLuint kSeed = 0xFEEDBEEFu; // Deliberately not 0: the unit has to travel through glUniform1i and be baked into the // generated ESSL, so a defect there cannot hide behind the default. diff --git a/MobileGL/MG_IntegrationTest/Scenarios/MagmaWireReclaimScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/MagmaWireReclaimScenario.cpp index 5fd8e4cc..970dd1c9 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/MagmaWireReclaimScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/MagmaWireReclaimScenario.cpp @@ -443,8 +443,8 @@ void main() { fragColor = color[0]; })"; const PipeStatsWindow::LogMark mark = SetupFrame(); ClearTo(0.0f, 0.0f, 0.0f, 0.0f); - const Rgba8 colourA{200, 60, 30, 255}; - const Rgba8 colourB{60, 200, 90, 255}; + const Rgba8 colorA{200, 60, 30, 255}; + const Rgba8 colorB{60, 200, 90, 255}; const auto blockBytes = [](std::size_t size, const Rgba8& c) { // The block's vec4 at offset 0; every other slot holds a color no step draws, so a // read off any other offset is as visible as a read off the dead store. @@ -463,7 +463,7 @@ void main() { fragColor = color[0]; })"; glGenBuffers(1, &ubo); glGenBuffers(1, &pin); glBindBuffer(GL_UNIFORM_BUFFER, ubo); - const std::vector bytesA = blockBytes(kAbaDeadStoreBytes, colourA); + const std::vector bytesA = blockBytes(kAbaDeadStoreBytes, colorA); glBufferData(GL_UNIFORM_BUFFER, GLsizeiptr(bytesA.size()), bytesA.data(), GL_DYNAMIC_DRAW); glBindBufferBase(GL_UNIFORM_BUFFER, 0, ubo); glBindBuffer(GL_COPY_WRITE_BUFFER, pin); @@ -496,7 +496,7 @@ void main() { fragColor = color[0]; })"; glBufferData(GL_ARRAY_BUFFER, 0, nullptr, GL_STREAM_DRAW); // Step 7: a new store through the freed handle value, holding B. glBindBuffer(GL_UNIFORM_BUFFER, ubo); - const std::vector bytesB = blockBytes(kAbaNewStoreBytes, colourB); + const std::vector bytesB = blockBytes(kAbaNewStoreBytes, colorB); glBufferData(GL_UNIFORM_BUFFER, GLsizeiptr(bytesB.size()), bytesB.data(), GL_DYNAMIC_DRAW); glBindBufferBase(GL_UNIFORM_BUFFER, 0, ubo); glBindBuffer(GL_ARRAY_BUFFER, m_buffer); @@ -508,8 +508,8 @@ void main() { fragColor = color[0]; })"; const Image image = ReadPixels(kWidth, kHeight); ASSERT_EQ(FirstGLError(), GLenum(GL_NO_ERROR)); const Rgba8 got = image.At(kWidth / 2, kHeight / 2); - EXPECT_TRUE(Near(got, colourB)) - << "read " << got << ", wanted " << colourB << " (the live store's bytes). " << colourA + EXPECT_TRUE(Near(got, colorB)) + << "read " << got << ", wanted " << colorB << " (the live store's bytes). " << colorA << " is the DEAD store's color: the draw through the re-minted VkBuffer handle reused a " "descriptor set memoized under the first store's handle and read its freed memory " "(ID-P7-43); anything else is that memory already reused"; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/PipeVerifyArmingScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/PipeVerifyArmingScenario.cpp index 888ec33a..0f836a27 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/PipeVerifyArmingScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/PipeVerifyArmingScenario.cpp @@ -189,10 +189,10 @@ void main() { o_color = vec4(0.25, 0.5, 0.75, 1.0); } glBindVertexArray(0); glDeleteBuffers(1, &vbo); glDeleteVertexArrays(1, &vao); - m_centre = pixel; + m_center = pixel; } - Rgba8 m_centre{}; + Rgba8 m_center{}; }; // THE CASE THAT FAILS A LANE WHOSE LIBRARY NEVER ARMED. diff --git a/MobileGL/MG_IntegrationTest/Scenarios/PixelStoreSweepScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/PixelStoreSweepScenario.cpp index 24c3d2ee..500fc731 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/PixelStoreSweepScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/PixelStoreSweepScenario.cpp @@ -311,7 +311,7 @@ namespace MGITest { // not tell a missing round-up from a present one); SKIP_ROWS 1 and SKIP_PIXELS 2 move the // first pixel to byte 24 + 8 = 32 of the image; and the read is issued at buffer offset 16, // so the first pixel lands at 48 and a branch that dropped the offset would land at 32. - TEST_F(PixelStoreSweepScenario, ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone) { + TEST_F(PixelStoreSweepScenario, ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone) { if (!Ready()) return; ResetAllPixelStoreModes(); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/PoisonOmissionScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/PoisonOmissionScenario.cpp index 60a1d771..c5a55008 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/PoisonOmissionScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/PoisonOmissionScenario.cpp @@ -277,8 +277,8 @@ void main() { o_color = vec4(0.25, 0.5, 0.75, 1.0); } // The verb the omission names (kOmittedPairs): a readback, which is a round trip, // so the server has applied it - and read the pack state - before this returns. - unsigned char centre[4] = {}; - glReadPixels(gl.Width() / 2, gl.Height() / 2, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, centre); + unsigned char center[4] = {}; + glReadPixels(gl.Width() / 2, gl.Height() / 2, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, center); std::fprintf(stderr, "[itest] poison worker: glReadPixels returned\n"); // The sequence is the WHOLE datum this child reports, so a GL error in it must be diff --git a/MobileGL/MG_IntegrationTest/Scenarios/PrimitiveRestartScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/PrimitiveRestartScenario.cpp index b3b19622..581fa543 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/PrimitiveRestartScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/PrimitiveRestartScenario.cpp @@ -275,7 +275,7 @@ void main() // A second draw with a DIFFERENT restart index has to be rewritten again. The substitution // stages through one scratch buffer, so a cached or half-restored element-array binding // would show up here as the second draw reusing the first one's data. - TEST_F(PrimitiveRestartScenario, ChangingTheRestartIndexBetweenDrawsIsHonoured) { + TEST_F(PrimitiveRestartScenario, ChangingTheRestartIndexBetweenDrawsIsHonored) { if (!Ready()) GTEST_SKIP(); glEnable(GL_PRIMITIVE_RESTART); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ProgramPipelineScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ProgramPipelineScenario.cpp index 177cfd87..36ba5e3c 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ProgramPipelineScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ProgramPipelineScenario.cpp @@ -553,9 +553,9 @@ void main() { o_color = vec4(1.0); } const int height = gl.Height(); static const char* kUniformBlockFS = R"(#version 430 core -layout(std140) uniform Color { vec4 u_colour; }; +layout(std140) uniform Color { vec4 u_color; }; out vec4 o_color; -void main() { o_color = u_colour; } +void main() { o_color = u_color; } )"; const GLuint vs = MakeSeparable(GL_VERTEX_SHADER, kSeparableVS); const GLuint fs = MakeSeparable(GL_FRAGMENT_SHADER, kUniformBlockFS); @@ -698,9 +698,9 @@ void main() { o_color = vec4(0.0, 1.0, 0.0, u_mvp[3][3]); } const int height = gl.Height(); static const char* kUniformBlockFS = R"(#version 430 core -layout(std140) uniform Color { vec4 u_colour; }; +layout(std140) uniform Color { vec4 u_color; }; out vec4 o_color; -void main() { o_color = u_colour; } +void main() { o_color = u_color; } )"; const GLuint vs = MakeSeparable(GL_VERTEX_SHADER, kSeparableVS); const GLuint fs = MakeSeparable(GL_FRAGMENT_SHADER, kUniformBlockFS); @@ -788,14 +788,14 @@ void main() { o_color = texture(u_tex, vec2(0.5)); } // One texture per unit, each a different solid color, so the pixels say which unit the // draw actually sampled. constexpr int kUnits = 4; - const GLubyte colours[kUnits][4] = {{255, 0, 0, 255}, {0, 255, 0, 255}, {0, 0, 255, 255}, {255, 255, 0, 255}}; + const GLubyte colors[kUnits][4] = {{255, 0, 0, 255}, {0, 255, 0, 255}, {0, 0, 255, 255}, {255, 255, 0, 255}}; const char* names[kUnits] = {"red", "green", "blue", "yellow"}; GLuint textures[kUnits] = {}; glGenTextures(kUnits, textures); for (int unit = 0; unit < kUnits; ++unit) { glActiveTexture(GL_TEXTURE0 + unit); glBindTexture(GL_TEXTURE_2D, textures[unit]); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, colours[unit]); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, colors[unit]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); } diff --git a/MobileGL/MG_IntegrationTest/Scenarios/RenderbufferBlendFormatScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/RenderbufferBlendFormatScenario.cpp index ae78c68a..e3a6990a 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/RenderbufferBlendFormatScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/RenderbufferBlendFormatScenario.cpp @@ -144,12 +144,12 @@ void main() void ExpectBlendedRatherThanOverwritten(const char* what) { const Image image = ReadPixels(kExtent, kExtent); ASSERT_FALSE(image.Empty()) << what; - const Rgba8 centre = image.At(kExtent / 2, kExtent / 2); - EXPECT_GT(int(centre.r), 40) << what << ": got " << centre + const Rgba8 center = image.At(kExtent / 2, kExtent / 2); + EXPECT_GT(int(center.r), 40) << what << ": got " << center << ", which is darker than a blend of " "black and 50% white"; - EXPECT_LT(int(centre.r), 215) - << what << ": got " << centre << ", which is the source color - blending was disabled"; + EXPECT_LT(int(center.r), 215) + << what << ": got " << center << ", which is the source color - blending was disabled"; } } // namespace diff --git a/MobileGL/MG_IntegrationTest/Scenarios/SampleVariablesScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/SampleVariablesScenario.cpp index 79b60de9..ec17d107 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/SampleVariablesScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/SampleVariablesScenario.cpp @@ -139,9 +139,9 @@ void main() { o_color = vec4(float(gl_NumSamples) * (16.0 / 255.0), 0.0, 0.0, 1. { const Image resolved = ReadPixels(width, height); - const Rgba8 centre = resolved.At(width / 2, height / 2); - EXPECT_NEAR(centre.r, 16 * realizedSamples, 2) - << "gl_NumSamples read " << (centre.r / 16.0) << " into a " << realizedSamples + const Rgba8 center = resolved.At(width / 2, height / 2); + EXPECT_NEAR(center.r, 16 * realizedSamples, 2) + << "gl_NumSamples read " << (center.r / 16.0) << " into a " << realizedSamples << "-sample framebuffer; 1 means the reserved uniform was never written, 0 means it was " << "written but never uploaded"; } @@ -165,11 +165,11 @@ void main() { o_color = vec4(float(gl_NumSamples) * (16.0 / 255.0), 0.0, 0.0, 1. { const Image single = ReadPixels(width, height); - const Rgba8 centre = single.At(width / 2, height / 2); + const Rgba8 center = single.At(width / 2, height / 2); // GL 4.6 core 15.2.2: gl_NumSamples is ONE for a non-multisample framebuffer, where // glGetIntegerv(GL_SAMPLES) answers zero. - EXPECT_NEAR(centre.r, 16, 2) - << "gl_NumSamples read " << (centre.r / 16.0) + EXPECT_NEAR(center.r, 16, 2) + << "gl_NumSamples read " << (center.r / 16.0) << " into a single-sample framebuffer; the value is a property of the DRAW FRAMEBUFFER, " << "so re-using the program must re-write it"; } @@ -255,10 +255,10 @@ void main() { o_color = vec4(float(gl_NumSamples) * (16.0 / 255.0), 0.0, 0.0, 1. glBindFramebuffer(GL_FRAMEBUFFER, 0); const Image resolved = ReadPixels(width, height); - const Rgba8 centre = resolved.At(width / 2, height / 2); + const Rgba8 center = resolved.At(width / 2, height / 2); // The rate changes how OFTEN the shader runs, never what it computes - so the same // gl_NumSamples reading has to come back. - EXPECT_NEAR(centre.r, 16 * realizedSamples, 2) << "the draw changed its result once sample shading was enabled"; + EXPECT_NEAR(center.r, 16 * realizedSamples, 2) << "the draw changed its result once sample shading was enabled"; glMinSampleShading(0.0f); glDisable(GL_SAMPLE_SHADING); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/SampledSetStalenessScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/SampledSetStalenessScenario.cpp index 0e0d847e..4ed0c0a5 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/SampledSetStalenessScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/SampledSetStalenessScenario.cpp @@ -10,7 +10,7 @@ // // DirectVulkan does not bind a texture GL calls incomplete: it substitutes a fallback so the // sampler reads (0,0,0,1) instead of losing the draw. That decision is made twice per draw - once -// by CollectSampledTextures, which builds the list SetupDraw syncs, materialises pending clears +// by CollectSampledTextures, which builds the list SetupDraw syncs, materializes pending clears // for and transitions to a sampled layout BEFORE the render pass opens, and once by the descriptor // resolve inside the pass. Both ask SamplesAsIncompleteTexture. // @@ -138,7 +138,7 @@ void main() { } // namespace // The full sequence, ordered so the ONLY state change between the two draws is the filter. - TEST_F(SampledSetStalenessScenario, AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture) { + TEST_F(SampledSetStalenessScenario, AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture) { if (!Ready() || IsSkipped()) return; // 1. Queue a clear on the texture through an FBO and take it straight back out, with no @@ -186,7 +186,7 @@ void main() { // The same flip driven from a SAMPLER OBJECT rather than the texture's own parameters. It is // the other half of what feeds the completeness predicate, it moves the same generation, and // it likewise binds nothing. - TEST_F(SampledSetStalenessScenario, AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture) { + TEST_F(SampledSetStalenessScenario, AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture) { if (!Ready() || IsSkipped()) return; GLuint sampler = 0; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/SpirvShaderBinaryScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/SpirvShaderBinaryScenario.cpp index 7c7f675c..957975d5 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/SpirvShaderBinaryScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/SpirvShaderBinaryScenario.cpp @@ -316,9 +316,9 @@ namespace MGITest { EXPECT_EQ(FirstGLError(), 0u); const Image painted = ReadPixels(width, height); - const Rgba8 centre = painted.At(width / 2, height / 2); - EXPECT_LT(centre.r, 32) << "the fragment module wrote the wrong channel; constant id 7 was not applied"; - EXPECT_GT(centre.g, 224) << "the center of a 0.5-scaled quad must be painted"; + const Rgba8 center = painted.At(width / 2, height / 2); + EXPECT_LT(center.r, 32) << "the fragment module wrote the wrong channel; constant id 7 was not applied"; + EXPECT_GT(center.g, 224) << "the center of a 0.5-scaled quad must be painted"; // A pixel just inside the corner is OUTSIDE the 0.5-scaled quad and must still be the // clear color - which is what proves constant id 3 reached the vertex module. At the diff --git a/MobileGL/MG_IntegrationTest/Scenarios/SsboArrayLengthScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/SsboArrayLengthScenario.cpp index bb092f4d..9a8568a6 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/SsboArrayLengthScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/SsboArrayLengthScenario.cpp @@ -136,7 +136,7 @@ void main() { return program; } - // A buffer of `elements` ivec4s, filled with a recognisable pattern. + // A buffer of `elements` ivec4s, filled with a recognizable pattern. GLuint MakeStorageBuffer(int elements) { std::vector contents(static_cast(elements) * 4, 41); GLuint buffer = 0; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/SwizzleAccessRoutineScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/SwizzleAccessRoutineScenario.cpp index 062c0ecf..ad5fe757 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/SwizzleAccessRoutineScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/SwizzleAccessRoutineScenario.cpp @@ -47,7 +47,7 @@ namespace MGITest { namespace { - // The conformance test's own source texel, one recognisable value per channel. + // The conformance test's own source texel, one recognizable value per channel. constexpr std::uint32_t kSourceTexel[4] = {0x3FFFFFFFu, 0x7FFFFFFFu, 0xBFFFFFFFu, 0xFFFFFFFFu}; constexpr int kOutputWidth = 8; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/TextureUnitSamplingScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/TextureUnitSamplingScenario.cpp index 37ca778c..07db45d6 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/TextureUnitSamplingScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/TextureUnitSamplingScenario.cpp @@ -130,7 +130,7 @@ void main() { o_color = texture(u_texture, vec2(0.5, 0.5)); } glUniform1i(glGetUniformLocation(m_program, "u_texture"), 0); } - std::array DrawAndReadCentre() { + std::array DrawAndReadCenter() { glBindFramebuffer(GL_FRAMEBUFFER, m_fbo); glClearColor(0.5f, 0.5f, 0.5f, 0.5f); glClear(GL_COLOR_BUFFER_BIT); @@ -170,7 +170,7 @@ void main() { o_color = texture(u_texture, vec2(0.5, 0.5)); } if (HasFatalFailure()) return; glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, m_source); - const auto texel = DrawAndReadCentre(); + const auto texel = DrawAndReadCenter(); EXPECT_EQ(glGetError(), static_cast(GL_NO_ERROR)); EXPECT_EQ(static_cast(texel[0]), 255) << "red: the multisample texture was not bound"; EXPECT_EQ(static_cast(texel[1]), 0); @@ -191,12 +191,12 @@ void main() { o_color = texture(u_texture, vec2(0.5, 0.5)); } UseProgram(kSample2DSource); if (HasFatalFailure()) return; - const auto bound = DrawAndReadCentre(); + const auto bound = DrawAndReadCenter(); ASSERT_EQ(static_cast(bound[0]), 255) << "the control: the bound texture is sampled"; ASSERT_EQ(static_cast(bound[1]), 0); glBindTexture(GL_TEXTURE_2D, 0); - const auto unbound = DrawAndReadCentre(); + const auto unbound = DrawAndReadCenter(); EXPECT_EQ(glGetError(), static_cast(GL_NO_ERROR)); EXPECT_EQ(static_cast(unbound[0]), 0) << "texture 0 is bound, yet the unit still answers with the texture bound before it"; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/TextureViewAliasScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/TextureViewAliasScenario.cpp index 3325b469..0f13a5db 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/TextureViewAliasScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/TextureViewAliasScenario.cpp @@ -224,19 +224,19 @@ void main() { oColor = texture(uTex, vec3(vUv, float(uLayer))); } 30, 255}; } - static std::vector Fill(Rgba8 colour) { + static std::vector Fill(Rgba8 color) { std::vector texels(static_cast(kSize) * kSize * 4); for (std::size_t i = 0; i < texels.size(); i += 4) { - texels[i + 0] = colour.r; - texels[i + 1] = colour.g; - texels[i + 2] = colour.b; - texels[i + 3] = colour.a; + texels[i + 0] = color.r; + texels[i + 1] = color.g; + texels[i + 2] = color.b; + texels[i + 3] = color.a; } return texels; } - void UploadLayerThroughOwner(GLuint owner, int layer, Rgba8 colour) { - const std::vector texels = Fill(colour); + void UploadLayerThroughOwner(GLuint owner, int layer, Rgba8 color) { + const std::vector texels = Fill(color); glBindTexture(GL_TEXTURE_2D_ARRAY, owner); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, layer, kSize, kSize, 1, GL_RGBA, GL_UNSIGNED_BYTE, @@ -247,8 +247,8 @@ void main() { oColor = texture(uTex, vec3(vUv, float(uLayer))); } // THE VIEW-SIDE WRITE. A single-layer GL_TEXTURE_2D view of the array: its own level 0 // is the owner's level , and its own layer 0 is the owner's layer // kViewLayer. glTexSubImage2D here is what ToOwnerRegionOffset has to move. - void UploadThroughView(GLuint view, Rgba8 colour) { - const std::vector texels = Fill(colour); + void UploadThroughView(GLuint view, Rgba8 color) { + const std::vector texels = Fill(color); glBindTexture(GL_TEXTURE_2D, view); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, kSize, kSize, GL_RGBA, GL_UNSIGNED_BYTE, texels.data()); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/TextureViewScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/TextureViewScenario.cpp index 9a35efa3..097546f7 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/TextureViewScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/TextureViewScenario.cpp @@ -719,13 +719,13 @@ void main() { // depend on a CPU sub-image reaching a layer whose content the GPU wrote - which // DirectVulkan does not currently do even for a plain array texture (no view // involved), and which would make a failure here unattributable. - const auto uploadLayer = [&](GLuint texture, int layer, Rgba8 colour) { + const auto uploadLayer = [&](GLuint texture, int layer, Rgba8 color) { std::vector texels(static_cast(kSize) * kSize * 4); for (std::size_t i = 0; i < texels.size(); i += 4) { - texels[i + 0] = colour.r; - texels[i + 1] = colour.g; - texels[i + 2] = colour.b; - texels[i + 3] = colour.a; + texels[i + 0] = color.r; + texels[i + 1] = color.g; + texels[i + 2] = color.b; + texels[i + 3] = color.a; } glBindTexture(GL_TEXTURE_2D_ARRAY, texture); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); @@ -942,7 +942,7 @@ void main() { constexpr int kViewNumLayers = 2; // One color per level, so a level that was redefined from the view's base extent reads // as another level's color rather than as a plausible one. - const Rgba8 levelColour[kLevels] = { + const Rgba8 levelColor[kLevels] = { {255, 0, 0, 255}, {0, 0, 255, 255}, {255, 255, 0, 255}, {255, 0, 255, 255}, {0, 255, 255, 255}}; const GLuint storage = MakeTexture(); @@ -953,10 +953,10 @@ void main() { const int side = kBase >> level; std::vector texels(static_cast(side) * side * kLayers * 4); for (std::size_t at = 0; at < texels.size(); at += 4) { - texels[at + 0] = levelColour[level].r; - texels[at + 1] = levelColour[level].g; - texels[at + 2] = levelColour[level].b; - texels[at + 3] = levelColour[level].a; + texels[at + 0] = levelColor[level].r; + texels[at + 1] = levelColor[level].g; + texels[at + 2] = levelColor[level].b; + texels[at + 3] = levelColor[level].a; } glTexSubImage3D(GL_TEXTURE_2D_ARRAY, level, 0, 0, 0, side, side, kLayers, GL_RGBA, GL_UNSIGNED_BYTE, texels.data()); @@ -1027,7 +1027,7 @@ void main() { // 3 are outside the view's layer window. const bool inWindow = level >= 2 && level <= 3 && layer >= kViewMinLayer && layer < kViewMinLayer + kViewNumLayers; - const Rgba8 expected = inWindow ? Rgba8{0, 255, 0, 255} : levelColour[level]; + const Rgba8 expected = inWindow ? Rgba8{0, 255, 0, 255} : levelColor[level]; const std::string what = "the owner's mip " + std::to_string(level) + ", layer " + std::to_string(layer) + (inWindow ? ", inside the view's window" : ", outside the view's window"); @@ -1062,7 +1062,7 @@ void main() { constexpr std::uint8_t kCanaryByte = 0xAB; // One color per storage layer, so a lost layer origin and a read past the window are // both visible as another layer's color rather than as a plausible one. - const auto layerColour = [](int layer) { + const auto layerColor = [](int layer) { return Rgba8{static_cast(10 * (layer + 1)), 40, 7, 255}; }; const Rgba8 canary{kCanaryByte, kCanaryByte, kCanaryByte, kCanaryByte}; @@ -1077,11 +1077,11 @@ void main() { for (int layer = 0; layer < kLayers; ++layer) { for (int t = 0; t < side * side; ++t) { std::uint8_t* p = texels.data() + (static_cast(layer) * side * side + t) * 4; - const Rgba8 colour = layerColour(layer); - p[0] = colour.r; - p[1] = colour.g; - p[2] = colour.b; - p[3] = colour.a; + const Rgba8 color = layerColor(layer); + p[0] = color.r; + p[1] = color.g; + p[2] = color.b; + p[3] = color.a; } } glTexSubImage3D(GL_TEXTURE_2D_ARRAY, level, 0, 0, 0, side, side, kLayers, GL_RGBA, GL_UNSIGNED_BYTE, @@ -1107,7 +1107,7 @@ void main() { std::memcpy(image.Data(), dst.data() + static_cast(slice) * side * side * 4, static_cast(side) * side * 4); const bool inWindow = slice < kViewNumLayers; - const Rgba8 expected = inWindow ? layerColour(kViewMinLayer + slice) : canary; + const Rgba8 expected = inWindow ? layerColor(kViewMinLayer + slice) : canary; const std::string what = inWindow ? "the view's slice " + std::to_string(slice) + ", the owner's layer " + std::to_string(kViewMinLayer + slice) : "slice " + std::to_string(slice) + diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ThreeChannelAttachmentScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ThreeChannelAttachmentScenario.cpp index 1ecaf48a..4f364219 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ThreeChannelAttachmentScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ThreeChannelAttachmentScenario.cpp @@ -151,7 +151,7 @@ void main() { // color-mask discipline in SyncRenderState is for. GL_DST_ALPHA blending and // glBlitFramebuffer read that stored alpha inside the driver, where no readback fixup can // reach it, so "the storage really holds 1.0" is the only workable invariant. - TEST_F(ThreeChannelAttachmentScenario, WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha) { + TEST_F(ThreeChannelAttachmentScenario, WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha) { if (!Ready() || IsSkipped()) return; std::string error; diff --git a/MobileGL/MG_IntegrationTest/Scenarios/UnlocatedIoBlockScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/UnlocatedIoBlockScenario.cpp index 19eb2c27..38a66baf 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/UnlocatedIoBlockScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/UnlocatedIoBlockScenario.cpp @@ -330,7 +330,7 @@ void main() // Clears to BLUE, so "the draw painted nothing" is a color of its own rather // than something that could be mistaken for a zeroed payload. - Rgba8 DrawAndReadCentre(GLuint program) const { + Rgba8 DrawAndReadCenter(GLuint program) const { glViewport(0, 0, Gl().Width(), Gl().Height()); glClearColor(0.0f, 0.0f, 1.0f, 1.0f); glClear(GL_COLOR_BUFFER_BIT); @@ -413,10 +413,10 @@ void main() << Gl().BackendName() << ", so there is no block to carry through: " << BuildLog(); } - const Rgba8 centre = DrawAndReadCentre(program); + const Rgba8 center = DrawAndReadCenter(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_TRUE(IsGreen(centre)) << "a four-boundary interface-block chain did not deliver its payload: " - << centre + EXPECT_TRUE(IsGreen(center)) << "a four-boundary interface-block chain did not deliver its payload: " + << center << " (blue: nothing drew; red: the plain varying was lost too; black: a block " "member arrived wrong, i.e. the interface stopped matching)"; } @@ -438,9 +438,9 @@ void main() "desktop GLSL, but the program did not build: " << BuildLog(); - const Rgba8 centre = DrawAndReadCentre(program); + const Rgba8 center = DrawAndReadCenter(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_TRUE(IsGreen(centre)) << "the renamed-and-unlocated interface chain lost its payload: " << centre; + EXPECT_TRUE(IsGreen(center)) << "the renamed-and-unlocated interface chain lost its payload: " << center; } // THE ONE CASE THAT CAN FAIL WHEN THE REPAIR SILENTLY STOPS BEING ARMED. @@ -498,9 +498,9 @@ void main() } // Drawn as well as built, so a stack that defers its backend program to first use // still reaches the transpile this is asserting about. - const Rgba8 centre = DrawAndReadCentre(program); + const Rgba8 center = DrawAndReadCenter(program); EXPECT_EQ(FirstGLError(), 0u); - EXPECT_TRUE(IsGreen(centre)) << "the pinned-on lane did not even render correctly: " << centre; + EXPECT_TRUE(IsGreen(center)) << "the pinned-on lane did not even render correctly: " << center; const std::string appended = LibraryLogSince(before); EXPECT_NE(appended.find("WITHOUT their layout(location) qualifier"), std::string::npos) diff --git a/MobileGL/MG_IntegrationTest/Scenarios/ViewportArrayScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/ViewportArrayScenario.cpp index 563ffe69..99dda3f2 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/ViewportArrayScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/ViewportArrayScenario.cpp @@ -301,7 +301,7 @@ void main() { fragColor = gl_FragCoord.z; } // The center of grid cell (x, y), in the bottom-left-origin coordinates glReadPixels // returns. Sampling the center rather than a corner keeps the assertion about WHICH // viewport was selected rather than about edge rounding. - static GLint CellCentre(const std::vector& pixels, int stride, int x, int y) { + static GLint CellCenter(const std::vector& pixels, int stride, int x, int y) { const int px = x * kCellSize + kCellSize / 2; const int py = y * kCellSize + kCellSize / 2; return pixels[static_cast(py) * stride + px]; @@ -326,7 +326,7 @@ void main() { fragColor = gl_FragCoord.z; } for (int y = 0; y < kGridSide; ++y) { for (int x = 0; x < kGridSide; ++x) { const GLint expected = y * kGridSide + x; - EXPECT_EQ(CellCentre(pixels, kSurfaceSide, x, y), expected) + EXPECT_EQ(CellCenter(pixels, kSurfaceSide, x, y), expected) << "cell (" << x << ", " << y << ") should hold viewport index " << expected << "; a single-viewport backend paints the whole image with 15 (the last invocation)"; } @@ -484,12 +484,12 @@ void main() { fragColor = vec4(float(gsIndex) * 16.0 / 255.0, 0.0, 0.0, 1.0); } ASSERT_EQ(glGetError(), GL_NO_ERROR); { const std::vector pixels = ReadInts(kSurfaceSide, kSurfaceSide); - EXPECT_EQ(CellCentre(pixels, kSurfaceSide, kProbeX, kProbeY), kProbeIndex) + EXPECT_EQ(CellCenter(pixels, kSurfaceSide, kProbeX, kProbeY), kProbeIndex) << "the scissored index must still paint inside its own box"; for (int y = 0; y < kGridSide; ++y) { for (int x = 0; x < kGridSide; ++x) { if (x == kProbeX && y == kProbeY) continue; - EXPECT_EQ(CellCentre(pixels, kSurfaceSide, x, y), kUnwritten) + EXPECT_EQ(CellCenter(pixels, kSurfaceSide, x, y), kUnwritten) << "cell (" << x << ", " << y << ") is outside scissor rectangle " << kProbeIndex << " and must be untouched"; } @@ -509,7 +509,7 @@ void main() { fragColor = vec4(float(gsIndex) * 16.0 / 255.0, 0.0, 0.0, 1.0); } const std::vector pixels = ReadInts(kSurfaceSide, kSurfaceSide); for (int y = 0; y < kGridSide; ++y) { for (int x = 0; x < kGridSide; ++x) { - EXPECT_EQ(CellCentre(pixels, kSurfaceSide, x, y), kProbeIndex) + EXPECT_EQ(CellCenter(pixels, kSurfaceSide, x, y), kProbeIndex) << "with the scissor test off for index " << kProbeIndex << ", its full-viewport quad must cover cell (" << x << ", " << y << ")"; } @@ -576,14 +576,14 @@ void main() { fragColor = vec4(float(gsIndex) * 16.0 / 255.0, 0.0, 0.0, 1.0); } const std::vector pixels = ReadInts(kSurfaceSide, kSurfaceSide); // Cell (0, 0) IS viewport 0's rectangle, so it is the one cell an unrouted draw paints // with something. Everything it holds comes from the last geometry invocation. - EXPECT_EQ(CellCentre(pixels, kSurfaceSide, 0, 0), kViewportCount - 1) + EXPECT_EQ(CellCenter(pixels, kSurfaceSide, 0, 0), kViewportCount - 1) << "with the emulation off, viewport 0's rectangle must hold the LAST invocation's " "index - if it holds 0 the routing is still happening and this control proves " "nothing"; for (int y = 0; y < kGridSide; ++y) { for (int x = 0; x < kGridSide; ++x) { if (x == 0 && y == 0) continue; - EXPECT_EQ(CellCentre(pixels, kSurfaceSide, x, y), kUnwritten) + EXPECT_EQ(CellCenter(pixels, kSurfaceSide, x, y), kUnwritten) << "cell (" << x << ", " << y << ") is outside viewport 0's rectangle and an " << "unrouted draw cannot reach it"; } diff --git a/MobileGL/MG_IntegrationTest/Scenarios/XfbAfterClipDistanceScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/XfbAfterClipDistanceScenario.cpp index ac0094e5..f13a66c4 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/XfbAfterClipDistanceScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/XfbAfterClipDistanceScenario.cpp @@ -428,7 +428,7 @@ void main (void) glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, captureBuffer); glBindBuffer(GL_ARRAY_BUFFER, 0); - // The pre-fill that makes "nothing was captured" recognisable. + // The pre-fill that makes "nothing was captured" recognizable. std::vector prefill(storeFloats); for (unsigned i = 0; i < storeFloats; ++i) { prefill[i] = -1.0f - static_cast(i); diff --git a/MobileGL/MG_IntegrationTest/Scenarios/XfbCaptureBufferReuseScenario.cpp b/MobileGL/MG_IntegrationTest/Scenarios/XfbCaptureBufferReuseScenario.cpp index 0eefcf9b..a4917e37 100644 --- a/MobileGL/MG_IntegrationTest/Scenarios/XfbCaptureBufferReuseScenario.cpp +++ b/MobileGL/MG_IntegrationTest/Scenarios/XfbCaptureBufferReuseScenario.cpp @@ -287,7 +287,7 @@ void main() { glGenBuffers(1, &xfbBuffer); glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, xfbBuffer); // Poisoned at creation - the storage is immutable, so this is the only chance to - // put a recognisable value there, and without it a span that captured nothing + // put a recognizable value there, and without it a span that captured nothing // would be indistinguishable from one that captured the right thing whenever the // untouched bytes happened to read back as the expected number. const std::vector poison(kCaptureFloats, kPoison); diff --git a/MobileGL/MG_Pipe/FatalFamilies.def b/MobileGL/MG_Pipe/FatalFamilies.def index 6dfc31b8..0a2bc51b 100644 --- a/MobileGL/MG_Pipe/FatalFamilies.def +++ b/MobileGL/MG_Pipe/FatalFamilies.def @@ -48,7 +48,7 @@ X(UnsizedReadback, ProtocolCorruption, "a readback arrived with no declared size") \ X(BlobMissing, ProtocolCorruption, "a record named a blob that was never staged") \ X(BlobNotStaged, ProtocolCorruption, "a blob was referenced before its staging completed") \ - X(ArtefactsMissing, ProtocolCorruption, "a program create arrived with no artifacts") \ + X(ArtifactsMissing, ProtocolCorruption, "a program create arrived with no artifacts") \ X(ArchiveEmpty, ProtocolCorruption, "a create_*_state archive carried no payload") \ X(BarrierViolation, ProtocolCorruption, "a field was pulled across a verb boundary the barrier forbids") \ X(UnimplementedAdoptTier, ProtocolCorruption, "MOBILEGL_IPC_ADOPT_TIER named a tier P5 does not implement") \ diff --git a/MobileGL/MG_Pipe/FillPoints.def b/MobileGL/MG_Pipe/FillPoints.def index 7f233b9b..38782f3b 100644 --- a/MobileGL/MG_Pipe/FillPoints.def +++ b/MobileGL/MG_Pipe/FillPoints.def @@ -160,8 +160,8 @@ X(kDispatch, GetSamplingResolutionGeneration) \ X(kDispatch, GetImageTextureBinding) \ X(kDispatch, GetFramebufferBindingSlot) \ - /* Magma's PrepareStorageImageTextures materialises a queued clear for every */ \ - /* storage image the dispatch writes, and the clear pre-compensates its colour */ \ + /* Magma's PrepareStorageImageTextures materializes a queued clear for every */ \ + /* storage image the dispatch writes, and the clear pre-compensates its color */ \ /* against GL_FRAMEBUFFER_SRGB (VkClearManager::PreCompensateSrgbClearColor). */ \ X(kDispatch, IsCapabilityEnabled) \ X(kDispatch, GetPatchVertices) \ @@ -224,7 +224,7 @@ X(kTextureOp, GetSamplingResolutionGeneration) \ X(kTextureOp, GetTextureBindGeneration) \ X(kTextureOp, GetMaxTouchedTextureUnit) \ - /* Magma's GenerateMipmap materialises the texture's queued clear before it */ \ + /* Magma's GenerateMipmap materializes the texture's queued clear before it */ \ /* blits (MaterializePendingClearForTexture -> PreCompensateSrgbClearColor, */ \ /* which reads GL_FRAMEBUFFER_SRGB), and a depth texture takes the shader path */ \ /* (GenerateDepthMipmapWithShader -> BindProgramUniformBuffers), whose sampler */ \ diff --git a/MobileGL/MG_Pipe/MGPipe.h b/MobileGL/MG_Pipe/MGPipe.h index eda274c4..ef25a4fe 100644 --- a/MobileGL/MG_Pipe/MGPipe.h +++ b/MobileGL/MG_Pipe/MGPipe.h @@ -123,7 +123,7 @@ namespace MobileGL::MG_Pipe { // NOT a subsystem, a BEHAVIOR: turn OFF client-side content addressing of CSOs, so // every pipeline-version change mints a fresh CSO and the map is never probed. This is // the negative control the whole CSO design is measured against (ROADMAP.md P2). - inline constexpr Uint64 kMGPipeBehaviourNoCsoContentAddressing = 1ull << 63; + inline constexpr Uint64 kMGPipeBehaviorNoCsoContentAddressing = 1ull << 63; // The default of a push build with the knob unset (ConfigLoader.cpp). Each phase's // constant STAYS, because it is the A/B control for the phase after it: P3a's // "everything P2 had and nothing of mine" arm is spelled MOBILEGL_PIPE_PUSH=0x7f. diff --git a/MobileGL/MG_Pipe/MGPipeTypes.h b/MobileGL/MG_Pipe/MGPipeTypes.h index a8935739..bdf93da7 100644 --- a/MobileGL/MG_Pipe/MGPipeTypes.h +++ b/MobileGL/MG_Pipe/MGPipeTypes.h @@ -637,7 +637,7 @@ namespace MobileGL::MG_Pipe { // there is no spare byte and a fifth one costs the alignment slack below. It is paid // once, on a record that fires at most once per link, and it is confined to the push // build (this payload is only ever instantiated under MOBILEGL_PIPE_PUSH), which is - // why G1 does not see it. PipeCatalogueTest pins the new size. + // why G1 does not see it. PipeCatalogTest pins the new size. Uint8 LinkStatus; Uint8 Pad0[7]; MGPBlobRef Spirv[6]; // per stage @@ -1048,7 +1048,7 @@ namespace MobileGL::MG_Pipe { // view the application wrote directly (the verify comparator covers it, and the // emission-side suppressor compares the three views, not it). This is the catalog's // second payload-size amendment after P5b's MGPCopyRegion 64 -> 72 (CONTRACT-P5C.md §7.6): - // 24 -> 56 bytes, and PipeCatalogueTest pins the new size. + // 24 -> 56 bytes, and PipeCatalogTest pins the new size. struct MGPAttribValue { Uint32 Location; Uint8 ValueClass; // Float | Int | Uint | Double @@ -1240,8 +1240,8 @@ namespace MobileGL::MG_Pipe { // need an acknowledgment, and this decides. Only an immutable buffer (glBufferStorage) is a // synchronous allocation; glBufferData is not. glTexStorage* also sets Immutable, but texture // and renderbuffer storage is allocated lazily at sync time, so neither may ack - // (ARCHITECTURE.md §8.3). PipeCatalogue.ResourceRespecifyAcksOnlyImmutableStorage - // (PipeCatalogueTest.cpp) is the negative control against widening it. + // (ARCHITECTURE.md §8.3). PipeCatalog.ResourceRespecifyAcksOnlyImmutableStorage + // (PipeCatalogTest.cpp) is the negative control against widening it. inline Bool MGPipeResourceRespecifyNeedsAck(const MGPResourceDesc& desc) { return desc.Immutable != 0 && desc.Target == kMGPipeResourceTargetBuffer; } diff --git a/MobileGL/MG_Pipe/PipeApply.cpp b/MobileGL/MG_Pipe/PipeApply.cpp index 2babcaac..5646e068 100644 --- a/MobileGL/MG_Pipe/PipeApply.cpp +++ b/MobileGL/MG_Pipe/PipeApply.cpp @@ -25,7 +25,7 @@ // build only. In monolith the archive does not travel - MGPProgramDesc's seven blob refs are // declared with Size 0 and the two structs ride beside the record through the entry point's // companion pointers - so a push build pays nothing for it and the header keeps its forward -// declarations. The verify build serializes, deserialises and compares before storing, which +// declarations. The verify build serializes, deserializes and compares before storing, which // makes the codec LIVE CODE WITH A GATE rather than dead code with a unit test. #include #endif @@ -2060,7 +2060,7 @@ namespace MobileGL::MG_Pipe { // entry. PipeInputs::kMaxVertexAttribs is VertexArrayObject's 32 today, so the // out-of-range arm is unreachable - the guard is what keeps that true if the two ever // stop agreeing. None of the three consistency checks may be left to MOBILEGL_ASSERT, - // which is inert at INFO: a malformed tail would then desynchronise the attribute + // which is inert at INFO: a malformed tail would then desynchronize the attribute // writes without a word in exactly the builds that ship. Uint32 consumed = 0; const char* fault = nullptr; @@ -2303,7 +2303,7 @@ namespace MobileGL::MG_Pipe { // resource_respecify is the only kNeedsAck call, and MGPipeResourceRespecifyNeedsAck(desc) // narrows the ack to an immutable buffer, i.e. glBufferStorage (ARCHITECTURE.md §8.3). In // process the ack is this function's return, so the predicate is not branched on; - // PipeCatalogue.ResourceRespecifyAcksOnlyImmutableStorage pins it. A metadata-only update + // PipeCatalog.ResourceRespecifyAcksOnlyImmutableStorage pins it. A metadata-only update // never acks: the predicate is false for every non-buffer target, and // RespecifyRedefinesNoStorage never classifies a buffer as metadata-only. if (desc.Target != kMGPipeResourceTargetBuffer) return true; @@ -3542,10 +3542,10 @@ namespace MobileGL::MG_Pipe { record.Live = true; // The DESCRIPTOR is what is stored, and the artifacts are not: in monolith the backend // reads the frontend's own archive, and under split the descriptor is what the - // deserialised archive is attached to. Either way the applier owns identity, extent and + // deserialized archive is attached to. Either way the applier owns identity, extent and // order, and never content. record.Desc = desc; - // P5e (pg), gap G-A: "under split the descriptor is what the deserialised archive is + // P5e (pg), gap G-A: "under split the descriptor is what the deserialized archive is // attached to" is now literally true, and this is the attachment. ADOPTED // UNCONDITIONALLY, INCLUDING A NULL: a monolith create must CLEAR an archive a // previous split-arm create left behind, because the record outlives a transport @@ -3731,7 +3731,7 @@ namespace MobileGL::MG_Pipe { // rather than degrade silently. It arms on the transport, not the build, because split // builds also run in-process lanes where such code is correct. No log or counter: it may sit // on hot paths. Product code has no call sites; scripts/ci/unmigrated_emulation_sites.py - // and PipeCatalogue.EveryUnmigratedEmulationIsNamedOnce keep the names and sites equal. + // and PipeCatalog.EveryUnmigratedEmulationIsNamedOnce keep the names and sites equal. namespace { thread_local Bool tl_serverOriginatedWrite = false; } // namespace diff --git a/MobileGL/MG_Pipe/PipeApply.h b/MobileGL/MG_Pipe/PipeApply.h index 7dc3351a..415ab490 100644 --- a/MobileGL/MG_Pipe/PipeApply.h +++ b/MobileGL/MG_Pipe/PipeApply.h @@ -356,7 +356,7 @@ namespace MobileGL::MG_Pipe { // A snapshot of this link's artifacts, so every reflection read by the program twin is // of memory the record owns: ProgramObject::Link() replaces the frontend's artifacts in // place, and a client running ahead may already have relinked. Under a transport the - // decoder deserialises it from SEG_STAGE; in one process PipeRoute copies it without the + // decoder deserializes it from SEG_STAGE; in one process PipeRoute copies it without the // codec. A SharedPtr because a program-pipeline composite and its stage programs share // one link's artifacts and the twin holds it across a build. Every create replaces it. SharedPtr Archive; @@ -1281,7 +1281,7 @@ namespace MobileGL::MG_Pipe { // silent no-op: a record that reached an unimplemented applier and returned quietly is a // dropped binding set, which renders wrong rather than stopping - the exact failure mode // ID-39's sixty-six lost uploads had. Nothing routes either opcode until its package lands - // (PipeCatalogueTest pins both table slots null), so the abort is unreachable today. + // (PipeCatalogTest pins both table slots null), so the abort is unreachable today. // set_shader_buffers, per Class. `tail` is hdr.Count MGPBufferRanges starting at hdr.Start; // Class >= kMGPipeShaderBufferClassCount and Start + Count above the capacity are @@ -1304,7 +1304,7 @@ namespace MobileGL::MG_Pipe { // create_shader_state. `link` and `spirv` are the program's artifacts and `archive` is the // snapshot the record adopts (a null clears the previous one); desc's blob refs are not - // read. Under a transport the decoder passes its deserialised archive and pointers into it; + // read. Under a transport the decoder passes its deserialized archive and pointers into it; // in one process PipeRoute copies the frontend's artifacts into a new archive without the // codec. The verify build round-trips the artifacts through the codec before storing, and a // mismatch is Fatal{PipeVerifyDiffer, "program-archive"}. `archive` has no default so that a @@ -1335,7 +1335,7 @@ namespace MobileGL::MG_Pipe { // abort loudly rather than degrade silently. // // Monolith body: (void)name;. The list of names is pinned by - // PipeCatalogueTest.EveryUnmigratedEmulationIsNamedOnce and the call count is grepped by + // PipeCatalogTest.EveryUnmigratedEmulationIsNamedOnce and the call count is grepped by // the purity gate, so a site that quietly disappears is a red gate rather than a surprise // at P8. void MGPipeUnmigratedEmulation(const char* name); diff --git a/MobileGL/MG_Pipe/PipeCalls.def b/MobileGL/MG_Pipe/PipeCalls.def index 51a526e2..71a3289c 100644 --- a/MobileGL/MG_Pipe/PipeCalls.def +++ b/MobileGL/MG_Pipe/PipeCalls.def @@ -6,10 +6,10 @@ // SPDX-License-Identifier: LGPL-3.0-only // End of Source File Header -// The MGPipe call catalogue (ARCHITECTURE.md §3), one X(Name, PayloadStruct, Class, Flags, +// The MGPipe call catalog (ARCHITECTURE.md §3), one X(Name, PayloadStruct, Class, Flags, // WaitClass) per call, read by scripts/gen_pipe.py into MG_Pipe/generated/*.inc. The wire // opcode is the 1-based row position: append new calls at the end, keep retired rows in place. -// MGP_CALL_LIST_DOCUMENTED_COUNT is the row count, pinned by MG_Test/Pipe/PipeCatalogueTest.cpp. +// MGP_CALL_LIST_DOCUMENTED_COUNT is the row count, pinned by MG_Test/Pipe/PipeCatalogTest.cpp. // Class: kScreen rows go to MGPipeScreen, all others to MGPipeContext. kHasBlob means the // payload owns an MGPBlobRef member; kNeedsAck means a per-record predicate may ask for an ack. // WaitClass (MGPipeWaitClass) is what the client does after publishing under run-ahead; @@ -141,7 +141,7 @@ X(Present, MGPPresent, kCtxVerb, kNone, kWaitPresent) \ X(SetSwapInterval, MGPSwapInterval, kCtxVerb, kOptional, kWaitNone) \ /* ---- APPENDED. Opcodes are positional, so a late arrival goes at the END, never into ---- */ \ - /* ---- its group: three live GLFunctionsTable entries the catalogue had no carrier for. ---- */ \ + /* ---- its group: three live GLFunctionsTable entries the catalog had no carrier for. ---- */ \ /* glGetInteger64v(GL_TIMESTAMP) - GetGpuTimestampNs, a synchronous server answer, which */ \ /* the reply slot carries. The query namespace is the context's (plan 4.3). */ \ X(QueryTimestamp, MGPTimestampRequest, kCtxQuery, kReplySlot, kWaitReply) \ @@ -243,7 +243,7 @@ X(SharedImage, MGPSharedImageOp, kScreen, kReplySlot, kWaitReply) // clang-format on -// Not in the catalogue (ARCHITECTURE.md §3.2): +// Not in the catalog (ARCHITECTURE.md §3.2): // - GetIntegeri_v / GetInteger64i_v: the only device-answered indexed pnames, the compute // work-group count and size limits, travel in MGPCaps (DynamicBackendParameters); every // other indexed pname is frontend state. diff --git a/MobileGL/MG_Pipe/PipeFields.def b/MobileGL/MG_Pipe/PipeFields.def index 8c73d24c..d27b6821 100644 --- a/MobileGL/MG_Pipe/PipeFields.def +++ b/MobileGL/MG_Pipe/PipeFields.def @@ -10,7 +10,7 @@ // in MGPipeTypes.h, listing the fields that carry MEANING - padding is deliberately absent, // because MOBILEGL_PIPE_VERIFY has to have ZERO false positives and a padding byte is // exactly what makes a memcmp of RenderStateParameters false-DIFFER -// (DirectGLES.cpp documents that behaviour where it does the same comparison itself). +// (DirectGLES.cpp documents that behavior where it does the same comparison itself). // // Hand maintained alongside MGPipeTypes.h, MGPipeValueTypes.h, MGPipeHostSpan.h and // MG_Backend/BackendFunctions.h. Adding a member to one of these structs without adding it here @@ -174,7 +174,7 @@ F(Vertices) F(Outer) F(Inner) // P2 ratcheted ResidualValueBlock from six rows to one and P13 W3c deleted it; what stays is -// the retired op 46's payload, which the record catalogue still has to lay out. +// the retired op 46's payload, which the record catalog still has to lay out. #define MGP_FIELDS_MGPResidualValueState(F) \ F(Version) F(Blob) @@ -191,7 +191,7 @@ // LevelPad IS PADDING BY ROLE AND NOT BY NAME, and that is the whole reason it has a row here: // the cover check excuses only the members NAMED Pad, so this one left out is a pipe-gates // failure. The row costs no false positive, because every producer builds the record as -// `MGPSubData{}` (so the word is a deterministic zero, not an uninitialised byte) and the +// `MGPSubData{}` (so the word is a deterministic zero, not an uninitialized byte) and the // payload rides the wire as one POD memcpy - MGP_ASSERT_POD(MGPSubData, 88) is the whole // record, with no untransferred tail - so both sides of a comparison read the same zero. #define MGP_FIELDS_MGPSubData(F) \ diff --git a/MobileGL/MG_Pipe/PipeMutation.h b/MobileGL/MG_Pipe/PipeMutation.h index 5f606fe5..65eeb13b 100644 --- a/MobileGL/MG_Pipe/PipeMutation.h +++ b/MobileGL/MG_Pipe/PipeMutation.h @@ -12,7 +12,7 @@ // Frontend mutation notices. The verb fill (MG_Impl/Pipe/PipeFill.cpp) copies a verb's may-read // set out of the live GLContext at the verb boundary, and the backend reads that copy for the // whole verb. A frontend value written inside the verb (Magma synthesising a fallback texture, -// materialising a queued clear, overriding a sampler's filter) would leave the copy stale, so +// materializing a queued clear, overriding a sampler's filter) would leave the copy stale, so // the mutator calls MGP_NOTE_MUTATION(Field) where it moves the value. The notice refreshes // that one field when it belongs to the verb in flight. It never touches the poison stamp, so a // stamp the fill withheld (negative control B) stays withheld. diff --git a/MobileGL/MG_Pipe/PipeRoute.cpp b/MobileGL/MG_Pipe/PipeRoute.cpp index e367035c..88d672de 100644 --- a/MobileGL/MG_Pipe/PipeRoute.cpp +++ b/MobileGL/MG_Pipe/PipeRoute.cpp @@ -330,7 +330,7 @@ namespace MobileGL::MG_Pipe { // P5e (pg): NO ARCHIVE ON THIS ARM, and the null is the arm selection rather than a // hole. Under monolith the two companion pointers ARE the frontend's own archive, // the backend twin reads it through its frontend overload (ruling 1 keeps that arm - // token for token), and serializing here to deserialise into the record would put + // token for token), and serializing here to deserialize into the record would put // EncodeProgramArtifacts on the monolith path - which PipeRoute.h's escape note // and PipeApply.h both promise it is not. MGPipeApplyCreateShaderState(*desc, link, spirv, nullptr); diff --git a/MobileGL/MG_Pipe/PipeRoute.h b/MobileGL/MG_Pipe/PipeRoute.h index fd85d4e4..0fbb15db 100644 --- a/MobileGL/MG_Pipe/PipeRoute.h +++ b/MobileGL/MG_Pipe/PipeRoute.h @@ -243,7 +243,7 @@ namespace MobileGL::MG_Pipe { // gates on it); under monolith the row is never produced and the fields keep coming // through the residual fill (G1). The row IS an ordinary routed set_* otherwise - the // monolith adapter exists so the wire emitter's server-role arm has something defined to - // forward to, and the catalog's null-row accounting (PipeCatalogueTest) counts it. + // forward to, and the catalog's null-row accounting (PipeCatalogTest) counts it. inline void MGPipeRouteSetContextValues(const MGPContextValues& values) { MGP_SetContextValues(&values); } diff --git a/MobileGL/MG_Pipe/PipeWireLayout.h b/MobileGL/MG_Pipe/PipeWireLayout.h index 4aed72a8..ede3db63 100644 --- a/MobileGL/MG_Pipe/PipeWireLayout.h +++ b/MobileGL/MG_Pipe/PipeWireLayout.h @@ -47,7 +47,7 @@ namespace MobileGL::MG_Pipe { // bindings (PipeApply.h, MGPipeVertexElementsRecord), which a revision-1 peer would not. inline constexpr Uint32 kMGPipeResourceRespecifyExtentCarrierRevision = 2; - constexpr Uint64 WireCatalogueDigest() { + constexpr Uint64 WireCatalogDigest() { Uint64 hash = 1469598103934665603ull; for (const auto& call : kMGPipeWireCallLayouts) { WireMixName(hash, call.Name); @@ -58,7 +58,7 @@ namespace MobileGL::MG_Pipe { } return hash; } - inline constexpr Uint64 kMGPipeWireCatalogueDigest = WireCatalogueDigest(); + inline constexpr Uint64 kMGPipeWireCatalogDigest = WireCatalogDigest(); constexpr Uint64 WireRenderStateDigest() { Uint64 hash = 1469598103934665603ull; WireMixNumber(hash, kMGPipeRenderStateChunkTableVersion); diff --git a/MobileGL/MG_Pipe/SubsystemDeps.def b/MobileGL/MG_Pipe/SubsystemDeps.def index 9f9715de..cf30a35d 100644 --- a/MobileGL/MG_Pipe/SubsystemDeps.def +++ b/MobileGL/MG_Pipe/SubsystemDeps.def @@ -25,7 +25,7 @@ X(kMGPipeSubsystemFramebuffer, kMGPipeSubsystemTextureResources, "every MGPSurface::Res names a Texture or Renderbuffer handle and only bit 10 populates those two slot tables (ResolveFramebufferSubsystemArm)") \ X(kMGPipeSubsystemTextureResources, kMGPipeSubsystemResources | kMGPipeSubsystemSamplers, "a buffer texture's BufferForTexBuffer names a Buffer handle (bit 7); and MGPTextureParams::BuiltinSampler is a SamplerCso HANDLE only bit 11 mints, whose null the applier treats as Fatal{ProtocolCorruption} rather than a decline - D-K2's fourth row, ID-14/ID-15, which WITHDRAWS the brief's 'bit 10 without 11 is fine'") \ X(kMGPipeSubsystemSamplers, kMGPipeSubsystemTextureResources, "every MGPBoundView::Texture and MGPImageView::Res names a Texture handle and only bit 10 populates that slot table; with the row above this is SYMMETRIC - bits 10 and 11 are one arm with two switches (ResolveSamplerSubsystemArm)") \ - X(kMGPipeSubsystemPrograms, 0, "a ShaderCso handle names no texture and no buffer, the archive rides beside the record as a companion pointer, and the server's extra specialisation inputs come from state the backend already holds (ResolveProgramSubsystemArm)") \ + X(kMGPipeSubsystemPrograms, 0, "a ShaderCso handle names no texture and no buffer, the archive rides beside the record as a companion pointer, and the server's extra specialization inputs come from state the backend already holds (ResolveProgramSubsystemArm)") \ X(kMGPipeSubsystemBufferBindings, kMGPipeSubsystemResources, "every MGPBufferRange::Res names a Buffer handle and only bit 7 puts one in the slot table, so without it every server-side EnsureBufferResourceForHandle would mint a twin with no record behind it (P5e sb; ResolveBufferBindingSubsystemArm)") // clang-format on diff --git a/MobileGL/MG_Remote/CapsCodec.cpp b/MobileGL/MG_Remote/CapsCodec.cpp index 94b86469..5c35b65d 100644 --- a/MobileGL/MG_Remote/CapsCodec.cpp +++ b/MobileGL/MG_Remote/CapsCodec.cpp @@ -446,7 +446,7 @@ namespace MobileGL::MG_Remote { inputs.DynamicParamsSize = sizeof(MG_Backend::DynamicBackendParameters); inputs.CapsSize = sizeof(MG_Pipe::MGPCaps); inputs.MemberLayout = MG_Pipe::kMGPipeWireMemberLayoutDigest; - inputs.CatalogueLayout = MG_Pipe::kMGPipeWireCatalogueDigest; + inputs.CatalogLayout = MG_Pipe::kMGPipeWireCatalogDigest; inputs.RenderStateLayout = MG_Pipe::WireRenderStateDigest(); inputs.FormatCapabilityTargets = MG_Backend::kFormatCapabilityTargetCount; inputs.FormatCapabilityFormats = MG_Backend::kFormatCapabilityFormatCount; diff --git a/MobileGL/MG_Remote/Client/ClientSession.cpp b/MobileGL/MG_Remote/Client/ClientSession.cpp index 2191ab22..c07b79b2 100644 --- a/MobileGL/MG_Remote/Client/ClientSession.cpp +++ b/MobileGL/MG_Remote/Client/ClientSession.cpp @@ -2157,11 +2157,11 @@ namespace MobileGL::MG_Remote::Client { Wire::WireOpName(op)); } - const auto declineCancelled = [&] { + const auto declineCanceled = [&] { if (statusOut) *statusOut = Wire::ReplySink::kStatusDeclined; return Wire::kInvalidSeq; }; - if (DeviceLost() || m_encoder.Cancelled()) return declineCancelled(); + if (DeviceLost() || m_encoder.Canceled()) return declineCanceled(); const Bool rowCarriesReplySlot = (MG_Pipe::MGPipeCallFlagsFor(op) & static_cast(MG_Pipe::kReplySlot)) != 0; const Bool ownsReplySlot = rowCarriesReplySlot && wantReply; @@ -2186,7 +2186,7 @@ namespace MobileGL::MG_Remote::Client { const Bool skipAnswer = rowCarriesReplySlot && !willReadReply; Uint64 seq = m_encoder.EncodeRecord(op, payload, payloadBytes, tails, tailCount, skipAnswer); if (seq == Wire::kInvalidSeq) { - if (DeviceLost() || m_encoder.Cancelled()) return declineCancelled(); + if (DeviceLost() || m_encoder.Canceled()) return declineCanceled(); // EncodeRecord already refused individually oversized records. This one fits, // but appliedSeq may be ahead of retiredTail: wait for actual reclaimable space, // including the wrap pad. Prior EmitAndWait calls have published every record. @@ -2199,7 +2199,7 @@ namespace MobileGL::MG_Remote::Client { const auto wait = m_producer.WaitForCmdSpace(needed, kBarrierTimeoutMs); if (wait == Transport::SessionWait::ShutDown) { (void)m_encoder.CheckCancellation(); - return declineCancelled(); + return declineCanceled(); } if (wait != Transport::SessionWait::Reached) { SessionFail(MGFatalFamily::RetirementWaitFailed, @@ -2216,7 +2216,7 @@ namespace MobileGL::MG_Remote::Client { DrainEventRing(*m_events); seq = m_encoder.EncodeRecord(op, payload, payloadBytes, tails, tailCount); if (seq == Wire::kInvalidSeq) { - if (DeviceLost() || m_encoder.Cancelled()) return declineCancelled(); + if (DeviceLost() || m_encoder.Canceled()) return declineCanceled(); SessionFail(MGFatalFamily::RingOverrun, "MGPipe: Fatal{RingOverrun, \"SEG_CMD\"} - %s refused after sufficient " "space retired", diff --git a/MobileGL/MG_Remote/Client/WireTables.cpp b/MobileGL/MG_Remote/Client/WireTables.cpp index a24dcccc..a451d021 100644 --- a/MobileGL/MG_Remote/Client/WireTables.cpp +++ b/MobileGL/MG_Remote/Client/WireTables.cpp @@ -854,8 +854,8 @@ namespace MobileGL::MG_Remote::Client { } ClientSession& session = RequireSession("CreateShaderState"); if (link == nullptr || spirv == nullptr) { - SessionFail(MGFatalFamily::ArtefactsMissing, - "MGPipe: Fatal{ArtefactsMissing, \"create_shader_state\"} - the record's " + SessionFail(MGFatalFamily::ArtifactsMissing, + "MGPipe: Fatal{ArtifactsMissing, \"create_shader_state\"} - the record's " "two typed companions are null. Under monolith the applier reads the " "modules out of spirv->generatedSpirv; under split there is nothing to " "serialize, and emitting the record anyway would create a CSO with no " diff --git a/MobileGL/MG_Remote/Protocol/protocol.fbs b/MobileGL/MG_Remote/Protocol/protocol.fbs index acb8d29c..0828dd64 100644 --- a/MobileGL/MG_Remote/Protocol/protocol.fbs +++ b/MobileGL/MG_Remote/Protocol/protocol.fbs @@ -17,7 +17,7 @@ // - the hot path -> FlatBuffers *structs* (fixed layout, no vtable, no // offset indirection) written straight into the SEG_CMD ring. Those // records are generated from MG_Pipe/PipeCalls.def and are deliberately -// NOT in this schema yet: the call catalogue is a separate P0 deliverable +// NOT in this schema yet: the call catalog is a separate P0 deliverable // and record numbering must never churn. // // Regeneration: scripts/gen_protocol.py (flatc is NOT part of the default @@ -181,7 +181,7 @@ table PairBind { // tableSlotMask - GLFunctionsTable has SIXTY-NINE function-pointer slots // (BackendObject.h:117-292) and a ulong is 64 bits, so the field could never // address the table its own comment named; and ARCHITECTURE.md:114 already -// retired "is this table slot null" as the capability probe in favour of +// retired "is this table slot null" as the capability probe in favor of // CallMask, so keeping it would re-introduce exactly what replaced it. // prefersCpuXfbPrimitiveAccounting - answered by kCapCpuXfbPrimitiveAccounting // in `callMask` below. diff --git a/MobileGL/MG_Remote/Server/ApplyThreadPolicy.h b/MobileGL/MG_Remote/Server/ApplyThreadPolicy.h index 00190d8a..2dfff0ac 100644 --- a/MobileGL/MG_Remote/Server/ApplyThreadPolicy.h +++ b/MobileGL/MG_Remote/Server/ApplyThreadPolicy.h @@ -9,7 +9,7 @@ // Where the apply thread runs and how long it spins before parking, chosen per session from the // peer (the Hello's DialMode) and the data plane. With MOBILEGL_IPC_SERVER_AFFINITY=auto an // in-process, forked or stream-plane peer gets every big core and the configured spin; a peer -// that dialled in over shared segments gets at most one core (ReservedApplyCore), never the only +// that dialed in over shared segments gets at most one core (ReservedApplyCore), never the only // prime core, and kConnectedPeerSpinUs unless MOBILEGL_IPC_SPIN_US is set, because it writes the // ring the apply thread spins on and its GL thread wants a prime core. An explicit mask or `off` // wins for every peer. Pure functions, so the unit suite covers every row; the measurements are @@ -28,11 +28,11 @@ namespace MobileGL::MG_Remote::Server { enum class ApplyPeer : Uint8 { InProcess = 0, // DialMode::No - inproc: the client is another thread of this process Forked = 1, // DialMode::Fork - the client launched this server (same app, same build) - Connected = 2, // DialMode::Connect - the client dialled a standing server: another process, + Connected = 2, // DialMode::Connect - the client dialed a standing server: another process, // possibly another app (tcp://, unix:, fd:) }; - // The apply thread's spin before it parks, for a dialled-in shared-segment peer when + // The apply thread's spin before it parks, for a dialed-in shared-segment peer when // MOBILEGL_IPC_SPIN_US is not set. 50 us - the global default - by measurement: parking at once // (0) lost in every cell measured (rd12 Espryt 120 -> 74 fps on the helper route, 27 -> 17 from the // shell), so the short spin stays (CONTRACT-P11 B1). @@ -41,7 +41,7 @@ namespace MobileGL::MG_Remote::Server { struct ApplyThreadPolicy { Uint64 requestedMask = 0; // 0 = make no affinity call Uint32 spinUs = 0; - Bool recognised = true; // false: the affinity text was not `auto`, `off` or a number + Bool recognized = true; // false: the affinity text was not `auto`, `off` or a number const char* rule = ""; // what the log line names }; @@ -79,11 +79,11 @@ namespace MobileGL::MG_Remote::Server { inline const char* ReservedCoreReasonText(ReservedCoreReason reason) { switch (reason) { case ReservedCoreReason::LowestOfSeveralPrimeCores: - return "auto: the lowest of the prime cores, the rest left to the dialled-in shared-segment client"; + return "auto: the lowest of the prime cores, the rest left to the dialed-in shared-segment client"; case ReservedCoreReason::BigCoreBesideTheOnlyPrime: - return "auto: a big core beside the only prime core, which is left to the dialled-in shared-segment client"; + return "auto: a big core beside the only prime core, which is left to the dialed-in shared-segment client"; case ReservedCoreReason::OnlyPrimeCoreLeftAlone: - return "auto: unpinned - the only prime core is left to the dialled-in shared-segment client and there " + return "auto: unpinned - the only prime core is left to the dialed-in shared-segment client and there " "is no other big core"; case ReservedCoreReason::NoAsymmetry: return "auto: unpinned - no asymmetric big/prime topology to split"; @@ -91,7 +91,7 @@ namespace MobileGL::MG_Remote::Server { return ""; } - // The core `auto` reserves for a dialled-in shared-segment peer's apply thread, which spins there. + // The core `auto` reserves for a dialed-in shared-segment peer's apply thread, which spins there. // `bigCoreMask` = cpus within 15% of the peak clock, `primeMask` = cpus AT the peak clock (both // DetectCoreTopology's), `onlineMask` = one bit per cpu counted. The rule never hands the spinning // apply thread the ONLY prime core - a foreground client's GL thread wants it: @@ -141,7 +141,7 @@ namespace MobileGL::MG_Remote::Server { char* end = nullptr; const unsigned long long parsed = std::strtoull(affinity, &end, 0); if (end == affinity || (end != nullptr && *end != '\0')) { - policy.recognised = false; + policy.recognized = false; policy.rule = "unrecognized"; return policy; } @@ -158,7 +158,7 @@ namespace MobileGL::MG_Remote::Server { // The stream plane: an io thread feeds the apply thread, which does not spin on the // client's writes - B0 measured 7.9 ms/frame of apply CPU there against 26.8 on shm. policy.requestedMask = bigCoreMask; - policy.rule = "auto: every big core (dialled-in peer on the stream plane)"; + policy.rule = "auto: every big core (dialed-in peer on the stream plane)"; return policy; } policy.spinUs = spinExplicit ? configuredSpinUs : kConnectedPeerSpinUs; @@ -169,7 +169,7 @@ namespace MobileGL::MG_Remote::Server { } // What the supervisor announces at start-up and the broker relays to the helper: the core this - // process's configuration reserves for a dialled-in shared-segment peer's apply thread. An operator's + // process's configuration reserves for a dialed-in shared-segment peer's apply thread. An operator's // affinity (a mask or `off`) reserves nothing - the client is then not kept off any core. inline Uint64 ReservedApplyCoreForConfig(const char* affinity, Uint64 bigCoreMask, Uint64 primeMask, Uint64 onlineMask, ReservedCoreReason* outReason = nullptr) { diff --git a/MobileGL/MG_Remote/Server/ServerDisplay.cpp b/MobileGL/MG_Remote/Server/ServerDisplay.cpp index c76d61bf..371009b0 100644 --- a/MobileGL/MG_Remote/Server/ServerDisplay.cpp +++ b/MobileGL/MG_Remote/Server/ServerDisplay.cpp @@ -38,7 +38,7 @@ namespace MobileGL::MG_Remote::Server { return "NoDisplay"; case ServerWindowAcquire::NoWindow: return "NoWindow"; - case ServerWindowAcquire::Cancelled: + case ServerWindowAcquire::Canceled: return "Canceled"; case ServerWindowAcquire::Interrupted: return "Interrupted"; @@ -247,7 +247,7 @@ namespace MobileGL::MG_Remote::Server { for (;;) { if (!m_installed) return ServerWindowAcquire::NoDisplay; if (m_interrupts != interrupts) return ServerWindowAcquire::Interrupted; - if (cancel != nullptr && cancel(cancelUser)) return ServerWindowAcquire::Cancelled; + if (cancel != nullptr && cancel(cancelUser)) return ServerWindowAcquire::Canceled; // ANOTHER HOLDER: refused at once while its session goes on, waited for while it ends // (its EndLease wakes this). The window is judged only once the lease is free. const Bool heldElsewhere = m_leaseHolder != nullptr && m_leaseHolder != holder; diff --git a/MobileGL/MG_Remote/Server/ServerDisplay.h b/MobileGL/MG_Remote/Server/ServerDisplay.h index d424e367..c4933977 100644 --- a/MobileGL/MG_Remote/Server/ServerDisplay.h +++ b/MobileGL/MG_Remote/Server/ServerDisplay.h @@ -60,7 +60,7 @@ namespace MobileGL::MG_Remote::Server { Acquired, NoDisplay, // this process owns no display (HasDisplay() is false) NoWindow, // a display, but no window was attached within the wait - Cancelled, // the caller's cancel predicate said so + Canceled, // the caller's cancel predicate said so Interrupted, // Interrupt() (the in-process server is stopping) // P14 S2: NOT A BUG ANY MORE. Several sessions share one process and the display's window // is one window, so a second ON-SCREEN session asking for it is refused by name here diff --git a/MobileGL/MG_Remote/Server/ServerLoop.cpp b/MobileGL/MG_Remote/Server/ServerLoop.cpp index de113844..fd930fe5 100644 --- a/MobileGL/MG_Remote/Server/ServerLoop.cpp +++ b/MobileGL/MG_Remote/Server/ServerLoop.cpp @@ -189,7 +189,7 @@ namespace MobileGL::MG_Remote::Server { // the topology cannot be read - Windows, macOS, a container that hides the cpufreq // tree, or a partially readable one - because with no asymmetry information the honest // answer is "do not pin", not "pin to a guess". - // P11 B1: and the PRIME set beside it - the cpus AT the peak ceiling - which the dialled-in + // P11 B1: and the PRIME set beside it - the cpus AT the peak ceiling - which the dialed-in // shared-segment rule needs so it never hands the spinning apply thread the only prime core. void DetectCoreTopology(Uint64* outBig, Uint64* outPrime) { *outBig = *outPrime = 0; @@ -218,7 +218,7 @@ namespace MobileGL::MG_Remote::Server { } // Whether MOBILEGL_IPC_SPIN_US was set at all: ConfigLoader answers 50 for "unset" and - // for "50", and the dialled-in peer's default spin (ApplyThreadPolicy.h) applies only to + // for "50", and the dialed-in peer's default spin (ApplyThreadPolicy.h) applies only to // the first. Bool SpinSetExplicitly() { const char* text = std::getenv("MOBILEGL_IPC_SPIN_US"); @@ -628,10 +628,10 @@ namespace MobileGL::MG_Remote::Server { const ApplyThreadPolicy policy = SelectApplyThreadPolicy(raw, SpinSetExplicitly(), SpinUsFromConfig(), session.Peer(), session.PeerSharedSegments(), bigCores, primeCores, OnlineCpuMask()); - const Bool recognised = policy.recognised; + const Bool recognized = policy.recognized; const Uint64 requested = policy.requestedMask; m_affinityMask = ApplyAffinity(requested); - if (!recognised) { + if (!recognized) { MGLOG_E("MG_Remote server: MOBILEGL_IPC_SERVER_AFFINITY='%s' is not `auto`, `off` or " "a number; NO affinity was applied. This is logged rather than defaulted " "because an affinity that silently did nothing is indistinguishable from " @@ -1220,7 +1220,7 @@ namespace MobileGL::MG_Remote::Server { if (corrupt) { // Ring.h's own rule: a header the producer could not have written is // Fatal{ProtocolCorruption}, never a retry. Retrying re-reads the same bytes - // for ever; skipping desynchronises seq, and seq IS the reply-slot id. PH-1 (3): + // for ever; skipping desynchronizes seq, and seq IS the reply-slot id. PH-1 (3): // the header is the peer's bytes, so an armed session child latches here and // stops reading the ring - neither a retry nor a skip. (void)SessionLatch(MGFatalFamily::ProtocolCorruption, @@ -1973,7 +1973,7 @@ namespace MobileGL::MG_Remote::Server { } } - Bool ServerLoop::ServerWindowWaitCancelled(void* self) { + Bool ServerLoop::ServerWindowWaitCanceled(void* self) { const auto* loop = static_cast(self); // A window-lost request also ends the wait: this thread holds a lease on a window that is // being destroyed, and the UI thread is blocked until it answers (PumpControlRequest). @@ -1990,7 +1990,7 @@ namespace MobileGL::MG_Remote::Server { { const ScopedBackendTurnYield yield; acquired = display.AcquireFor(width, height, timeoutMs, this, &ServerWindowLostThunk, - &ServerWindowWaitCancelled, this, lease, &ServerWindowResizedThunk); + &ServerWindowWaitCanceled, this, lease, &ServerWindowResizedThunk); } switch (acquired) { case ServerWindowAcquire::Acquired: @@ -2008,7 +2008,7 @@ namespace MobileGL::MG_Remote::Server { width, height); return MOBILEGL_ERR_UNSUPPORTED; case ServerWindowAcquire::NoWindow: - case ServerWindowAcquire::Cancelled: + case ServerWindowAcquire::Canceled: case ServerWindowAcquire::Interrupted: case ServerWindowAcquire::LeasedElsewhere: break; @@ -2265,7 +2265,7 @@ namespace MobileGL::MG_Remote::Server { const ScopedBackendTurnYield yield; acquired = ServerDisplayInstance().AcquireFor( m_serverWindowWantWidth, m_serverWindowWantHeight, ServerDisplay::kGeometryGraceMs, this, - &ServerWindowLostThunk, &ServerWindowWaitCancelled, this, &lease, &ServerWindowResizedThunk); + &ServerWindowLostThunk, &ServerWindowWaitCanceled, this, &lease, &ServerWindowResizedThunk); } if (acquired != ServerWindowAcquire::Acquired) { // Still registered: the next new window wakes this again. diff --git a/MobileGL/MG_Remote/Server/ServerLoop.h b/MobileGL/MG_Remote/Server/ServerLoop.h index 82362de3..cf63fe3d 100644 --- a/MobileGL/MG_Remote/Server/ServerLoop.h +++ b/MobileGL/MG_Remote/Server/ServerLoop.h @@ -366,7 +366,7 @@ namespace MobileGL::MG_Remote::Server { // what this session last handed it. void NoteServerWindowExtent(void* window, Uint32 width, Uint32 height); // AcquireFor's cancel predicate: the loop is stopping, or the session latched. - static Bool ServerWindowWaitCancelled(void* self); + static Bool ServerWindowWaitCanceled(void* self); // D4: latched at the session's first successful surface creation; reset by Start(). Per // session, because the loop is (P14 S2). SessionSurfaceMode m_surfaceMode = SessionSurfaceMode::None; @@ -531,7 +531,7 @@ namespace MobileGL::MG_Remote::Server { EGLContext curCtx, EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx); - // P11 B1 (CONTRACT-P11 B1): the cpu core this process's `auto` policy reserves for a dialled-in + // P11 B1 (CONTRACT-P11 B1): the cpu core this process's `auto` policy reserves for a dialed-in // shared-segment client's apply thread (ApplyThreadPolicy.h ReservedApplyCoreForConfig over this // machine's topology and MOBILEGL_IPC_SERVER_AFFINITY), 0 when none; `outRule` receives the reason. // The supervisor announces it at start-up; the server app's broker relays it to the helper. diff --git a/MobileGL/MG_Remote/Server/ServerMain.cpp b/MobileGL/MG_Remote/Server/ServerMain.cpp index 7f690bb0..fb652030 100644 --- a/MobileGL/MG_Remote/Server/ServerMain.cpp +++ b/MobileGL/MG_Remote/Server/ServerMain.cpp @@ -1508,17 +1508,17 @@ extern "C" __attribute__((visibility("default"))) int mobilegl_server_main(int a if (SocketTransport::Listen(endpoint, &listener) != MOBILEGL_OK) return 72; WireLogError("MG_Remote server: pid=%d listening on %s", static_cast(::getpid()), endpoint.c_str()); { - // P11 B1 (CONTRACT-P11 B1): the one announcement of the core a dialled-in shared-segment client's + // P11 B1 (CONTRACT-P11 B1): the one announcement of the core a dialed-in shared-segment client's // apply thread will take, on stdout, which the server app reads line by line // (MobileGLServerService) and its broker hands to the helper - so the helper keeps the client // off the core THIS server picks rather than a Java re-derivation of the rule. const char* rule = ""; const auto reserved = static_cast(Server::ReservedApplyCoreForThisProcess(&rule)); std::fprintf(stdout, - "MG_Remote server: apply core reserved for dialled-in shared-segment clients: 0x%llx (%s)\n", + "MG_Remote server: apply core reserved for dialed-in shared-segment clients: 0x%llx (%s)\n", reserved, rule); std::fflush(stdout); - WireLogError("MG_Remote server: apply core reserved for dialled-in shared-segment clients: 0x%llx (%s)", + WireLogError("MG_Remote server: apply core reserved for dialed-in shared-segment clients: 0x%llx (%s)", reserved, rule); } unsigned long sessionsFaulted = 0; diff --git a/MobileGL/MG_Remote/Server/ServerSession.h b/MobileGL/MG_Remote/Server/ServerSession.h index 0dfa8758..b00bb81b 100644 --- a/MobileGL/MG_Remote/Server/ServerSession.h +++ b/MobileGL/MG_Remote/Server/ServerSession.h @@ -112,7 +112,7 @@ namespace MobileGL::MG_Remote::Server { // ---- s1's additions beyond c0's signature block --------------------------------- // The sizes to create the segments with. Must be called before Accept; after it, the - // geometry is on the wire in Welcome and changing it would desynchronise the peer. + // geometry is on the wire in Welcome and changing it would desynchronize the peer. void SetSegmentSizes(const Transport::SessionSegmentSizes& sizes); // The server role's private BackendObject (ServerLoop::Backend(), v1's). It is NOT diff --git a/MobileGL/MG_Remote/Transport/Doorbell.cpp b/MobileGL/MG_Remote/Transport/Doorbell.cpp index 8da57ef7..b1692b2d 100644 --- a/MobileGL/MG_Remote/Transport/Doorbell.cpp +++ b/MobileGL/MG_Remote/Transport/Doorbell.cpp @@ -82,7 +82,7 @@ namespace MobileGL::MG_Remote::Transport { std::uint32_t CalibrateSpinItersPerUs() { // The probe body is the spin loop's body with the caller's `ready()` replaced // by an atomic load the compiler may not hoist and may not fold: an atomic - // the optimiser cannot prove constant is the only portable way to keep the + // the optimizer cannot prove constant is the only portable way to keep the // loop from vanishing, and it is also the closest thing to what a real // `ready()` costs. std::atomic probe{0}; diff --git a/MobileGL/MG_Remote/Transport/FdPassing.cpp b/MobileGL/MG_Remote/Transport/FdPassing.cpp index 419b91c9..ebaf1ed5 100644 --- a/MobileGL/MG_Remote/Transport/FdPassing.cpp +++ b/MobileGL/MG_Remote/Transport/FdPassing.cpp @@ -54,7 +54,7 @@ namespace MobileGL::MG_Remote::Transport::FdPassing { namespace { // Every datagram starts with this, so the sideband length is explicit - // and a stray datagram is recognisable. + // and a stray datagram is recognizable. struct SidebandHeader { std::uint32_t magic; std::uint32_t sidebandSize; diff --git a/MobileGL/MG_Remote/Transport/Ring.cpp b/MobileGL/MG_Remote/Transport/Ring.cpp index cedbe14c..1f18e7f9 100644 --- a/MobileGL/MG_Remote/Transport/Ring.cpp +++ b/MobileGL/MG_Remote/Transport/Ring.cpp @@ -78,7 +78,7 @@ namespace MobileGL::MG_Remote::Transport { return MOBILEGL_ERR_INVALID_ARGUMENT; } // Cursors stay monotonic across the drain - only the generation moves, - // so any offset either side cached is now recognisably stale. + // so any offset either side cached is now recognizably stale. control.ringGeneration.fetch_add(1, std::memory_order_acq_rel); return MOBILEGL_OK; } @@ -715,7 +715,7 @@ namespace MobileGL::MG_Remote::Transport { mix(inputs.DynamicParamsSize); mix(inputs.CapsSize); mix(inputs.MemberLayout); - mix(inputs.CatalogueLayout); + mix(inputs.CatalogLayout); mix(inputs.RenderStateLayout); mix(inputs.FormatCapabilityTargets); mix(inputs.FormatCapabilityFormats); diff --git a/MobileGL/MG_Remote/Transport/SessionRings.h b/MobileGL/MG_Remote/Transport/SessionRings.h index 7e1ac19b..da74d59e 100644 --- a/MobileGL/MG_Remote/Transport/SessionRings.h +++ b/MobileGL/MG_Remote/Transport/SessionRings.h @@ -501,7 +501,7 @@ namespace MobileGL::MG_Remote::Transport { std::uint64_t DynamicParamsSize = 0; std::uint64_t CapsSize = 0; std::uint64_t MemberLayout = 0; - std::uint64_t CatalogueLayout = 0; + std::uint64_t CatalogLayout = 0; std::uint64_t RenderStateLayout = 0; std::uint64_t FormatCapabilityTargets = 0; std::uint64_t FormatCapabilityFormats = 0; diff --git a/MobileGL/MG_Remote/Wire/PipeWireCodec.cpp b/MobileGL/MG_Remote/Wire/PipeWireCodec.cpp index f8a08904..0b05d5a7 100644 --- a/MobileGL/MG_Remote/Wire/PipeWireCodec.cpp +++ b/MobileGL/MG_Remote/Wire/PipeWireCodec.cpp @@ -886,11 +886,11 @@ namespace MobileGL::MG_Remote::Wire { } Bool PipeWireEncoder::CheckCancellation() { - if (Cancelled() || (m_cancellationHook && m_cancellationHook(m_cancellationSelf)) || + if (Canceled() || (m_cancellationHook && m_cancellationHook(m_cancellationSelf)) || (m_stageRetirementBell && m_stageRetirementBell->Dead())) { - m_cancelled = true; + m_canceled = true; } - return m_cancelled; + return m_canceled; } Uint8* PipeWireEncoder::StageAllocate(Uint64 size) { @@ -1059,7 +1059,7 @@ namespace MobileGL::MG_Remote::Wire { Uint64 PipeWireEncoder::EncodeRecord(MGPWireOp op, const void* payload, Uint64 payloadBytes, const WireTail* tails, Uint32 tailCount, Bool noReply) { - if (Cancelled()) return kInvalidSeq; + if (Canceled()) return kInvalidSeq; if (!Valid()) { WireProtocolFatal("PipeWireEncoder::EncodeRecord", "no SEG_CMD producer installed"); } diff --git a/MobileGL/MG_Remote/Wire/PipeWireCodec.h b/MobileGL/MG_Remote/Wire/PipeWireCodec.h index 36825eba..228b24ed 100644 --- a/MobileGL/MG_Remote/Wire/PipeWireCodec.h +++ b/MobileGL/MG_Remote/Wire/PipeWireCodec.h @@ -305,8 +305,8 @@ namespace MobileGL::MG_Remote::Wire { } // The fast check is used on encode; the doorbell probe only runs while // staging or at an unsuccessful wait boundary. - Bool Cancelled() const { - return m_cancelled || (m_sessionLost && m_sessionLost->load(std::memory_order_acquire)); + Bool Canceled() const { + return m_canceled || (m_sessionLost && m_sessionLost->load(std::memory_order_acquire)); } Bool CheckCancellation(); void SetStageWaitTimeoutMs(Uint32 timeoutMs) { m_stageWaitTimeoutMs = timeoutMs; } @@ -373,7 +373,7 @@ namespace MobileGL::MG_Remote::Wire { const std::atomic* m_sessionLost = nullptr; CancellationHook m_cancellationHook = nullptr; void* m_cancellationSelf = nullptr; - Bool m_cancelled = false; + Bool m_canceled = false; Uint32 m_stageWaitTimeoutMs = 120000; // P5e (ra): the session's event drain, called around the stage-bell park (§2.6). diff --git a/MobileGL/MG_State/GLState/BufferState/BufferObject.cpp b/MobileGL/MG_State/GLState/BufferState/BufferObject.cpp index c8eefdad..88f1630e 100644 --- a/MobileGL/MG_State/GLState/BufferState/BufferObject.cpp +++ b/MobileGL/MG_State/GLState/BufferState/BufferObject.cpp @@ -156,7 +156,7 @@ namespace MobileGL::MG_State::GLState { if (MG_Pipe::MGPipeResourceSubsystemEnabled()) { static_assert(sizeof(appAccess.GetRaw()) <= sizeof(Uint32), "MGPFlushRange::AccessFlags is a Uint32 and carries the application's " - "real Flags, unnormalised"); + "real Flags, unnormalized"); MG_Pipe::MGPipeEmitResourceFlushRange(*this, range.start, range.end - range.start, static_cast(appAccess.GetRaw())); } diff --git a/MobileGL/MG_State/GLState/Core.cpp b/MobileGL/MG_State/GLState/Core.cpp index f117d205..7e8a8cf2 100644 --- a/MobileGL/MG_State/GLState/Core.cpp +++ b/MobileGL/MG_State/GLState/Core.cpp @@ -1421,7 +1421,7 @@ namespace MobileGL::MG_State { m_shareGroup->NoteContextAttached(); // The default transform feedback object (name 0) exists from the start of the context // (GL 4.6 core 13.2.1), but nothing binds it, so nothing else would materialize it. - // Materialising it here is what lets GetBoundTransformFeedbackLifetimeId() be a plain + // Materializing it here is what lets GetBoundTransformFeedbackLifetimeId() be a plain // const read instead of an operator[] insert on the draw path. m_boundTransformFeedbackLifetimeId = m_transformFeedbackObjects[0].lifetimeId; InstallDefaultFramebuffer(DefaultFramebuffer()); diff --git a/MobileGL/MG_State/GLState/Core.h b/MobileGL/MG_State/GLState/Core.h index ee44f6c6..0068d9c9 100644 --- a/MobileGL/MG_State/GLState/Core.h +++ b/MobileGL/MG_State/GLState/Core.h @@ -732,13 +732,13 @@ namespace MobileGL { Bool hasCompletedSpan = false; Bool everBound = false; // Assigned by the default member initializer, so every way an object comes into - // being - operator[] materialisation, `= {}` in Gen/Create - gets a fresh one, + // being - operator[] materialization, `= {}` in Gen/Create - gets a fresh one, // and a recycled NAME never brings the dead object's id back with it. Uint64 lifetimeId = AllocateTransformFeedbackLifetimeId(); }; void SaveBoundTransformFeedbackState(); void RestoreBoundTransformFeedbackState(); - // operator[] materialises an entry with the default state on first touch, so + // operator[] materializes an entry with the default state on first touch, so // the default object (name 0) needs no seeding here. UnorderedMap m_transformFeedbackObjects; IndexGenerator m_transformFeedbackNames; diff --git a/MobileGL/MG_State/GLState/ProgramState/ProgramArtifactsCodec.h b/MobileGL/MG_State/GLState/ProgramState/ProgramArtifactsCodec.h index 7e455ee8..66c6699f 100644 --- a/MobileGL/MG_State/GLState/ProgramState/ProgramArtifactsCodec.h +++ b/MobileGL/MG_State/GLState/ProgramState/ProgramArtifactsCodec.h @@ -27,7 +27,7 @@ // structs by pointer beside the record, so the applier reads the frontend's own archive and // this codec is never called. The VERIFY build is where it is exercised, and it is exercised // as LIVE CODE WITH A GATE rather than as dead code with a unit test: the applier serializes, -// deserialises and field-compares before storing, and a mismatch is +// deserializes and field-compares before storing, and a mismatch is // Fatal{PipeVerifyDiffer, "program-archive"}. Under split, P5 is what makes it the transport's // path. // diff --git a/MobileGL/MG_State/GLState/ProgramState/ProgramObject.h b/MobileGL/MG_State/GLState/ProgramState/ProgramObject.h index 960fcb43..58e99035 100644 --- a/MobileGL/MG_State/GLState/ProgramState/ProgramObject.h +++ b/MobileGL/MG_State/GLState/ProgramState/ProgramObject.h @@ -1157,7 +1157,7 @@ namespace MobileGL::MG_State::GLState { // The phase-B twin of GetLinkReflection, and it exists for exactly one caller: // create_shader_state publishes the WHOLE SpirvArtifacts beside the whole - // LinkArtifacts, because the archive the far side deserialises into is those two + // LinkArtifacts, because the archive the far side deserializes into is those two // structs and nothing else. The granular getters above (GetGeneratedSpirv, // GetSpirvStatus, UsesNativeFloat64, PointSizeDemoted, GetSpirvValidationEnabled, // GetUBOSize) cover what the GL layer needs and deliberately do not reach diff --git a/MobileGL/MG_State/GLState/ProgramState/ShaderCompileAdoptionMap.cpp b/MobileGL/MG_State/GLState/ProgramState/ShaderCompileAdoptionMap.cpp index c82b2136..72163e6f 100644 --- a/MobileGL/MG_State/GLState/ProgramState/ShaderCompileAdoptionMap.cpp +++ b/MobileGL/MG_State/GLState/ProgramState/ShaderCompileAdoptionMap.cpp @@ -27,14 +27,14 @@ namespace MobileGL::MG_State::GLState { // (the enqueue lost a race with teardown, or the body threw), or CANCELLATION // REQUESTED but not yet settled (a releaser fired Cancel() while a worker was still // inside RunBody(), so the node is stuck at Running until the body returns - see - // JobNode::Run: once m_cancelled is set, the node is DOOMED to end up Canceled no + // JobNode::Run: once m_canceled is set, the node is DOOMED to end up Canceled no // matter how the body finishes, it just has not gotten there yet). All three can // never publish artifacts a caller may rely on, so all three are misses. Only the // first two are dead weight worth pruning from the index here - a cancellation- // requested-but-still-running node is still reachable from its own (about to // release) ShaderObject and will get pruned once it actually settles, so leave the // entry alone and just refuse to hand this node out. - if (!node || node->IsCancelled()) { + if (!node || node->IsCanceled()) { m_entries.erase(it); return nullptr; } @@ -77,7 +77,7 @@ namespace MobileGL::MG_State::GLState { Vector dead; for (const auto& entry : m_entries) { const SharedPtr node = entry.second.lock(); - if (!node || node->IsCancelled()) dead.push_back(entry.first); + if (!node || node->IsCanceled()) dead.push_back(entry.first); } for (const ShaderSourceKey& key : dead) { m_entries.erase(key); diff --git a/MobileGL/MG_State/GLState/ProgramState/ShaderObject.h b/MobileGL/MG_State/GLState/ProgramState/ShaderObject.h index 487d6496..3a2211eb 100644 --- a/MobileGL/MG_State/GLState/ProgramState/ShaderObject.h +++ b/MobileGL/MG_State/GLState/ProgramState/ShaderObject.h @@ -176,7 +176,7 @@ namespace MobileGL { // glCompileShader on the same source enqueues nothing and the eventual join // reports GL_FALSE forever. The synchronous path retries in exactly this case. Bool HasMemoizedCompile() const { - return m_compiled != nullptr && m_compiled->source == m_source && !m_compiled->IsCancelled(); + return m_compiled != nullptr && m_compiled->source == m_source && !m_compiled->IsCanceled(); } // MUST NOT JOIN - this is what GL_COMPLETION_STATUS_KHR will read when the diff --git a/MobileGL/MG_Test/Backend/DirectGLES/EsslShaderPassTest.cpp b/MobileGL/MG_Test/Backend/DirectGLES/EsslShaderPassTest.cpp index b1db6c17..29c37c45 100644 --- a/MobileGL/MG_Test/Backend/DirectGLES/EsslShaderPassTest.cpp +++ b/MobileGL/MG_Test/Backend/DirectGLES/EsslShaderPassTest.cpp @@ -1051,7 +1051,7 @@ void main() {} // Whitespace between '#' and the keyword is legal in GLSL, and a shader carrying several // extension directives must have exactly the one retargeted. -TEST(RetargetTextureBufferExtensionTest, SpacedDirectiveIsRewrittenAndNeighboursAreLeftAlone) { +TEST(RetargetTextureBufferExtensionTest, SpacedDirectiveIsRewrittenAndNeighborsAreLeftAlone) { const String source = R"(#version 310 es # extension GL_EXT_texture_buffer : require #extension GL_EXT_shader_io_blocks : require @@ -1475,7 +1475,7 @@ TEST(PassthroughTessControlEsslTest, RequestsTheExtensionBelowEs32) { EXPECT_TRUE(Contains(out, "#extension GL_EXT_tessellation_shader : require")) << out; } -TEST(PassthroughTessControlEsslTest, MirrorsTheNeighboursPerVertexBlocks) { +TEST(PassthroughTessControlEsslTest, MirrorsTheNeighborsPerVertexBlocks) { const String inMembers = " highp vec4 gl_Position; highp float gl_PointSize; "; const String outMembers = " highp vec4 gl_Position; "; const String out = BuildPassthroughTessControlEssl(320, 4, inMembers, outMembers, kDefaultOuter, kDefaultInner); diff --git a/MobileGL/MG_Test/Buffer/BufferTest.cpp b/MobileGL/MG_Test/Buffer/BufferTest.cpp index 7218612c..8550a6c6 100644 --- a/MobileGL/MG_Test/Buffer/BufferTest.cpp +++ b/MobileGL/MG_Test/Buffer/BufferTest.cpp @@ -278,7 +278,7 @@ TEST_F(BufferTest, AcquireMemoryRangeWithExplicit) { // subtracting the offset the caller asked for - i.e. it sits at the offset's own alignment phase. // KHR-GLxx.map_buffer_alignment.functional asserts exactly these two, at offset 63, for 24 // storage-flag combinations across 14 targets, and failed identically on both test devices. -TEST_F(BufferTest, MappedPointersHonourTheAdvertisedMapBufferAlignment) { +TEST_F(BufferTest, MappedPointersHonorTheAdvertisedMapBufferAlignment) { GLint advertisedAlignment = 0; MobileGL::MG_Impl::GLImpl::GetIntegerv(GL_MIN_MAP_BUFFER_ALIGNMENT, &advertisedAlignment); ASSERT_EQ(advertisedAlignment, static_cast(MobileGL::MG_State::GLState::MIN_MAP_BUFFER_ALIGNMENT)) diff --git a/MobileGL/MG_Test/CMakeLists.txt b/MobileGL/MG_Test/CMakeLists.txt index 72efb892..988e00ab 100644 --- a/MobileGL/MG_Test/CMakeLists.txt +++ b/MobileGL/MG_Test/CMakeLists.txt @@ -99,7 +99,7 @@ add_subdirectory(VertexArray) add_subdirectory(Program) add_subdirectory(Query) add_subdirectory(Pipeline) -# The MGPipe catalogue arithmetic: no GL context and no driver, just the .def, the seven +# The MGPipe catalog arithmetic: no GL context and no driver, just the .def, the seven # generated files and the payload layouts. add_subdirectory(Pipe) # The P0.5 interface-purity gate: a python walk of #include lines, so it registers with no diff --git a/MobileGL/MG_Test/Framebuffer/FramebufferTest.cpp b/MobileGL/MG_Test/Framebuffer/FramebufferTest.cpp index b0e3fc6b..dda85f4c 100644 --- a/MobileGL/MG_Test/Framebuffer/FramebufferTest.cpp +++ b/MobileGL/MG_Test/Framebuffer/FramebufferTest.cpp @@ -1324,7 +1324,7 @@ TEST_F(FramebufferTest, PolygonOffsetFallsBackToTheUnclampedEntryPointWithoutThe EXPECT_EQ(MG_Impl::GLImpl::GetError(), GL_NO_ERROR); } -TEST_F(FramebufferTest, ApplicationAlphaMaskOffIsStillHonouredOnANativeDrawBuffer) { +TEST_F(FramebufferTest, ApplicationAlphaMaskOffIsStillHonoredOnANativeDrawBuffer) { // The doctoring only ever REMOVES alpha writes on a widened buffer; it must never add them // back on a buffer the application masked itself, and must never touch a native one. ScopedRenderStateDriverStubs driver; @@ -1513,7 +1513,7 @@ TEST_F(FramebufferTest, FramebufferTextureRejectsTheDefaultFramebuffer) { DrainPendingGlErrors(); } -TEST_F(FramebufferTest, FramebufferTextureRejectsAColourAttachmentPastTheLimit) { +TEST_F(FramebufferTest, FramebufferTextureRejectsAColorAttachmentPastTheLimit) { GLuint framebuffer = 0; GLuint texture = 0; MG_Impl::GLImpl::CreateFramebuffers(1, &framebuffer); diff --git a/MobileGL/MG_Test/Pipe/CMakeLists.txt b/MobileGL/MG_Test/Pipe/CMakeLists.txt index ccb526c5..ca5eb4aa 100644 --- a/MobileGL/MG_Test/Pipe/CMakeLists.txt +++ b/MobileGL/MG_Test/Pipe/CMakeLists.txt @@ -9,11 +9,11 @@ cmake_minimum_required(VERSION 3.14) add_executable( - PipeCatalogueTest - PipeCatalogueTest.cpp + PipeCatalogTest + PipeCatalogTest.cpp ) -target_include_directories(PipeCatalogueTest PRIVATE +target_include_directories(PipeCatalogTest PRIVATE ${MGL_ROOT}/include ${MGL_ROOT}/MobileGL ${MGL_ROOT}/MobileGL/MG_Pipe @@ -23,13 +23,13 @@ target_include_directories(PipeCatalogueTest PRIVATE ) target_link_libraries( - PipeCatalogueTest PRIVATE + PipeCatalogTest PRIVATE MobileGLTestMain ${LINK_LIBRARIES} ) if (MSVC) - target_compile_options(PipeCatalogueTest PRIVATE /Zc:preprocessor) + target_compile_options(PipeCatalogTest PRIVATE /Zc:preprocessor) endif() # P13 W5: the record arm's fail / latch seam, in both library shapes (with and without MG_Remote). @@ -237,20 +237,20 @@ if (MSVC) endif() include(GoogleTest) -gtest_discover_tests(PipeCatalogueTest DISCOVERY_TIMEOUT 30 PROPERTIES LABELS unit) +gtest_discover_tests(PipeCatalogTest DISCOVERY_TIMEOUT 30 PROPERTIES LABELS unit) # This source scanner must inspect the configured checkout, including in out-of-tree builds. # Apply the override after GoogleTest's deferred discovery, and only to this one test. # CTestTestfile scripts run with no policy settings, so IN_LIST (CMP0057) is not available here # on CMake 3.x: use list(FIND) instead. -file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/PipeCatalogueSourceRoot.cmake" CONTENT -"list(FIND PipeCatalogueTest_TESTS \"PipeCatalogue.FrontendNeverTakesAnApplierAddress\" _mglSourceRootTest) +file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/PipeCatalogSourceRoot.cmake" CONTENT +"list(FIND PipeCatalogTest_TESTS \"PipeCatalog.FrontendNeverTakesAnApplierAddress\" _mglSourceRootTest) if(NOT _mglSourceRootTest EQUAL -1) - set_tests_properties(PipeCatalogue.FrontendNeverTakesAnApplierAddress PROPERTIES + set_tests_properties(PipeCatalog.FrontendNeverTakesAnApplierAddress PROPERTIES WORKING_DIRECTORY [==[${MGL_ROOT}]==]) endif() ") set_property(DIRECTORY APPEND PROPERTY TEST_INCLUDE_FILES - "${CMAKE_CURRENT_BINARY_DIR}/PipeCatalogueSourceRoot.cmake") + "${CMAKE_CURRENT_BINARY_DIR}/PipeCatalogSourceRoot.cmake") gtest_discover_tests(FieldOwnershipTest DISCOVERY_TIMEOUT 30 PROPERTIES LABELS unit) foreach(pipeTest ResourceEmitTest VertexInputEmitTest diff --git a/MobileGL/MG_Test/Pipe/CsoCacheTest.cpp b/MobileGL/MG_Test/Pipe/CsoCacheTest.cpp index db64db3c..e043fdcd 100644 --- a/MobileGL/MG_Test/Pipe/CsoCacheTest.cpp +++ b/MobileGL/MG_Test/Pipe/CsoCacheTest.cpp @@ -108,7 +108,7 @@ namespace { // off the PROBE and the handle reuse, not the records - otherwise it would measure a // different design rather than this one without content addressing. TEST_F(CsoCacheTest, ContentAddressingOffMintsEveryTime) { - MG_Config::Features.PipePush |= kMGPipeBehaviourNoCsoContentAddressing; + MG_Config::Features.PipePush |= kMGPipeBehaviorNoCsoContentAddressing; MGPipeCsoCache cache; Uint64 bytes = 0; const RenderStateParameters params = PipelineState(3); diff --git a/MobileGL/MG_Test/Pipe/FieldOwnershipTest.cpp b/MobileGL/MG_Test/Pipe/FieldOwnershipTest.cpp index 4d7eb979..0292e5f6 100644 --- a/MobileGL/MG_Test/Pipe/FieldOwnershipTest.cpp +++ b/MobileGL/MG_Test/Pipe/FieldOwnershipTest.cpp @@ -514,7 +514,7 @@ TEST_F(FieldOwnershipTest, AServerStampMakesRecordSuppliedFieldsFreshAndWithdraw // whatever the serial says - but it tests "never filled" FIRST, so the stamp's withdrawal // (FilledGen = 0) wins over kMGPipeInputFieldSticky without a line of the generated file // changing. Before this, the seven most dangerous fields were exempt by construction. -TEST_F(FieldOwnershipTest, TheStickyExemptionIsCancelledByTheServerStamp) { +TEST_F(FieldOwnershipTest, TheStickyExemptionIsCanceledByTheServerStamp) { MGPipeValidateForVerb(MGPipeVerb::Clear); // the CLIENT fills and stamps all 63, sticky included EXPECT_TRUE(MGPipeInputFieldIsFresh(gPipeInputs->FilledState(), MGPipeInputField::RecordError)); MGPipeServerStampVerbBoundary(MGPipeVerb::Clear); diff --git a/MobileGL/MG_Test/Pipe/PipeCatalogueTest.cpp b/MobileGL/MG_Test/Pipe/PipeCatalogTest.cpp similarity index 97% rename from MobileGL/MG_Test/Pipe/PipeCatalogueTest.cpp rename to MobileGL/MG_Test/Pipe/PipeCatalogTest.cpp index efb83548..57b24378 100644 --- a/MobileGL/MG_Test/Pipe/PipeCatalogueTest.cpp +++ b/MobileGL/MG_Test/Pipe/PipeCatalogTest.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Test/Pipe/PipeCatalogueTest.cpp +// MobileGL - MobileGL/MG_Test/Pipe/PipeCatalogTest.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -36,7 +36,7 @@ using namespace MobileGL; using namespace MobileGL::MG_Pipe; -TEST(PipeCatalogue, FrontendNeverTakesAnApplierAddress) { +TEST(PipeCatalog, FrontendNeverTakesAnApplierAddress) { namespace fs = std::filesystem; auto base = fs::current_path(); while (!fs::is_directory(base / "MobileGL/MG_Impl") && base != base.root_path()) @@ -86,20 +86,20 @@ namespace { // The catalog's own spelling of an opcode, for a failure message. The wire codec has one // of these and MG_Pipe may not reach it (MG_Remote is above this layer), so the table is // expanded from the catalog here rather than a name being duplicated per EXPECT. -#define MGP_CATALOGUE_NAME_ROW(Name, Payload, Class, Flags, Wait) #Name, - constexpr const char* kCatalogueOpNames[] = {"", MGP_CALL_LIST(MGP_CATALOGUE_NAME_ROW)}; -#undef MGP_CATALOGUE_NAME_ROW - static_assert(sizeof(kCatalogueOpNames) / sizeof(kCatalogueOpNames[0]) == static_cast(MGPWireOp::kOpCount), +#define MGP_CATALOG_NAME_ROW(Name, Payload, Class, Flags, Wait) #Name, + constexpr const char* kCatalogOpNames[] = {"", MGP_CALL_LIST(MGP_CATALOG_NAME_ROW)}; +#undef MGP_CATALOG_NAME_ROW + static_assert(sizeof(kCatalogOpNames) / sizeof(kCatalogOpNames[0]) == static_cast(MGPWireOp::kOpCount), "the diagnostic name table and the opcode space disagree"); const char* WireOpNameForDiag(MGPWireOp op) { const SizeT index = static_cast(op); - return index < static_cast(MGPWireOp::kOpCount) ? kCatalogueOpNames[index] : ""; + return index < static_cast(MGPWireOp::kOpCount) ? kCatalogOpNames[index] : ""; } } // namespace // The handle is the whole object model. Eight bytes, a register pair, no padding. -TEST(PipeCatalogue, HandleIsEightBytes) { +TEST(PipeCatalog, HandleIsEightBytes) { static_assert(sizeof(MGPipeHandle) == 8); static_assert(alignof(MGPipeHandle) == 4); static_assert(std::is_trivially_copyable_v); @@ -116,14 +116,14 @@ TEST(PipeCatalogue, HandleIsEightBytes) { // The catalog, the number documented in its header, and the two generated tables are one // fact stated three times. This is the test that notices when they stop being. -TEST(PipeCatalogue, EntryCountMatchesTheDocumentedCount) { +TEST(PipeCatalog, EntryCountMatchesTheDocumentedCount) { static_assert(kExpandedCallCount == MGP_CALL_LIST_DOCUMENTED_COUNT); static_assert(kExpandedCallCount == kMGPipeCallCount); EXPECT_EQ(kExpandedCallCount, static_cast(MGP_CALL_LIST_DOCUMENTED_COUNT)); EXPECT_EQ(kMGPipeCallCount, kExpandedCallCount); } -TEST(PipeCatalogue, GeneratedTablesHoldTheWholeCatalogue) { +TEST(PipeCatalog, GeneratedTablesHoldTheWholeCatalog) { static_assert(ClassCount() == kMGPipeScreenCallCount); static_assert(ClassCount() + ClassCount() + ClassCount() + ClassCount() + ClassCount() + ClassCount() == @@ -176,7 +176,7 @@ TEST(PipeCatalogue, GeneratedTablesHoldTheWholeCatalogue) { // renaming a case is a removal even when the new name is better: it is indistinguishable, from // the gate's side, from a case that was deleted. So this case stays, asserting the half that is // still true, and the new half below is an ADDED name. -TEST(PipeCatalogue, UninstalledTablesAreAllNull) { +TEST(PipeCatalog, UninstalledTablesAreAllNull) { const void* const* screen = reinterpret_cast(&gMGPipeScreen); const void* const* context = reinterpret_cast(&gMGPipeContext); MGPipeInstallMonolithTables(); @@ -209,7 +209,7 @@ TEST(PipeCatalogue, UninstalledTablesAreAllNull) { (void)context; } -TEST(PipeCatalogue, ExactlyTheRoutedRowsAreInstalledAndTheRestAreStillNull) { +TEST(PipeCatalog, ExactlyTheRoutedRowsAreInstalledAndTheRestAreStillNull) { const void* const* screen = reinterpret_cast(&gMGPipeScreen); const void* const* context = reinterpret_cast(&gMGPipeContext); SizeT installed = 0; @@ -300,7 +300,7 @@ TEST(PipeCatalogue, ExactlyTheRoutedRowsAreInstalledAndTheRestAreStillNull) { // the type's absence - nothing in the tree can name it any more). What is left to pin is the // RETIRED ROW: op 46 keeps its number, because opcodes only ever grow, and its record keeps its // layout so a decoder can bounds-check what it then declines. -TEST(PipeCatalogue, ResidualBlockSizeIsPinned) { +TEST(PipeCatalog, ResidualBlockSizeIsPinned) { EXPECT_EQ(static_cast(MGPWireOp::SetResidualValueState), 46u); EXPECT_EQ(sizeof(MGPResidualValueState), 32u); } @@ -309,7 +309,7 @@ TEST(PipeCatalogue, ResidualBlockSizeIsPinned) { // of that header's static assertions, so the numbers show up in ctest output on every // platform - including one where a static assertion is skipped. Every number here is also // what MGL_RESIDUAL_BLOCK_SIZE (MGPipeTypes.h) and the Espryt offsetof spans depend on. -TEST(PipeCatalogue, ValueTypeLayoutsArePinned) { +TEST(PipeCatalog, ValueTypeLayoutsArePinned) { EXPECT_EQ(sizeof(PixelStoreParameters), 28u); EXPECT_EQ(sizeof(PerBufferBlendState), 28u); EXPECT_EQ(sizeof(StencilFaceState), 28u); @@ -334,7 +334,7 @@ TEST(PipeCatalogue, ValueTypeLayoutsArePinned) { // What it now pins is the other half of the same statement: the carrier is one capability // word, at offset 0, and the members it used to carry are gone rather than merely moved - // which is exactly what "MGL_RESIDUAL_BLOCK_SIZE only ever goes down" has to mean. -TEST(PipeCatalogue, ResidualBlockIsExactlyItsTwoValueStructsPlusPatchTail) { +TEST(PipeCatalog, ResidualBlockIsExactlyItsTwoValueStructsPlusPatchTail) { // P13 W3c deleted the last capability word, so the carrier is gone altogether; the members // it used to carry are pinned on the carriers that took them over. // The three carriers that took the retired members over. @@ -347,7 +347,7 @@ TEST(PipeCatalogue, ResidualBlockIsExactlyItsTwoValueStructsPlusPatchTail) { // compiler catches only where somebody asked it to. MGP_ASSERT_POD already pins both sizes in // MGPipeTypes.h; what is pinned HERE is the SHAPE the two edits were made for, because that is // what a later phase would silently undo. -TEST(PipeCatalogue, TextureParamsNameTheirBuiltinSamplerAndFramebufferStateNamesItsTarget) { +TEST(PipeCatalog, TextureParamsNameTheirBuiltinSamplerAndFramebufferStateNamesItsTarget) { // 32 -> 40: the CSO handle carrying the SamplerParameters of the SamplerObject every // ITextureObject owns, plus the second resync bit. Naming the CSO rather than widening // this payload with a filter/wrap/border block is what keeps ONE authority for one value - @@ -401,7 +401,7 @@ TEST(PipeCatalogue, TextureParamsNameTheirBuiltinSamplerAndFramebufferStateNames // minting - EVERY TextureTarget has a row, checked at compile time by a table with no // `default:` arm, so adding a target is a build break rather than a descriptor that silently // describes the wrong kind of storage. -TEST(PipeCatalogue, EveryTextureTargetMapsToItsOwnResourceTarget) { +TEST(PipeCatalog, EveryTextureTargetMapsToItsOwnResourceTarget) { // The compile-time half is MGPipeEveryTextureTargetIsMapped's static_assert; this is the // same walk at runtime, so the case names the offender instead of the build naming a line. for (SizeT i = 0; i < static_cast(TextureTarget::TextureTargetCount); ++i) { @@ -436,7 +436,7 @@ TEST(PipeCatalogue, EveryTextureTargetMapsToItsOwnResourceTarget) { // == 0, so a texture record carrying the bare upload enumerator would be indistinguishable // from a buffer record exactly when its owner is a 1D texture, and that texture's upload // would be dispatched into the buffer path. Nothing else in the tree would have said so. -TEST(PipeCatalogue, SubDataTargetPacksAResourceTargetAndAnUploadTarget) { +TEST(PipeCatalog, SubDataTargetPacksAResourceTargetAndAnUploadTarget) { // Both halves must fit their byte, or the encoding is not an encoding. static_assert(static_cast(MGPipeResourceTarget::Count) <= 0x100u); static_assert(static_cast(TextureUploadTarget::TextureUploadTargetCount) <= 0x100u); @@ -506,7 +506,7 @@ TEST(PipeCatalogue, SubDataTargetPacksAResourceTargetAndAnUploadTarget) { // All three were UNSTATED in the contract and were being re-invented on both sides of the // boundary - which is the way a wire field acquires two meanings. The values themselves are // unremarkable; what this case pins is that there is exactly one spelling of each. -TEST(PipeCatalogue, SurfaceNamesItsKindItsTextureTargetAndItsDepthStencilAspect) { +TEST(PipeCatalog, SurfaceNamesItsKindItsTextureTargetAndItsDepthStencilAspect) { // MGPipeKind is REUSED rather than a second three-value enum minted beside the field. EXPECT_EQ(kMGPipeSurfaceKindNone, static_cast(MGPipeKind::None)); EXPECT_EQ(kMGPipeSurfaceKindTexture, static_cast(MGPipeKind::Texture)); @@ -569,7 +569,7 @@ TEST(PipeCatalogue, SurfaceNamesItsKindItsTextureTargetAndItsDepthStencilAspect) } // G3's opcode numbering is the wire protocol. Position in PipeCalls.def, 1-based, no holes. -TEST(PipeCatalogue, WireOpcodesAreThePositionsInTheCatalogue) { +TEST(PipeCatalog, WireOpcodesAreThePositionsInTheCatalog) { EXPECT_EQ(static_cast(MGPWireOp::GetCaps), 1); EXPECT_EQ(static_cast(MGPWireOp::kOpCount), kMGPipeCallCount + 1); EXPECT_EQ(sizeof(MGPWireRecHeader), 8u); @@ -583,7 +583,7 @@ TEST(PipeCatalogue, WireOpcodesAreThePositionsInTheCatalogue) { // Records are append-only. The three carriers added after the first cut - for the live // GLFunctionsTable entries GetGpuTimestampNs, QueryCounterTimestamp and WaitSync - sit at // the END of the list, after SetSwapInterval, so no opcode the first cut assigned has moved. -TEST(PipeCatalogue, LateArrivalsAreAppendedWithoutRenumbering) { +TEST(PipeCatalog, LateArrivalsAreAppendedWithoutRenumbering) { EXPECT_EQ(static_cast(MGPWireOp::SetSwapInterval), 68); EXPECT_EQ(static_cast(MGPWireOp::QueryTimestamp), 69); EXPECT_EQ(static_cast(MGPWireOp::QueryCounter), 70); @@ -741,7 +741,7 @@ TEST(PipeCatalogue, LateArrivalsAreAppendedWithoutRenumbering) { // It matters because the column is not decoration: on a run-ahead server kWaitNone is a promise // that the record's apply reads NOTHING of the client's (rule F), and a row demoted to it by // accident is a torn read that renders wrong rather than aborting. -TEST(PipeCatalogue, EveryRowCarriesTheWaitClassTheContractGivesIt) { +TEST(PipeCatalog, EveryRowCarriesTheWaitClassTheContractGivesIt) { // kWaitPresent: present alone, paced by the credit taken BEFORE the encode (§2.4). EXPECT_EQ(MGPipeWaitClassFor(MGPWireOp::Present), kWaitPresent); @@ -871,7 +871,7 @@ TEST(PipeCatalogue, EveryRowCarriesTheWaitClassTheContractGivesIt) { // A well-formed record passes the applier's bounds gate. P0 has no applier, so "accepted" // is reported as "not applied" rather than "fatal". -TEST(PipeCatalogue, ApplierAcceptsAWellFormedRecord) { +TEST(PipeCatalog, ApplierAcceptsAWellFormedRecord) { MGPWireRec_Present record{}; record.Header.Op = static_cast(MGPWireOp::Present); record.Header.Size = sizeof(record); @@ -881,7 +881,7 @@ TEST(PipeCatalogue, ApplierAcceptsAWellFormedRecord) { // G4 reports the FIRST differing field by name, and compares field by field so that // padding cannot produce a difference that does not exist. -TEST(PipeCatalogue, VerifyComparatorNamesTheDifferingField) { +TEST(PipeCatalog, VerifyComparatorNamesTheDifferingField) { MGPDrawInfo a{}; MGPDrawInfo b{}; const char* field = nullptr; @@ -909,7 +909,7 @@ TEST(PipeCatalogue, VerifyComparatorNamesTheDifferingField) { // G6's join over the backend read inventory. P0 allows unmapped rows; from P5 the gate is // zero, so the numbers are asserted here to make a regression visible the day it happens. -TEST(PipeCatalogue, CoverageAccountsForEveryInventoryRow) { +TEST(PipeCatalog, CoverageAccountsForEveryInventoryRow) { EXPECT_EQ(kMGPipeInventoryReadPoints, 477u); EXPECT_EQ(kMGPipeInventoryUnmapped, 0u); EXPECT_EQ(kMGPipeInventoryMappedToCall + kMGPipeInventoryClientResolved + kMGPipeInventoryReverseChannel + @@ -920,7 +920,7 @@ TEST(PipeCatalogue, CoverageAccountsForEveryInventoryRow) { // G5's field ids come from the same accessor list as the coverage table, and every field // starts un-filled: reading one before its verb fills it is the poison's whole job. -TEST(PipeCatalogue, PipeInputFieldsStartUnfilled) { +TEST(PipeCatalog, PipeInputFieldsStartUnfilled) { EXPECT_EQ(kMGPipeInputFieldCount, 63u); MGPipeFilledState state{}; // Before the first fill the serial is 0 as well: 0 == 0 must not read as fresh, on the @@ -940,7 +940,7 @@ TEST(PipeCatalogue, PipeInputFieldsStartUnfilled) { // G5b: the verb enum is GLFunctionsTable's member list (71 entries), every class has verbs, // and the seven sticky fields ride in every class mask (P1 brief D7). -TEST(PipeCatalogue, VerbTableIsTheFunctionTable) { +TEST(PipeCatalog, VerbTableIsTheFunctionTable) { EXPECT_EQ(kMGPipeVerbCount, 71u); EXPECT_EQ(kMGPipeVerbClassCount, 9u); SizeT perClass[kMGPipeVerbClassCount] = {}; @@ -970,7 +970,7 @@ TEST(PipeCatalogue, VerbTableIsTheFunctionTable) { // The sticky set is exactly the seven forwarded, argument-keyed accessors (P1 brief D6); no // version or generation accessor is among them. -TEST(PipeCatalogue, StickyFieldsAreExactlyTheSeven) { +TEST(PipeCatalog, StickyFieldsAreExactlyTheSeven) { const char* const expected[] = { "GetBufferBindingPointCount", "GetProgramObject", "GetTextureObject", "HasOpenTransformFeedbackSpan", "InvalidateCompileEnv", "ValidateProgramName", "RecordError"}; @@ -993,7 +993,7 @@ TEST(PipeCatalogue, StickyFieldsAreExactlyTheSeven) { // G4 compares floating point BY BITS (P1 brief D8): a NaN equals itself, a negative zero // does not equal a positive one, and a vector type inside an Array inside a value struct is // reached field by field - the differing member of the residual block is named. -TEST(PipeCatalogue, FloatVectorsCompareBitwise) { +TEST(PipeCatalog, FloatVectorsCompareBitwise) { const Float nan = std::numeric_limits::quiet_NaN(); const FloatVec4 a{nan, 1.f, 2.f, 3.f}; const FloatVec4 b{nan, 1.f, 2.f, 3.f}; @@ -1043,7 +1043,7 @@ TEST(PipeCatalogue, FloatVectorsCompareBitwise) { // the client's CSO cache confirms a hash hit with a memcmp over the same bytes, so a codec or // a cache that read the padding would mint a fresh CSO per call and the verify lane would // abort at random. -TEST(PipeCatalogue, SixValueStructsHaveFieldLists) { +TEST(PipeCatalog, SixValueStructsHaveFieldLists) { // 72 through P5; P5b appended five call payloads (the contract: MGPImageBind, // MGPPatchParameter, MGPStreamOutputBind, MGPStorageBlockBinding, MGPCopyFromFramebuffer), // each with its own field list, so the comparator sees every one of them: 77. P5c appended @@ -1118,7 +1118,7 @@ TEST(PipeCatalogue, SixValueStructsHaveFieldLists) { } // G7 pins the member list the pipeline/dynamic split is derived from. -TEST(PipeCatalogue, PipelineSubsetMembersArePinned) { +TEST(PipeCatalog, PipelineSubsetMembersArePinned) { // 44 as of P2, in DECLARATION order. It grew from the 24 members // ComputePipelineStateHash used to hash because the chunk table's rule is "a byte is // pipeline state iff a setter that calls BumpVersions() writes it", and that is a strict @@ -1144,7 +1144,7 @@ TEST(PipeCatalogue, PipelineSubsetMembersArePinned) { // THE CASE NAME STAYS "…HasTenCallbacks" DELIBERATELY. G2/G14 say the ctest name set only ever // grows, so renaming this would delete a name the gate is watching; the count it asserts is what // has to be right, and the comment is where the number lives. -TEST(PipeCatalogue, ReverseChannelHasTenCallbacks) { +TEST(PipeCatalog, ReverseChannelHasTenCallbacks) { EXPECT_EQ(kMGPipeCallbackCount, 7u); EXPECT_EQ(sizeof(MGPipeCallbacks), kMGPipeCallbackCount * sizeof(void (*)())); } @@ -1152,7 +1152,7 @@ TEST(PipeCatalogue, ReverseChannelHasTenCallbacks) { // The one shape that changes with the transport. In a monolith it resolves to the pointer // it was given; with no transport installed a segment-backed span resolves to nothing // rather than to garbage. -TEST(PipeCatalogue, HostSpanResolvesTheMonolithPointer) { +TEST(PipeCatalog, HostSpanResolvesTheMonolithPointer) { static_assert(sizeof(MGHostSpan) == 32); const Uint8 bytes[8] = {0, 1, 2, 3, 4, 5, 6, 7}; MGHostSpan span{}; @@ -1171,7 +1171,7 @@ TEST(PipeCatalogue, HostSpanResolvesTheMonolithPointer) { // D-B8: a bound buffer range carries no inline host span. The named-UBO bytes are an // optional second var-tail announced by HostSpanCount, so the SSBO, atomic-counter and XFB // ranges - the majority - pay nothing for a payload whose shape is not frozen yet. -TEST(PipeCatalogue, BufferRangeCarriesNoInlineHostSpan) { +TEST(PipeCatalog, BufferRangeCarriesNoInlineHostSpan) { static_assert(sizeof(MGPBufferRange) == 24); // P5e (sb, ID-104): 32 -> 40. WritableMask was ONE Uint32 against an 84-point window, so // it could describe only the first 32 points and a storage buffer bound at point 32 or @@ -1220,7 +1220,7 @@ TEST(PipeCatalogue, BufferRangeCarriesNoInlineHostSpan) { // The buffer half of resource_subdata has no level and no box of its own: [offset, size) // rides in UnionBox.X / UnionBox.W, and only through the two helpers, which also say where // one record stops and the emitter has to split. -TEST(PipeCatalogue, SubDataBufferRangeRidesInTheUnionBox) { +TEST(PipeCatalog, SubDataBufferRangeRidesInTheUnionBox) { MGPSubData record{}; record.Level = 3; record.RegionCount = 2; @@ -1256,7 +1256,7 @@ TEST(PipeCatalogue, SubDataBufferRangeRidesInTheUnionBox) { // baseInstance-only divergence through under MOBILEGL_PIPE_VERIFY - which is the one gate // that would otherwise have seen the suppression bug the ContentHash rule exists to prevent. // So the field list is pinned the only way it can be: by making the comparator name it. -TEST(PipeCatalogue, VertexBufferSetCarriesAnExplicitBaseInstance) { +TEST(PipeCatalog, VertexBufferSetCarriesAnExplicitBaseInstance) { static_assert(sizeof(MGPVertexBuffers) == 24); static_assert(sizeof(MGPVertexBuffer) == 32); // the per-entry struct did NOT change EXPECT_EQ(sizeof(MGPVertexBuffers), 24u); @@ -1285,7 +1285,7 @@ TEST(PipeCatalogue, VertexBufferSetCarriesAnExplicitBaseInstance) { // of, so their sizes are the blob's stride and the applier's bounds arithmetic; and IsLong is // carried SEPARATELY from Type, because a GL_DOUBLE format converted to float and a long // format that keeps all 64 bits are different requests that a backend has to tell apart. -TEST(PipeCatalogue, VertexWireViewsAreFlatAndCarryIsLongSeparately) { +TEST(PipeCatalog, VertexWireViewsAreFlatAndCarryIsLongSeparately) { static_assert(sizeof(MGPVertexAttribWire) == 24); static_assert(sizeof(MGPVertexBindingPointWire) == 16); EXPECT_EQ(sizeof(MGPVertexAttribWire), 24u); @@ -1322,7 +1322,7 @@ TEST(PipeCatalogue, VertexWireViewsAreFlatAndCarryIsLongSeparately) { // This is the negative control for a future flag that over-acks: in monolith the ack is a // no-op, so the mistake cannot be shipped from here, and the phase where it would bite // inherits this pin rather than the guess. -TEST(PipeCatalogue, ResourceRespecifyAcksOnlyImmutableStorage) { +TEST(PipeCatalog, ResourceRespecifyAcksOnlyImmutableStorage) { Uint32 flags = 0; #define MGP_FLAGS_OF_RESOURCE_RESPECIFY(Name, Payload, Class, Flags, Wait) \ if (std::strcmp(#Name, "ResourceRespecify") == 0) flags = static_cast(Flags); @@ -1447,7 +1447,7 @@ TEST(PipeCatalogue, ResourceRespecifyAcksOnlyImmutableStorage) { // say WHICH one was lost. P8-SE: scripts/ci/unmigrated_emulation_sites.py holds this list against // the `MGPipeUnmigratedEmulation("...")` call sites in the tree - equal sets, one site per name - // because nothing did before and the list drifted twice unseen (P8-B, and P8-SE's dead name). -TEST(PipeCatalogue, EveryUnmigratedEmulationIsNamedOnce) { +TEST(PipeCatalog, EveryUnmigratedEmulationIsNamedOnce) { // Every one of these is an emulation that reads or writes CLIENT memory a split server // would not have: a CPU shadow mirror, a CPU mipmap fallback and a shadow-conversion // readback. @@ -1496,7 +1496,7 @@ TEST(PipeCatalogue, EveryUnmigratedEmulationIsNamedOnce) { // // This case pins both halves: a leaked COMPOSITE moves the band's marks and not the ordinary // one, and an ordinary leak still moves the ordinary mark with a composite outstanding. -TEST(PipeCatalogue, TheCompositeShaderBandIsCountedApartFromTheOrdinarySpace) { +TEST(PipeCatalog, TheCompositeShaderBandIsCountedApartFromTheOrdinarySpace) { MGPipeSlotAllocator slots; const Uint32 ordinaryBefore = slots.HighWater(MGPipeKind::ShaderCso); diff --git a/MobileGL/MG_Test/Pipe/ProgramEmitTest.cpp b/MobileGL/MG_Test/Pipe/ProgramEmitTest.cpp index e873b89a..0eb50322 100644 --- a/MobileGL/MG_Test/Pipe/ProgramEmitTest.cpp +++ b/MobileGL/MG_Test/Pipe/ProgramEmitTest.cpp @@ -285,7 +285,7 @@ TEST(ProgramEmit, ACreateStoresTheDescriptorAndARelinkCountsUpAndDropsTheBlockKe // The three refusals a create can produce: no artifacts at all behind seven undeclared blobs, a // default uniform block no program can have, and a slot outside the record table's bound. -TEST(ProgramEmit, ACreateWithNoArtefactsAnOversizedBlockOrACorruptSlotIsRefusedNamingTheProgram) { +TEST(ProgramEmit, ACreateWithNoArtifactsAnOversizedBlockOrACorruptSlotIsRefusedNamingTheProgram) { ApplierGuard guard; const LinkArtifacts link; const SpirvArtifacts spirv; diff --git a/MobileGL/MG_Test/Pipe/ResourceEmitTest.cpp b/MobileGL/MG_Test/Pipe/ResourceEmitTest.cpp index c6878f59..c1864062 100644 --- a/MobileGL/MG_Test/Pipe/ResourceEmitTest.cpp +++ b/MobileGL/MG_Test/Pipe/ResourceEmitTest.cpp @@ -1701,7 +1701,7 @@ namespace { // Neither branch may fall through to a table it was not named. A target or a kind outside // the catalog would otherwise land in whichever table the code happened to reach first, // and destroy a live object of a kind the call was never about. - TEST(ResourceEmit, AResourceTargetOrKindTheCatalogueDoesNotNameIsRefusedRatherThanRouted) { + TEST(ResourceEmit, AResourceTargetOrKindTheCatalogDoesNotNameIsRefusedRatherThanRouted) { ApplierGuard guard; const MGPipeHandle res{5, 1}; diff --git a/MobileGL/MG_Test/Pipe/ShaderBufferEmitTest.cpp b/MobileGL/MG_Test/Pipe/ShaderBufferEmitTest.cpp index b29310ab..6b9140b5 100644 --- a/MobileGL/MG_Test/Pipe/ShaderBufferEmitTest.cpp +++ b/MobileGL/MG_Test/Pipe/ShaderBufferEmitTest.cpp @@ -276,7 +276,7 @@ namespace { // bounded by GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS, which is a DEVICE number and is exactly // what ruling 10 says the client must not pre-clamp the WIRE to. The wire-field half - that // the mask reaches point 83 at all - is driven through the applier below, where the window - // is 84 by construction, and pinned again in PipeCatalogueTest. + // is 84 by construction, and pinned again in PipeCatalogTest. TEST(ShaderBufferEmit, OnlyTheWritableClassesSetAMaskAndItReachesTheLastPoint) { EmitterScope scope; GLint storageBindings = 0; diff --git a/MobileGL/MG_Test/Pipe/TextureEmitTest.cpp b/MobileGL/MG_Test/Pipe/TextureEmitTest.cpp index f75acacb..85efea46 100644 --- a/MobileGL/MG_Test/Pipe/TextureEmitTest.cpp +++ b/MobileGL/MG_Test/Pipe/TextureEmitTest.cpp @@ -2395,11 +2395,11 @@ TEST(TextureEmit, ASubDataRecordWhoseResourceTargetNamesNoTextureIsRefusedRather // And so is a value at or above the catalog, and so is the buffer target arriving with a // non-zero upload-target half - which the whole-field buffer test above cannot see. - MGPSubData pastTheCatalogue = renderbuffer; - pastTheCatalogue.Target = static_cast(MGPipeResourceTarget::Count); + MGPSubData pastTheCatalog = renderbuffer; + pastTheCatalog.Target = static_cast(MGPipeResourceTarget::Count); ExpectRefusedNaming("resource_subdata {slot=9, gen=1}: the record's resource target names no texture " "to upload into", - [&pastTheCatalogue, &texels]() { MGPipeApplyResourceSubData(pastTheCatalogue, texels); }); + [&pastTheCatalog, &texels]() { MGPipeApplyResourceSubData(pastTheCatalog, texels); }); MGPSubData packedBuffer = renderbuffer; packedBuffer.Target = static_cast(0x0100u | kMGPipeResourceTargetBuffer); diff --git a/MobileGL/MG_Test/Pipe/TrackerTest.cpp b/MobileGL/MG_Test/Pipe/TrackerTest.cpp index 763b13d0..9c3159ad 100644 --- a/MobileGL/MG_Test/Pipe/TrackerTest.cpp +++ b/MobileGL/MG_Test/Pipe/TrackerTest.cpp @@ -43,8 +43,8 @@ using namespace MobileGL::MG_Pipe; namespace { // The subsystem bitmask the tracker dispatches on is allocated in every build. - TEST(Tracker, SubsystemBitsDoNotOverlapTheBehaviourBit) { - EXPECT_EQ(kMGPipeSubsystemsMigratedAtP2 & kMGPipeBehaviourNoCsoContentAddressing, 0ull); + TEST(Tracker, SubsystemBitsDoNotOverlapTheBehaviorBit) { + EXPECT_EQ(kMGPipeSubsystemsMigratedAtP2 & kMGPipeBehaviorNoCsoContentAddressing, 0ull); } // A composite shutter is only as good as its mix: a collision is a missed fire. The pairs diff --git a/MobileGL/MG_Test/Pipeline/PipelineQuirkTest.cpp b/MobileGL/MG_Test/Pipeline/PipelineQuirkTest.cpp index abf9392c..afd4d95d 100644 --- a/MobileGL/MG_Test/Pipeline/PipelineQuirkTest.cpp +++ b/MobileGL/MG_Test/Pipeline/PipelineQuirkTest.cpp @@ -647,7 +647,7 @@ TEST(PipelineQuirkTest, WireDepthResolveProbeKnobReplacesTheMeasurementNotTheVer EXPECT_EQ(ParseWireDepthResolveProbeKnob(""), WireDepthResolveProbeKnob::Measure); EXPECT_EQ(ParseWireDepthResolveProbeKnob("bug"), WireDepthResolveProbeKnob::ForceBug); EXPECT_EQ(ParseWireDepthResolveProbeKnob("clean"), WireDepthResolveProbeKnob::ForceClean); - EXPECT_EQ(ParseWireDepthResolveProbeKnob("0x5143"), WireDepthResolveProbeKnob::Unrecognised); + EXPECT_EQ(ParseWireDepthResolveProbeKnob("0x5143"), WireDepthResolveProbeKnob::Unrecognized); Int measured = 0; const auto measure = [&] { ++measured; @@ -662,7 +662,7 @@ TEST(PipelineQuirkTest, WireDepthResolveProbeKnobReplacesTheMeasurementNotTheVer EXPECT_EQ(clean.verdict, WireDepthResolveProbeVerdict::Clean); EXPECT_FALSE(clean.preferShader); EXPECT_EQ(measured, 0) << "a forced verdict must not also run the device probe"; - const auto other = ChooseWireDepthResolveArm(WireDepthResolveProbeKnob::Unrecognised, true, measure); + const auto other = ChooseWireDepthResolveArm(WireDepthResolveProbeKnob::Unrecognized, true, measure); EXPECT_EQ(measured, 1) << "an unrecognized value runs the probe as if the knob were unset"; EXPECT_FALSE(other.measurement.fromKnob); EXPECT_EQ(other.verdict, WireDepthResolveProbeVerdict::Clean); diff --git a/MobileGL/MG_Test/Program/AsyncSpirvPhaseTest.cpp b/MobileGL/MG_Test/Program/AsyncSpirvPhaseTest.cpp index 845ebb96..9be5d4b5 100644 --- a/MobileGL/MG_Test/Program/AsyncSpirvPhaseTest.cpp +++ b/MobileGL/MG_Test/Program/AsyncSpirvPhaseTest.cpp @@ -344,7 +344,7 @@ void main() { fragColor = vec4(1.0); } // LINK_STATUS read has published phase A (m_pendingLink is null), CancelLink() can only reach // the SPIR-V job - which is exactly the shape StopAndDrain produces for a phase B queued // behind an already-complete phase A. -TEST_F(AsyncSpirvPhaseTest, ALinkedProgramWhoseSpirvJobWasCancelledDegradesInsteadOfFaulting) { +TEST_F(AsyncSpirvPhaseTest, ALinkedProgramWhoseSpirvJobWasCanceledDegradesInsteadOfFaulting) { const AsyncModeScope async(true); const SingleWorkerScope oneWorker; constexpr int kPrograms = 12; @@ -353,7 +353,7 @@ TEST_F(AsyncSpirvPhaseTest, ALinkedProgramWhoseSpirvJobWasCancelledDegradesInste Vector sources; const Vector programs = LinkBatch(kPrograms, kFirst, sources); - int cancelled = 0; + int canceled = 0; for (int i = 0; i < kPrograms; ++i) { const GLuint program = programs[static_cast(i)]; const String n = std::to_string(kFirst + i); @@ -363,7 +363,7 @@ TEST_F(AsyncSpirvPhaseTest, ALinkedProgramWhoseSpirvJobWasCancelledDegradesInste if (object->IsSpirvComplete()) continue; // already published; not the state under test object->CancelLink(); // phase A is published, so this reaches only the SPIR-V job - ++cancelled; + ++canceled; // ---- the contract: linked, fully queryable, not drawable ---- EXPECT_TRUE(object->GetLinkStatus()) << "a canceled phase B must not retract LINK_STATUS"; @@ -420,7 +420,7 @@ TEST_F(AsyncSpirvPhaseTest, ALinkedProgramWhoseSpirvJobWasCancelledDegradesInste EXPECT_EQ(GetError(), GL_NO_ERROR); } - EXPECT_GT(cancelled, 0) << "no phase B was ever canceled; this case proved nothing"; + EXPECT_GT(canceled, 0) << "no phase B was ever canceled; this case proved nothing"; } // The mirror image: with async off the state is not reachable at all, because both bodies run diff --git a/MobileGL/MG_Test/Program/ProgramArtifactsCodecTest.cpp b/MobileGL/MG_Test/Program/ProgramArtifactsCodecTest.cpp index 76fbe7e1..e70b8738 100644 --- a/MobileGL/MG_Test/Program/ProgramArtifactsCodecTest.cpp +++ b/MobileGL/MG_Test/Program/ProgramArtifactsCodecTest.cpp @@ -117,25 +117,25 @@ namespace { LinkArtifacts MakeLinkArtifacts() { LinkArtifacts link{}; - link.uniformReflection = {MakeReflection("uColour", 0), MakeReflection("uMatrix", 1)}; + link.uniformReflection = {MakeReflection("uColor", 0), MakeReflection("uMatrix", 1)}; link.blockReflection = {MakeReflection("Block", -1)}; link.pipeInputReflection = {MakeReflection("inPosition", 0)}; - link.pipeOutputReflection = {MakeReflection("outColour", 0)}; + link.pipeOutputReflection = {MakeReflection("outColor", 0)}; link.lastStageIsFragment = true; link.computeLocalSize = {8u, 4u, 2u}; - link.uniformIndexByName = {{"uColour", 0}, {"uMatrix", 1}}; + link.uniformIndexByName = {{"uColor", 0}, {"uMatrix", 1}}; link.attribs = {"inPosition", "inNormal"}; link.attribTypes = {GL_FLOAT_VEC3, GL_FLOAT_VEC3}; - link.linkedFragDataLocation = {{"outColour", 0u}}; - link.linkedFragDataIndex = {{"outColour", 1u}}; + link.linkedFragDataLocation = {{"outColor", 0u}}; + link.linkedFragDataIndex = {{"outColor", 1u}}; link.glUniformIndexToTProgram = {0, 1}; link.tProgramUniformIndexToGl = {0, 1}; link.glBlockIndexToTProgram = {0}; link.tProgramBlockIndexToGl = {-1}; link.glUniformBlockIndexToBlock = {0}; link.blockIndexToGlUniformBlock = {0}; - link.linkedExplicitUniformLocations = {{"uColour", 3}}; - link.uniformLocations = {{"uColour", 0u}, {"uMatrix", 4u}}; + link.linkedExplicitUniformLocations = {{"uColor", 3}}; + link.uniformLocations = {{"uColor", 0u}, {"uMatrix", 4u}}; link.writtenUniformLocationBits = {0x5ull}; link.writtenUniformIndexBits = {0x3ull}; link.writtenUniformIndices = {0u, 1u}; @@ -178,7 +178,7 @@ namespace { // scalars and two vectors. The codec has a hand-written arm for it because // ProgramArtifacts.h gives it no VisitFields table. glslang::TIntermediate::TUniformInitializer initializer; - initializer.name = "uInitialised"; + initializer.name = "uInitialized"; initializer.basicType = glslang::EbtInt; initializer.vectorSize = 2; initializer.matrixCols = 0; @@ -252,7 +252,7 @@ TEST(ProgramArtifactsCodec, RoundTripsAFullyPopulatedArchive) { // The four reflection vectors, with their TypeFacts. ASSERT_EQ(decodedLink.uniformReflection.size(), 2u); - EXPECT_EQ(decodedLink.uniformReflection[0].name, "uColour"); + EXPECT_EQ(decodedLink.uniformReflection[0].name, "uColor"); EXPECT_EQ(decodedLink.uniformReflection[1].location, 1); EXPECT_EQ(decodedLink.uniformReflection[0].arrayStride, 16); EXPECT_EQ(decodedLink.uniformReflection[0].stages, 0x3u); @@ -285,7 +285,7 @@ TEST(ProgramArtifactsCodec, RoundTripsAFullyPopulatedArchive) { // The glslang-typed aggregate, through the codec's one hand-written arm. ASSERT_EQ(decodedLink.uniformInitialValues.size(), 1u); - EXPECT_EQ(decodedLink.uniformInitialValues[0].name, "uInitialised"); + EXPECT_EQ(decodedLink.uniformInitialValues[0].name, "uInitialized"); EXPECT_EQ(decodedLink.uniformInitialValues[0].basicType, glslang::EbtInt); EXPECT_EQ(decodedLink.uniformInitialValues[0].arraySize, 3); ASSERT_EQ(decodedLink.uniformInitialValues[0].intValues.size(), 6u); diff --git a/MobileGL/MG_Test/Program/ProgramTest.cpp b/MobileGL/MG_Test/Program/ProgramTest.cpp index a0c75c57..a03c4b28 100644 --- a/MobileGL/MG_Test/Program/ProgramTest.cpp +++ b/MobileGL/MG_Test/Program/ProgramTest.cpp @@ -359,10 +359,10 @@ TEST_F(ProgramTest, ImageUniformLayoutBindingInitializesImageUnit) { char infoLog[1024] = ""; const char* csSrc = R"(#version 460 core layout(local_size_x = 1) in; -layout(binding = 4, rgba8) uniform writeonly image2D colourTexOut; +layout(binding = 4, rgba8) uniform writeonly image2D colorTexOut; void main() { - imageStore(colourTexOut, ivec2(0), vec4(1.0)); + imageStore(colorTexOut, ivec2(0), vec4(1.0)); } )"; @@ -382,7 +382,7 @@ void main() { GetProgramInfoLog(program, sizeof(infoLog), nullptr, infoLog); ASSERT_EQ(linkStatus, GL_TRUE) << infoLog; - const GLint location = GetUniformLocation(program, "colourTexOut"); + const GLint location = GetUniformLocation(program, "colorTexOut"); ASSERT_GE(location, 0); auto programObject = MobileGL::MG_State::pGLContext->GetProgramObject(program); ASSERT_NE(programObject, nullptr); @@ -544,7 +544,7 @@ void main() { ASSERT_NE(programObject, nullptr); // ---- the reference: the old consumer's algorithm, run here over the real modules ---- - const auto normalise = [](const SpvReflectDescriptorBinding& binding) { + const auto normalize = [](const SpvReflectDescriptorBinding& binding) { const char* raw = binding.name; if (binding.type_description != nullptr && binding.type_description->type_name != nullptr) { raw = binding.type_description->type_name; @@ -571,8 +571,8 @@ void main() { } std::sort(bindings.begin(), bindings.end(), [&](const SpvReflectDescriptorBinding* lhs, const SpvReflectDescriptorBinding* rhs) { - const String lhsName = lhs ? normalise(*lhs) : String(); - const String rhsName = rhs ? normalise(*rhs) : String(); + const String lhsName = lhs ? normalize(*lhs) : String(); + const String rhsName = rhs ? normalize(*rhs) : String(); if (lhsName != rhsName) return lhsName < rhsName; return lhs->binding < rhs->binding; }); @@ -580,7 +580,7 @@ void main() { if (binding == nullptr || binding->descriptor_type != SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_BUFFER) { continue; } - const String name = normalise(*binding); + const String name = normalize(*binding); if (name.empty()) continue; if (std::find(reference.begin(), reference.end(), name) != reference.end()) continue; reference.push_back(name); @@ -3956,7 +3956,7 @@ void main() { fragColor = vec4(1.0); } // link gets to judge: a bare `layout(location = MAX)` is already a compile error inside glslang // ("location is too large"), while an array's base compiles fine and only its last element passes // the ceiling (...uniform-loc-negative-link-max-num-of-locations). -TEST_F(ProgramTest, ExplicitUniformLocationsHonourMaxUniformLocations) { +TEST_F(ProgramTest, ExplicitUniformLocationsHonorMaxUniformLocations) { GLint maxLocations = 0; GetIntegerv(GL_MAX_UNIFORM_LOCATIONS, &maxLocations); ASSERT_GE(maxLocations, 1024) << "GL 4.3 requires at least 1024 uniform locations"; diff --git a/MobileGL/MG_Test/Program/ProgramUtilTest.cpp b/MobileGL/MG_Test/Program/ProgramUtilTest.cpp index f3b71015..957b3c9d 100644 --- a/MobileGL/MG_Test/Program/ProgramUtilTest.cpp +++ b/MobileGL/MG_Test/Program/ProgramUtilTest.cpp @@ -4788,7 +4788,7 @@ void main() { v = gl_NumSamples; } } } -TEST_F(ProgramUtilTest, NumSamplesShimHonoursTheVersionAndExtensionGate) { +TEST_F(ProgramUtilTest, NumSamplesShimHonorsTheVersionAndExtensionGate) { using namespace MG_Util::ShaderTranspiler; struct Case { diff --git a/MobileGL/MG_Test/Program/ShaderCompileAdoptionTest.cpp b/MobileGL/MG_Test/Program/ShaderCompileAdoptionTest.cpp index 17d64a54..3a347525 100644 --- a/MobileGL/MG_Test/Program/ShaderCompileAdoptionTest.cpp +++ b/MobileGL/MG_Test/Program/ShaderCompileAdoptionTest.cpp @@ -454,7 +454,7 @@ TEST_F(ShaderCompileAdoptionTest, DeletingOneSharerLeavesTheOtherIntact) { // but JobNode::Cancel on a Running node only sets the cancellation-REQUEST flag; the state // stays Running until the worker's body returns and JobNode::Run forces the final transition // to Canceled (see JobNode::Run's tail: it takes Canceled instead of Complete whenever -// m_cancelled is set, regardless of how the body finished). FindAdoptable must refuse a node +// m_canceled is set, regardless of how the body finished). FindAdoptable must refuse a node // in that in-between state - not just one already settled as Canceled - or C inherits a // doomed node and glGetShaderiv reports GL_FALSE with an empty info log for valid source. TEST_F(ShaderCompileAdoptionTest, RunningCancelRequestedNodeIsNotAdopted) { @@ -489,7 +489,7 @@ TEST_F(ShaderCompileAdoptionTest, RunningCancelRequestedNodeIsNotAdopted) { << "the node already settled; the race window closed before the assertions below " "could observe it - widen MakeVeryHeavySource's loop count"; ASSERT_TRUE(node->IsCancellationRequested()); - ASSERT_FALSE(node->IsCancelled()) << "the window this test targets does not exist here"; + ASSERT_FALSE(node->IsCanceled()) << "the window this test targets does not exist here"; // A brand-new shader name, byte-identical source, nothing wrong with it. const GLuint c = CreateShader(GL_FRAGMENT_SHADER); @@ -856,7 +856,7 @@ TEST(ShaderCompileAdoptionMapTest, EnvFingerprintMismatchIsNotAdopted) { // A node that settled as Canceled published nothing, so adopting it would hand the new // object a compile that can only ever report GL_FALSE. It must be a miss, and the dead entry // must be pruned where it is found rather than waiting for the amortized sweep. -TEST(ShaderCompileAdoptionMapTest, CancelledNodeIsNotAdoptedAndIsPruned) { +TEST(ShaderCompileAdoptionMapTest, CanceledNodeIsNotAdoptedAndIsPruned) { const auto& env = MG_Util::ShaderTranspiler::GetDefaultCompileEnv(); ShaderCompileAdoptionMap map; const String text = "#version 460\nvoid main() {}\n"; @@ -864,7 +864,7 @@ TEST(ShaderCompileAdoptionMapTest, CancelledNodeIsNotAdoptedAndIsPruned) { map.Register(node); // Never posted, so this settles the node as Canceled right here. node->Cancel(); - ASSERT_TRUE(node->IsCancelled()); + ASSERT_TRUE(node->IsCanceled()); ASSERT_EQ(map.GetEntryCount(), 1u); EXPECT_EQ(map.FindAdoptable(ShaderStage::Fragment, ShaderPreprocessCache::HashSource(text), text, env->fingerprint), diff --git a/MobileGL/MG_Test/SelfTest/DriverBugProbesTest.cpp b/MobileGL/MG_Test/SelfTest/DriverBugProbesTest.cpp index 5e5c19bb..20ea3994 100644 --- a/MobileGL/MG_Test/SelfTest/DriverBugProbesTest.cpp +++ b/MobileGL/MG_Test/SelfTest/DriverBugProbesTest.cpp @@ -1056,7 +1056,7 @@ TEST(DriverBugProbes, VertexInputLocationCeilingSaysWhenTheAttributeIsUnreachabl // ===================== LAYERED BLIT DESTINATION ===================== -TEST(DriverBugProbes, LayeredBlitDestinationIsCleanWhenTheLayerIsHonoured) { +TEST(DriverBugProbes, LayeredBlitDestinationIsCleanWhenTheLayerIsHonored) { ResetFakeDriver(); const MG_External::GLESFunctionsTable gl = MakeFakeGLESFunctions(); EXPECT_FALSE(ProbeBlitIgnoresDestinationArrayLayer(gl)); diff --git a/MobileGL/MG_Test/SelfTest/PrimitivesGeneratedNoXfbProbeTest.cpp b/MobileGL/MG_Test/SelfTest/PrimitivesGeneratedNoXfbProbeTest.cpp index 3d76d9b2..28a31b2d 100644 --- a/MobileGL/MG_Test/SelfTest/PrimitivesGeneratedNoXfbProbeTest.cpp +++ b/MobileGL/MG_Test/SelfTest/PrimitivesGeneratedNoXfbProbeTest.cpp @@ -511,7 +511,7 @@ TEST(PrimitivesGeneratedNoXfbProbeTeardownTest, AFenceTimeoutLeaksEverythingAndR // The control: a driver that signals normally gets the ordinary teardown - idle // wait, every object destroyed, no timeout flag - so the case above is testing the // timeout branch and not a probe that never cleans up at all. -TEST(PrimitivesGeneratedNoXfbProbeTeardownTest, ASignalledFenceTearsDownNormally) { +TEST(PrimitivesGeneratedNoXfbProbeTeardownTest, ASignaledFenceTearsDownNormally) { PrimitivesGeneratedNoXfbProbeContext context = FakeProbeContext(); g_fake.fenceWaitResult = VK_SUCCESS; g_fake.streamGenerated = 1; // healthy: the capture-less draws are counted diff --git a/MobileGL/MG_Test/ShaderTranspiler/DemoteFloat64Test.cpp b/MobileGL/MG_Test/ShaderTranspiler/DemoteFloat64Test.cpp index aee227a5..55005d1e 100644 --- a/MobileGL/MG_Test/ShaderTranspiler/DemoteFloat64Test.cpp +++ b/MobileGL/MG_Test/ShaderTranspiler/DemoteFloat64Test.cpp @@ -431,7 +431,7 @@ TEST_F(DemoteFloat64Test, TheSharedChainKeepsFloat64WhenTheBackendConsumesIt) { // The exception the vertex path needs, at the level ProgramSpirvTask asks it: no backend here can // FETCH 64 bits, so a stage that declares a Float64 input is demoted whole even where the rest of // its doubles could have survived. -TEST_F(DemoteFloat64Test, AFloat64VertexInputIsRecognisedAndOnlyOnAVertexStage) { +TEST_F(DemoteFloat64Test, AFloat64VertexInputIsRecognizedAndOnlyOnAVertexStage) { const Vector vertexWithDoubleInput = CompileToSpirv(GL_VERTEX_SHADER, kWideVertexSource); ASSERT_FALSE(vertexWithDoubleInput.empty()); EXPECT_TRUE(ShaderCompiler::ModuleDeclaresFloat64VertexInput(vertexWithDoubleInput)); @@ -796,7 +796,7 @@ TEST_F(DemoteFloat64Test, AComparisonAgainstZeroIsStillRewritten) { << "the rewrite must still fire for a genuine comparison against zero"; } -TEST_F(DemoteFloat64Test, TheThirtyTwoBitBehaviourIsUnchanged) { +TEST_F(DemoteFloat64Test, TheThirtyTwoBitBehaviorIsUnchanged) { EXPECT_FALSE(RewritesToAnAbsoluteValueTest(CompareAgainst("float", "1.0"))) << "a float compared against 1.0 must not be rewritten"; EXPECT_TRUE(RewritesToAnAbsoluteValueTest(CompareAgainst("float", "0.0"))) diff --git a/MobileGL/MG_Test/ShaderTranspiler/PixelCenterIntegerTest.cpp b/MobileGL/MG_Test/ShaderTranspiler/PixelCenterIntegerTest.cpp index feb375d9..4d949f0e 100644 --- a/MobileGL/MG_Test/ShaderTranspiler/PixelCenterIntegerTest.cpp +++ b/MobileGL/MG_Test/ShaderTranspiler/PixelCenterIntegerTest.cpp @@ -118,7 +118,7 @@ void main() { color = vec4(gl_FragCoord.x, gl_FragCoord.y, gl_FragCoord.z, gl_Fr } // A module without the mode is left alone. -TEST(LowerPixelCenterInteger, LeavesDefaultCentredModulesUnchanged) { +TEST(LowerPixelCenterInteger, LeavesDefaultCenteredModulesUnchanged) { MobileGL::Initialize(); const Vector input = CompileFragment(R"(#version 330 core out vec4 color; diff --git a/MobileGL/MG_Test/State/DebugTest.cpp b/MobileGL/MG_Test/State/DebugTest.cpp index 694bc0aa..d1654d35 100644 --- a/MobileGL/MG_Test/State/DebugTest.cpp +++ b/MobileGL/MG_Test/State/DebugTest.cpp @@ -196,7 +196,7 @@ namespace { EXPECT_STREQ(bufferLabel, "the buffer"); } - TEST_F(DebugTest, AnUnlabelledObjectAnswersWithAnEmptyString) { + TEST_F(DebugTest, AnUnlabeledObjectAnswersWithAnEmptyString) { const GLuint texture = GenTexture(); MG_Impl::GLImpl::BindTexture(GL_TEXTURE_2D, texture); DrainPendingGlErrors(); @@ -223,12 +223,12 @@ namespace { EXPECT_STREQ(buffer, "abc"); } - TEST_F(DebugTest, LabellingSomethingThatDoesNotExistIsInvalidValue) { + TEST_F(DebugTest, LabelingSomethingThatDoesNotExistIsInvalidValue) { MG_Impl::GLImpl::ObjectLabel(GL_TEXTURE, 0xFFFFFFFFu, -1, "nothing"); ExpectSingleGlError(GL_INVALID_VALUE); } - TEST_F(DebugTest, LabellingANonObjectTypeIsInvalidEnum) { + TEST_F(DebugTest, LabelingANonObjectTypeIsInvalidEnum) { const GLuint texture = GenTexture(); MG_Impl::GLImpl::BindTexture(GL_TEXTURE_2D, texture); DrainPendingGlErrors(); diff --git a/MobileGL/MG_Test/Texture/TextureTest.cpp b/MobileGL/MG_Test/Texture/TextureTest.cpp index 500a2adc..92fe5e87 100644 --- a/MobileGL/MG_Test/Texture/TextureTest.cpp +++ b/MobileGL/MG_Test/Texture/TextureTest.cpp @@ -7010,7 +7010,7 @@ TEST(EtcDecoder, DecodesTheConformanceSuitesEtc2RgbImage) { // The EAC half: a block whose multiplier is 0 still moves every texel by the bare modifier, and a // base of 128 with modifier index 4 (+2 in table 0) reads 130 in the alpha channel; the color half // is an individual-mode block of one flat color (all-zero indices: +2 on 0x88 = 138). -TEST(EtcDecoder, DecodesAnEacAlphaBlockAndAnIndividualModeColourBlock) { +TEST(EtcDecoder, DecodesAnEacAlphaBlockAndAnIndividualModeColorBlock) { Uint8 block[16] = {}; block[0] = 128; // alpha base block[1] = 0x10; // multiplier 1, table 0 diff --git a/MobileGL/MG_Test/Util/JobNodeTest.cpp b/MobileGL/MG_Test/Util/JobNodeTest.cpp index b7682531..46d44bd1 100644 --- a/MobileGL/MG_Test/Util/JobNodeTest.cpp +++ b/MobileGL/MG_Test/Util/JobNodeTest.cpp @@ -34,17 +34,17 @@ namespace { explicit TestJob(std::function body = {}) : m_body(Move(body)) {} std::atomic ran{0}; - std::atomic observedCancelledInBody{false}; - std::atomic observedCancelledStateInBody{false}; + std::atomic observedCanceledInBody{false}; + std::atomic observedCanceledStateInBody{false}; protected: void RunBody() override { ran.fetch_add(1, std::memory_order_acq_rel); if (m_body) m_body(*this); - observedCancelledInBody.store(IsCancellationRequested(), std::memory_order_release); + observedCanceledInBody.store(IsCancellationRequested(), std::memory_order_release); // A running body sees the request, not the outcome: the node is still Running // until it returns, which is exactly the cooperative contract. - observedCancelledStateInBody.store(IsCancelled(), std::memory_order_release); + observedCanceledStateInBody.store(IsCanceled(), std::memory_order_release); } private: @@ -174,7 +174,7 @@ TEST(JobNodeSubmit, PostedJobRunsOnAPoolThreadAndWaitJoinsIt) { EXPECT_TRUE(job->IsTerminal()); EXPECT_TRUE(job->IsComplete()); - EXPECT_FALSE(job->IsCancelled()); + EXPECT_FALSE(job->IsCanceled()); EXPECT_EQ(job->ran.load(), 1u); EXPECT_TRUE(sawPoolThread.load()); // The joining thread is not a pool thread - the assert inside Wait() depends on it. @@ -364,7 +364,7 @@ TEST(JobNodeCancel, CancelBeforeAnyDispatchSettlesTheNodeAndSkipsTheBody) { auto job = MakeShared(); job->Cancel(); - EXPECT_TRUE(job->IsCancelled()); + EXPECT_TRUE(job->IsCanceled()); EXPECT_TRUE(job->IsTerminal()); EXPECT_FALSE(job->IsComplete()); @@ -372,10 +372,10 @@ TEST(JobNodeCancel, CancelBeforeAnyDispatchSettlesTheNodeAndSkipsTheBody) { pool.Post(job); job->Wait(); EXPECT_EQ(job->ran.load(), 0u); - EXPECT_TRUE(job->IsCancelled()); + EXPECT_TRUE(job->IsCanceled()); } -TEST(JobNodeCancel, CancelWhileTheBodyIsRunningLetsItFinishAndReportsCancelled) { +TEST(JobNodeCancel, CancelWhileTheBodyIsRunningLetsItFinishAndReportsCanceled) { ShaderCompilePool pool(kTestThreads); Gate gate; @@ -396,10 +396,10 @@ TEST(JobNodeCancel, CancelWhileTheBodyIsRunningLetsItFinishAndReportsCancelled) job->Wait(); EXPECT_EQ(job->ran.load(), 1u); - EXPECT_TRUE(job->IsCancelled()); + EXPECT_TRUE(job->IsCanceled()); EXPECT_FALSE(job->IsComplete()); - EXPECT_TRUE(job->observedCancelledInBody.load()); - EXPECT_FALSE(job->observedCancelledStateInBody.load()); + EXPECT_TRUE(job->observedCanceledInBody.load()); + EXPECT_FALSE(job->observedCanceledStateInBody.load()); } TEST(JobNodeCancel, CancelAfterCompletionDoesNotUndoTheResult) { @@ -413,7 +413,7 @@ TEST(JobNodeCancel, CancelAfterCompletionDoesNotUndoTheResult) { // The request is recorded, but a settled result is never retroactively undone. EXPECT_TRUE(job->IsCancellationRequested()); EXPECT_TRUE(job->IsComplete()); - EXPECT_FALSE(job->IsCancelled()); + EXPECT_FALSE(job->IsCanceled()); EXPECT_EQ(job->ran.load(), 1u); } @@ -426,7 +426,7 @@ TEST(JobNodeCancel, CancelReleasesContinuationsSoDependentsAreNotStranded) { EXPECT_EQ(fired.load(), 1u); job->Wait(); // must not hang: a canceled pending node is terminal - EXPECT_TRUE(job->IsCancelled()); + EXPECT_TRUE(job->IsCanceled()); } // --------------------------------------------------------------------------------------- @@ -443,7 +443,7 @@ TEST(JobNodeException, AnExceptionEscapingABodyCancelsTheJobInsteadOfTerminating job->Wait(); EXPECT_TRUE(job->IsTerminal()); - EXPECT_TRUE(job->IsCancelled()); + EXPECT_TRUE(job->IsCanceled()); EXPECT_FALSE(job->IsComplete()); ASSERT_EQ(job->diagnostics.logLines.size(), 1u); EXPECT_NE(job->diagnostics.logLines[0].text.find("boom"), String::npos); @@ -456,7 +456,7 @@ TEST(JobNodeException, ANonStandardExceptionIsContainedToo) { pool.Post(job); job->Wait(); - EXPECT_TRUE(job->IsCancelled()); + EXPECT_TRUE(job->IsCanceled()); ASSERT_EQ(job->diagnostics.logLines.size(), 1u); } @@ -492,15 +492,15 @@ TEST(ShaderCompilePoolDrain, StopAndDrainWithAThousandQueuedJobsLeavesNoneRunnin // Every node is terminal, so nothing can be waiting on a worker that will never come. Uint complete = 0; - Uint cancelled = 0; + Uint canceled = 0; for (const auto& job : jobs) { ASSERT_TRUE(job->IsTerminal()); if (job->IsComplete()) ++complete; - if (job->IsCancelled()) ++cancelled; + if (job->IsCanceled()) ++canceled; EXPECT_LE(job->ran.load(), 1u); } - EXPECT_EQ(complete + cancelled, kJobs); - EXPECT_GT(cancelled, 0u); // the drain really did abandon queued work rather than run it + EXPECT_EQ(complete + canceled, kJobs); + EXPECT_GT(canceled, 0u); // the drain really did abandon queued work rather than run it } TEST(ShaderCompilePoolDrain, StopAndDrainWaitsForARunningBodyToReturn) { diff --git a/MobileGL/MG_Test/Util/PipeStatsTest.cpp b/MobileGL/MG_Test/Util/PipeStatsTest.cpp index ad2b4830..d07dbb1c 100644 --- a/MobileGL/MG_Test/Util/PipeStatsTest.cpp +++ b/MobileGL/MG_Test/Util/PipeStatsTest.cpp @@ -347,7 +347,7 @@ namespace { PS::AdvanceSummaryWindow(); // And it obeys the file's LABEL rule, not a rule of its own: the new window has no - // Present in it, so the bracket is relabelled "bytes[" and `seg` carries the window + // Present in it, so the bracket is relabeled "bytes[" and `seg` carries the window // TOTAL verbatim rather than a figure divided by a faked frame count. That is the same // rule the bytes[] bracket follows and the same one the two window-total tests below // pin; asserting "seg=0.00" here is what the first cut of this case did, and it was @@ -488,7 +488,7 @@ namespace { EXPECT_EQ(PS::FrameCount(), 0u); EXPECT_NE(line.find("window=0"), String::npos) << line; EXPECT_NE(line.find("draws/f=n/a"), String::npos) << line; - // The bracket is relabelled rather than divided: totals, and marked as totals. + // The bracket is relabeled rather than divided: totals, and marked as totals. EXPECT_EQ(line.find("bytes/f["), String::npos) << line; EXPECT_NE(line.find("bytes[buf=1404550"), String::npos) << line; } diff --git a/MobileGL/MG_Test/Wire/ApplyThreadPolicyTest.cpp b/MobileGL/MG_Test/Wire/ApplyThreadPolicyTest.cpp index 220a631f..e0fec2c5 100644 --- a/MobileGL/MG_Test/Wire/ApplyThreadPolicyTest.cpp +++ b/MobileGL/MG_Test/Wire/ApplyThreadPolicyTest.cpp @@ -7,7 +7,7 @@ // End of Source File Header // P11 B1 (CONTRACT-P11 B1): the apply thread's affinity and spin, selected per session from the -// peer's Hello dial mode and data plane, and the core reserved for a dialled-in shared-segment peer +// peer's Hello dial mode and data plane, and the core reserved for a dialed-in shared-segment peer // on every topology shape that matters - the Redmi's (cpu0-5 performance, cpu6-7 prime: big 0xc0, // prime 0xc0 of 0xff), a lone prime core beside other big cores, a lone prime core alone, symmetric // machines, an unreadable topology. @@ -40,13 +40,13 @@ TEST(ApplyThreadPolicy, AutoKeepsEveryBigCoreAndTheConfiguredSpinForAnInProcessO for (const ApplyPeer peer : {ApplyPeer::InProcess, ApplyPeer::Forked}) { const auto policy = SelectApplyThreadPolicy("auto", false, kConfigured, peer, kShm, kRedmiBig, kRedmiPrime, kRedmiOnline); - EXPECT_TRUE(policy.recognised); + EXPECT_TRUE(policy.recognized); EXPECT_EQ(policy.requestedMask, kRedmiBig) << ApplyPeerName(peer); EXPECT_EQ(policy.spinUs, kConfigured) << ApplyPeerName(peer); } } -TEST(ApplyThreadPolicy, AutoKeepsEveryBigCoreForADialledInPeerOnTheStreamPlane) { +TEST(ApplyThreadPolicy, AutoKeepsEveryBigCoreForADialedInPeerOnTheStreamPlane) { // tcp: an io thread feeds the apply thread; nothing changes for a TCP client. const auto policy = SelectApplyThreadPolicy("auto", false, kConfigured, ApplyPeer::Connected, kStream, kRedmiBig, kRedmiPrime, kRedmiOnline); @@ -56,7 +56,7 @@ TEST(ApplyThreadPolicy, AutoKeepsEveryBigCoreForADialledInPeerOnTheStreamPlane) TEST(ApplyThreadPolicy, SeveralPrimeCoresGiveTheApplyThreadTheLowestOfThem) { const auto policy = Connected("auto", kRedmiBig, kRedmiPrime, kRedmiOnline); - EXPECT_TRUE(policy.recognised); + EXPECT_TRUE(policy.recognized); EXPECT_EQ(policy.requestedMask, 0x40u) << "the LOWEST prime core: the scheduler puts a foreground client's GL thread on the highest"; EXPECT_EQ(policy.spinUs, kConnectedPeerSpinUs); @@ -116,7 +116,7 @@ TEST(ApplyThreadPolicy, AnEmptyOrMissingAffinityIsAuto) { } } -TEST(ApplyThreadPolicy, AnExplicitSpinWinsForADialledInPeer) { +TEST(ApplyThreadPolicy, AnExplicitSpinWinsForADialedInPeer) { const auto policy = SelectApplyThreadPolicy("auto", true, 7, ApplyPeer::Connected, kShm, kRedmiBig, kRedmiPrime, kRedmiOnline); EXPECT_EQ(policy.spinUs, 7u); @@ -128,12 +128,12 @@ TEST(ApplyThreadPolicy, AnExplicitMaskOrOffWinsForEveryPeerAndPlaneAndReservesNo for (const Bool plane : {kShm, kStream}) { const auto off = SelectApplyThreadPolicy("off", false, kConfigured, peer, plane, kRedmiBig, kRedmiPrime, kRedmiOnline); - EXPECT_TRUE(off.recognised); + EXPECT_TRUE(off.recognized); EXPECT_EQ(off.requestedMask, 0u) << ApplyPeerName(peer); EXPECT_EQ(off.spinUs, kConfigured) << "an operator's affinity keeps the configured spin"; const auto mask = SelectApplyThreadPolicy("0x80", false, kConfigured, peer, plane, kRedmiBig, kRedmiPrime, kRedmiOnline); - EXPECT_TRUE(mask.recognised); + EXPECT_TRUE(mask.recognized); EXPECT_EQ(mask.requestedMask, 0x80u) << ApplyPeerName(peer); EXPECT_EQ( SelectApplyThreadPolicy("12", false, kConfigured, peer, plane, kRedmiBig, kRedmiPrime, kRedmiOnline) @@ -146,10 +146,10 @@ TEST(ApplyThreadPolicy, AnExplicitMaskOrOffWinsForEveryPeerAndPlaneAndReservesNo EXPECT_EQ(ReservedApplyCoreForConfig("off", kRedmiBig, kRedmiPrime, kRedmiOnline), 0u); } -TEST(ApplyThreadPolicy, UnrecognisedAffinityTextAppliesNothingAndSaysSo) { +TEST(ApplyThreadPolicy, UnrecognizedAffinityTextAppliesNothingAndSaysSo) { for (const char* text : {"big", "0xzz", "auto ", "3cores"}) { const auto policy = Connected(text, kRedmiBig, kRedmiPrime, kRedmiOnline); - EXPECT_FALSE(policy.recognised) << text; + EXPECT_FALSE(policy.recognized) << text; EXPECT_EQ(policy.requestedMask, 0u) << text; } } diff --git a/MobileGL/MG_Test/Wire/ConcurrentContextsTest.cpp b/MobileGL/MG_Test/Wire/ConcurrentContextsTest.cpp index fb1e815a..6a707c87 100644 --- a/MobileGL/MG_Test/Wire/ConcurrentContextsTest.cpp +++ b/MobileGL/MG_Test/Wire/ConcurrentContextsTest.cpp @@ -111,12 +111,12 @@ namespace { }; // A<<24|B<<16|G<<8|R of the texel each thread draws. - Uint32 ColourOf(int index) { + Uint32 ColorOf(int index) { return 0xFF000000u | (0x40u + 0x50u * static_cast(index % 3)) << 8 | (0x20u + 0x30u * static_cast(index / 3)); } // The clear color of a churn cycle (ReadbackRace): a different one per thread and cycle. - Uint32 ChurnColourOf(int index, int cycle) { + Uint32 ChurnColorOf(int index, int cycle) { return 0xFF000000u | (0x10u * static_cast(index)) << 16 | (static_cast(cycle * 7) & 0xFFu) << 8 | 0x80u; } @@ -151,7 +151,7 @@ namespace { GLuint program = 0; GLuint vertexArray = 0; GLuint texture = 0; - Uint32 colour = 0; + Uint32 color = 0; }; // The thread's program, vertex array and one-texel texture of its own color. @@ -183,12 +183,12 @@ namespace { if (!linked) glGetProgramInfoLog(drawing.program, sizeof(out->linkLog) - 1, nullptr, out->linkLog); glGenVertexArrays(1, &drawing.vertexArray); glGenTextures(1, &drawing.texture); - drawing.colour = ColourOf(index); + drawing.color = ColorOf(index); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, drawing.texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &drawing.colour); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &drawing.color); return drawing; } @@ -218,7 +218,7 @@ namespace { glDrawArrays(GL_TRIANGLES, 0, 3); Uint32 pixel = 0x5A5A5A5Au; glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixel); - Tally(out, frame, pixel, drawing.colour); + Tally(out, frame, pixel, drawing.color); } // The frames a thread draws: staggered, so the threads finish (and tear down) one after another @@ -326,20 +326,19 @@ namespace { GLuint texture = 0; glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); - const Uint32 texel = ChurnColourOf(index, cycle); + const Uint32 texel = ChurnColorOf(index, cycle); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &texel); GLuint vertexArray = 0; glGenVertexArrays(1, &vertexArray); glBindVertexArray(vertexArray); - const Uint32 colour = ChurnColourOf(index, cycle); + const Uint32 color = ChurnColorOf(index, cycle); glViewport(0, 0, 8, 8); - glClearColor(static_cast(colour & 0xFFu) / 255.0f, - static_cast((colour >> 8) & 0xFFu) / 255.0f, - static_cast((colour >> 16) & 0xFFu) / 255.0f, 1.0f); + glClearColor(static_cast(color & 0xFFu) / 255.0f, static_cast((color >> 8) & 0xFFu) / 255.0f, + static_cast((color >> 16) & 0xFFu) / 255.0f, 1.0f); glClear(GL_COLOR_BUFFER_BIT); Uint32 pixel = 0x5A5A5A5Au; glReadPixels(0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &pixel); - Tally(out, cycle, pixel, colour); + Tally(out, cycle, pixel, color); if (cycle % 2 == 0) glDeleteTextures(1, &texture); // the odd ones die with the context (void)eglMakeCurrent(rig->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); (void)eglDestroyContext(rig->dpy, context); diff --git a/MobileGL/MG_Test/Wire/PersistentMapFaultTest.cpp b/MobileGL/MG_Test/Wire/PersistentMapFaultTest.cpp index 6919e632..f1915c30 100644 --- a/MobileGL/MG_Test/Wire/PersistentMapFaultTest.cpp +++ b/MobileGL/MG_Test/Wire/PersistentMapFaultTest.cpp @@ -105,7 +105,7 @@ TEST(PersistentMapFaultOwnership, AKernelsUntaggedFaultAddressIsOwnedByATaggedSh // The same row without needing the host to ignore a top byte at all: the predicate is fed a // composed slot, so it runs everywhere and goes red everywhere the normalization is dropped. // This is the case the gate rests on; the one above is the device's literal reproduction. -TEST(PersistentMapFaultOwnership, TheOwnershipRowNormalisesBothSidesBeforeItCompares) { +TEST(PersistentMapFaultOwnership, TheOwnershipRowNormalizesBothSidesBeforeItCompares) { SizeT pageIndex = ~static_cast(0); const uintptr_t base = PersistentMapTracker::UntagAddressForTest(kDeviceTaggedShadowBase); // Untagged base against untagged fault: owned, on this host and on the device alike. diff --git a/MobileGL/MG_Test/Wire/PipeWireCodecTest.cpp b/MobileGL/MG_Test/Wire/PipeWireCodecTest.cpp index b71cd485..06960124 100644 --- a/MobileGL/MG_Test/Wire/PipeWireCodecTest.cpp +++ b/MobileGL/MG_Test/Wire/PipeWireCodecTest.cpp @@ -777,7 +777,7 @@ TEST_F(PipeWireCodecTest, EveryPayloadByteCrossesIncludingTheOnesSpelledPad) { // // So this case asserts the whole payload byte for byte rather than the named fields: a // test that compared only the members would go green through exactly that bug. - // IT NAMES NO PAD MEMBER, deliberately. The whole struct is stamped with a recognisable + // IT NAMES NO PAD MEMBER, deliberately. The whole struct is stamped with a recognizable // byte first and only the fields the decoder validates are then written, so whatever is // left - Pad0, Pad1, or the names a later phase gives them - still carries the stamp and a // memcmp over the whole payload is the assertion. A case that named `Pad0` would stop @@ -2097,7 +2097,7 @@ TEST_F(PipeWireCodecTest, TheStageMarkQueueStaysBoundedWithOneRecordAlwaysInFlig // ---- M4: the reply slot is for kReplySlot rows only ---------------------------------------- -TEST_F(PipeWireCodecTest, NoReplyIsWrittenForARowTheCatalogueGivesNoReplySlot) { +TEST_F(PipeWireCodecTest, NoReplyIsWrittenForARowTheCatalogGivesNoReplySlot) { // s1 sizes ReplyPool from MGPipeCallFlagsFor, so a reply written for a record the pool // reserved no slot for overwrites a waiter's answer - and because the slot header stamps // the WRITER's seq for self-check, the waiter's check then fails for ever and the barrier diff --git a/MobileGL/MG_Test/Wire/RemoteClientControls.inc b/MobileGL/MG_Test/Wire/RemoteClientControls.inc index ca5654fb..cbdcf5f4 100644 --- a/MobileGL/MG_Test/Wire/RemoteClientControls.inc +++ b/MobileGL/MG_Test/Wire/RemoteClientControls.inc @@ -1024,7 +1024,7 @@ TEST(RemoteClientControls, TextureUploadsStopOwningAReplyOnTheWireArm) { MG_State::pGLContext = MakeUnique(); Uint8 pixels[4 * 4 * 4]; std::memset(pixels, 0x21, sizeof(pixels)); - // THE CONTROL ROW, NAMED RATHER THAN TOTALLED, AND MEASURED ACROSS THE WHOLE SETUP. The + // THE CONTROL ROW, NAMED RATHER THAN TOTALED, AND MEASURED ACROSS THE WHOLE SETUP. The // object's create is the one record an object always pays for (kWaitReply in // PipeCalls.def), so ITS counter is the live control - and the baseline goes in before // GenTextures, because which call publishes the twin (generate, bind or the storage diff --git a/MobileGL/MG_Test/Wire/RemoteClientTest.cpp b/MobileGL/MG_Test/Wire/RemoteClientTest.cpp index 1add9905..4804e515 100644 --- a/MobileGL/MG_Test/Wire/RemoteClientTest.cpp +++ b/MobileGL/MG_Test/Wire/RemoteClientTest.cpp @@ -394,7 +394,7 @@ TEST(RemoteEmitTable, TheSevenI1SlotsAreClassBAndAreNotTheFatalThunk) { // rather than counted, so a table that flipped a DIFFERENT seven is red here and not only // in the arithmetic. This case used to compare each slot against a slot that was still // class C; since P10 B there is none left to compare against, so the class is decided - // behaviourally by EachI1SlotReachesRequireSessionUnderItsOwnName below and this case keeps + // behaviorally by EachI1SlotReachesRequireSessionUnderItsOwnName below and this case keeps // the pointer facts that need no fork. const MG_Backend::GlobalBackendFunctionsTable& table = RemoteEmitTable(); const void* const i1[] = { @@ -1438,7 +1438,7 @@ TEST(RemoteReadback, ABandedScatterWritesExactlyTheBytesTheWholeScatterWrites) { // ===================================================================================== TEST(PipeRouting, TheTablesAreInstalledWithoutAnybodyHavingRememberedTo) { - // The gate on the install MECHANISM rather than on the table contents (PipeCatalogueTest + // The gate on the install MECHANISM rather than on the table contents (PipeCatalogTest // owns the partition). Nothing in this file calls an installer; the tables are installed // because MG_Pipe/PipeRoute.h's inline variable is in this binary, which is the property // that a static initializer inside PipeRoute.cpp did NOT have - the linker dropped that @@ -1521,7 +1521,7 @@ TEST(PipeRouting, AnErrorStatusIsNotFoldedIntoAcceptedOrRefused) { namespace { // How many function-pointer cells of `a` differ from `b`, walked as a block of void* - - // the structs ARE their function pointers (PipeCatalogueTest static_asserts that shape). A + // the structs ARE their function pointers (PipeCatalogTest static_asserts that shape). A // routed row that stayed on the monolith adapter reads EQUAL and is not counted, which is // exactly the defect this measures. template @@ -1536,7 +1536,7 @@ namespace { } // namespace TEST(PipeRouting, TheInstalledClientArmIsWireAndNotMonolithAndEveryRoutedRowMoved) { - // WHAT B3 SAYS IS MISSING. PipeCatalogueTest installs and COUNTS the monolith table, so a + // WHAT B3 SAYS IS MISSING. PipeCatalogTest installs and COUNTS the monolith table, so a // client row that was never overwritten stays non-null and still counts - deleting one // `gMGPipe*.X = &Wire_X` assignment left every gate green (the cross-family verifier // reproduced it: catalog 32/32, all lanes green). The only thing that catches it is @@ -3171,13 +3171,13 @@ TEST(RemoteRunAhead, ARepublishedServerWindowExtentResizesTheServerOwnedSurfaceA republish(); if (ClientSessionInstance().DrainPublishedEvents() < 1u) ::_exit(92); if (query(EGL_WIDTH) != 2560 || query(EGL_HEIGHT) != 1600) ::_exit(93); - const IntVec3 colour = + const IntVec3 color = static_cast(defaultFramebuffer->colorAttachment.get()) ->GetMipmapTexelSize(TextureUploadTarget::Texture2D, 0); const IntVec3 depth = static_cast(defaultFramebuffer->depthAttachment.get()) ->GetMipmapTexelSize(TextureUploadTarget::Texture2D, 0); - if (colour.x() != 2560 || colour.y() != 1600 || depth.x() != 2560 || depth.y() != 1600) ::_exit(94); + if (color.x() != 2560 || color.y() != 1600 || depth.x() != 2560 || depth.y() != 1600) ::_exit(94); // A format-only event (a pbuffer's, a client-named window's) says nothing about the size. s_info.Width = 0; diff --git a/MobileGL/MG_Test/Wire/RingTest.cpp b/MobileGL/MG_Test/Wire/RingTest.cpp index a6ae90f1..3c0f73ef 100644 --- a/MobileGL/MG_Test/Wire/RingTest.cpp +++ b/MobileGL/MG_Test/Wire/RingTest.cpp @@ -45,7 +45,7 @@ namespace { std::uint64_t Capacity() const { return m_capacity; } bool Invariants() const { return RingCursorsValid(m_control, m_cursors, m_capacity); } - // Writes one record whose payload is `size` bytes of a recognisable + // Writes one record whose payload is `size` bytes of a recognizable // pattern seeded by `seed`. bool WriteRecord(std::uint16_t kind, std::uint64_t size, std::uint8_t seed) { void* payload = m_producer.Reserve(kind, kRecNone, size); diff --git a/MobileGL/MG_Test/Wire/ServerContextLiveTest.cpp b/MobileGL/MG_Test/Wire/ServerContextLiveTest.cpp index d1869e7b..a6447384 100644 --- a/MobileGL/MG_Test/Wire/ServerContextLiveTest.cpp +++ b/MobileGL/MG_Test/Wire/ServerContextLiveTest.cpp @@ -41,7 +41,7 @@ namespace { } } // namespace -TEST(ServerContextLiveTest, OneSessionsReleaseDoesNotKillANeighboursContext) { +TEST(ServerContextLiveTest, OneSessionsReleaseDoesNotKillANeighborsContext) { const MG_Pipe::PipeInputsThreadResolver previous = MG_Pipe::g_pipeInputsThreadResolver; MG_Pipe::g_pipeInputsThreadResolver = &ResolveTestSessionBlock; auto* kwinBlock = new MG_Pipe::PipeInputs(); diff --git a/MobileGL/MG_Test/Wire/ServerDisplayTest.cpp b/MobileGL/MG_Test/Wire/ServerDisplayTest.cpp index cdb42ae1..e69e86e6 100644 --- a/MobileGL/MG_Test/Wire/ServerDisplayTest.cpp +++ b/MobileGL/MG_Test/Wire/ServerDisplayTest.cpp @@ -496,14 +496,14 @@ TEST(ServerDisplayTest, InterruptAndTheCancelPredicateEndAWaitByName) { ServerWindowAcquire::Interrupted); interrupter.join(); - static std::atomic cancelled{false}; - cancelled.store(false); + static std::atomic canceled{false}; + canceled.store(false); std::thread canceller([] { std::this_thread::sleep_for(std::chrono::milliseconds(100)); - cancelled.store(true); + canceled.store(true); }); - const auto cancel = [](void*) -> Bool { return cancelled.load(); }; - EXPECT_EQ(display.AcquireFor(0, 0, 5000, this, nullptr, cancel, nullptr, &lease), ServerWindowAcquire::Cancelled); + const auto cancel = [](void*) -> Bool { return canceled.load(); }; + EXPECT_EQ(display.AcquireFor(0, 0, 5000, this, nullptr, cancel, nullptr, &lease), ServerWindowAcquire::Canceled); canceller.join(); // And Uninstall: the display is gone, the waiter hears NoDisplay. diff --git a/MobileGL/MG_Test/Wire/ServerLoopTest.cpp b/MobileGL/MG_Test/Wire/ServerLoopTest.cpp index c8d8f744..15c6f397 100644 --- a/MobileGL/MG_Test/Wire/ServerLoopTest.cpp +++ b/MobileGL/MG_Test/Wire/ServerLoopTest.cpp @@ -3896,11 +3896,11 @@ namespace { kSuspendLatched = 2, // the session latched, or the apply thread left kSuspendBackend = 4, // the backend was not asked to suspend exactly once, on the apply thread, for the lost window - kSuspendState = 8, // the loop's counters / the display's lease and wait are not the suspended state - kSuspendRecords = 16, // presents after the loss were not applied (all of them, none reaching a window) - kSuspendResume = 32, // a new window did not resume the session on it, on the apply thread - kSuspendAgain = 64, // the resumed session did not suspend again on the next loss - kSuspendNotCancelled = 128, // the session's end left it waiting for a window + kSuspendState = 8, // the loop's counters / the display's lease and wait are not the suspended state + kSuspendRecords = 16, // presents after the loss were not applied (all of them, none reaching a window) + kSuspendResume = 32, // a new window did not resume the session on it, on the apply thread + kSuspendAgain = 64, // the resumed session did not suspend again on the next loss + kSuspendNotCanceled = 128, // the session's end left it waiting for a window }; [[noreturn]] void SuspendResumeAndExit() { @@ -3950,7 +3950,7 @@ namespace { failed |= kSuspendAgain; fixture.Stop(); - if (display.SuspendedHolders() != 0) failed |= kSuspendNotCancelled; + if (display.SuspendedHolders() != 0) failed |= kSuspendNotCanceled; std::fprintf(stderr, "[suspend] suspends=%d resumes=%d presents=%d (%d without a window) lost=%llu\n", WindowBackendDouble::suspends.load(), WindowBackendDouble::resumes.load(), WindowBackendDouble::presents.load(), WindowBackendDouble::presentsWithoutWindow.load(), diff --git a/MobileGL/MG_Test/Wire/ServerSpawnTest.cpp b/MobileGL/MG_Test/Wire/ServerSpawnTest.cpp index bebc0e39..3b5f11a9 100644 --- a/MobileGL/MG_Test/Wire/ServerSpawnTest.cpp +++ b/MobileGL/MG_Test/Wire/ServerSpawnTest.cpp @@ -1569,7 +1569,7 @@ TEST(ServerSpawnTest, AnFdPairTheBrokerConnectedBringsASharedSegmentSessionUp) { EXPECT_LT(std::chrono::duration_cast(std::chrono::steady_clock::now() - start).count(), 4000); EXPECT_TRUE(Client::ClientSession::Active() != nullptr); - EXPECT_TRUE(Client::ClientSessionInstance().ConnectDial()) << "an fd: pair is a dialled-in (Connect) session"; + EXPECT_TRUE(Client::ClientSessionInstance().ConnectDial()) << "an fd: pair is a dialed-in (Connect) session"; EXPECT_NE(::fcntl(control, F_GETFD) & FD_CLOEXEC, 0) << "an adopted descriptor must not leak into children"; Client::ClientSessionInstance().Stop(); int exitCode = -1; diff --git a/MobileGL/MG_Test/Wire/SessionHandshakeTest.cpp b/MobileGL/MG_Test/Wire/SessionHandshakeTest.cpp index 0bf29931..d0ab1487 100644 --- a/MobileGL/MG_Test/Wire/SessionHandshakeTest.cpp +++ b/MobileGL/MG_Test/Wire/SessionHandshakeTest.cpp @@ -127,7 +127,7 @@ TEST(SessionHandshakeTest, TheAbiFingerprintChangesWhenAnyOfItsInputsDoes) { EXPECT_EQ(inputs.DynamicParamsSize, sizeof(MG_Backend::DynamicBackendParameters)); EXPECT_EQ(inputs.CapsSize, sizeof(MG_Pipe::MGPCaps)); EXPECT_EQ(inputs.MemberLayout, MG_Pipe::kMGPipeWireMemberLayoutDigest); - EXPECT_EQ(inputs.CatalogueLayout, MG_Pipe::kMGPipeWireCatalogueDigest); + EXPECT_EQ(inputs.CatalogLayout, MG_Pipe::kMGPipeWireCatalogDigest); EXPECT_EQ(inputs.RenderStateLayout, MG_Pipe::WireRenderStateDigest()); EXPECT_EQ(inputs.ProgramArtifactsCodecVersion, MG_State::GLState::kProgramArtifactsCodecVersion); EXPECT_EQ(inputs.ProgramArtifactsSchema, MG_State::GLState::ProgramArtifactsSchemaFingerprint()); @@ -147,7 +147,7 @@ TEST(SessionHandshakeTest, TheAbiFingerprintChangesWhenAnyOfItsInputsDoes) { EXPECT_NE(production, perturbed([](auto& i) { ++i.DynamicParamsSize; })) << "DynamicParamsSize"; EXPECT_NE(production, perturbed([](auto& i) { ++i.CapsSize; })) << "CapsSize"; EXPECT_NE(production, perturbed([](auto& i) { ++i.MemberLayout; })) << "MemberLayout"; - EXPECT_NE(production, perturbed([](auto& i) { ++i.CatalogueLayout; })) << "CatalogueLayout"; + EXPECT_NE(production, perturbed([](auto& i) { ++i.CatalogLayout; })) << "CatalogLayout"; EXPECT_NE(production, perturbed([](auto& i) { ++i.RenderStateLayout; })) << "RenderStateLayout"; EXPECT_NE(production, perturbed([](auto& i) { ++i.FormatCapabilityTargets; })) << "FormatCapabilityTargets"; EXPECT_NE(production, perturbed([](auto& i) { ++i.FormatCapabilityFormats; })) << "FormatCapabilityFormats"; diff --git a/MobileGL/MG_Test/Wire/SharedImageTest.cpp b/MobileGL/MG_Test/Wire/SharedImageTest.cpp index 3a80053c..6f9ee535 100644 --- a/MobileGL/MG_Test/Wire/SharedImageTest.cpp +++ b/MobileGL/MG_Test/Wire/SharedImageTest.cpp @@ -504,7 +504,7 @@ TEST(SharedImageYuv, ThePlaneCopyFillsEveryDestinationLayout) { // The conversion an import's hints select: BT.709 narrow-range codes of saturated colors decode // to those colors, and the defaults are BT.601 narrow. -TEST(SharedImageYuv, TheConversionDecodesTheHintedColourSpace) { +TEST(SharedImageYuv, TheConversionDecodesTheHintedColorSpace) { const auto decode = [](const SI::Yuv::Conversion& c, double y, double cb, double cr, double max) { const double in[3] = {y / max - c.Offset[0], cb / max - c.Offset[1], cr / max - c.Offset[2]}; std::array rgb{}; @@ -529,9 +529,9 @@ TEST(SharedImageYuv, TheConversionDecodesTheHintedColourSpace) { SI::Yuv::Hints full; full.Range = SI::Yuv::kEglYuvFullRange; const auto cFull = SI::Yuv::ConversionFor(full, 255.0); - const auto grey = decode(cFull, 128, 128, 128, 255.0); + const auto gray = decode(cFull, 128, 128, 128, 255.0); for (int k = 0; k < 3; ++k) - EXPECT_NEAR(grey[k], 128.0 / 255.0, 0.005); + EXPECT_NEAR(gray[k], 128.0 / 255.0, 0.005); EXPECT_EQ(SI::Yuv::Hints{}.EffectiveColorSpace(), SI::Yuv::kEglItuRec601); EXPECT_FALSE(SI::Yuv::Hints{}.FullRange()); } diff --git a/MobileGL/MG_Test/Wire/StreamClientPublicationTest.cpp b/MobileGL/MG_Test/Wire/StreamClientPublicationTest.cpp index 92c958d3..b0185e0b 100644 --- a/MobileGL/MG_Test/Wire/StreamClientPublicationTest.cpp +++ b/MobileGL/MG_Test/Wire/StreamClientPublicationTest.cpp @@ -188,7 +188,7 @@ namespace { EXPECT_FALSE(Upload(32768, 0x99)); EXPECT_TRUE(Client::ClientSession::DeviceLost()); EXPECT_EQ(MG_Impl::GLImpl::GetGraphicsResetStatus(), GL_UNKNOWN_CONTEXT_RESET); - EXPECT_TRUE(client.Encoder().Cancelled()); + EXPECT_TRUE(client.Encoder().Canceled()); EXPECT_EQ(client.Encoder().EmitSeq(), 0u); EXPECT_EQ(client.LastPublishedSeq(), 0u); EXPECT_TRUE(StageIs(0x33)); diff --git a/MobileGL/MG_Test/Wire/c1f_redcheck.py b/MobileGL/MG_Test/Wire/c1f_redcheck.py index 2926db4f..a45205d7 100644 --- a/MobileGL/MG_Test/Wire/c1f_redcheck.py +++ b/MobileGL/MG_Test/Wire/c1f_redcheck.py @@ -47,7 +47,7 @@ def cases(): site = '&MGPipeRouteResourceDestroy);' return [ ('B1-source', FILL, replace(site, '&MGPipeApplyResourceDestroy);'), - ['PipeCatalogue.FrontendNeverTakesAnApplierAddress'], 'PipeCatalogueTest'), + ['PipeCatalog.FrontendNeverTakesAnApplierAddress'], 'PipeCatalogTest'), ('B1-wire', FILL, replace(site, '&MGPipeApplyResourceDestroy);'), [SUITE+'DeleteTexturesAdvancesTheWireOrdinal'], 'RemoteClientTest'), ('N2-five-verbs', EMIT, replace(' RequireClientTablesInstalled(slot);', ''), @@ -126,7 +126,7 @@ def main(): for label, file, mutate, names, target in selected: path = ROOT / file original = path.read_bytes() - binary = ROOT / 'build-split/MobileGL/MG_Test' / ('Pipe' if target == 'PipeCatalogueTest' else 'Wire') / target + binary = ROOT / 'build-split/MobileGL/MG_Test' / ('Pipe' if target == 'PipeCatalogTest' else 'Wire') / target build = ['cmake', '--build', 'build-split', '-j', '24', '--target', target] run = [str(binary), '--gtest_filter='+':'.join(names)] # ID-67: both replacement cases must execute green before/after this mutation. diff --git a/MobileGL/MG_Util/Async/JobNode.cpp b/MobileGL/MG_Util/Async/JobNode.cpp index ee081057..39147e26 100644 --- a/MobileGL/MG_Util/Async/JobNode.cpp +++ b/MobileGL/MG_Util/Async/JobNode.cpp @@ -14,7 +14,7 @@ namespace MobileGL::MG_Util::Async { namespace { Bool IsTerminalState(const JobState state) { - return state == JobState::Complete || state == JobState::Cancelled; + return state == JobState::Complete || state == JobState::Canceled; } // Job BODIES have been contained since stage 1 (JobNode::Run); continuations were @@ -52,12 +52,12 @@ namespace MobileGL::MG_Util::Async { return m_state.load(std::memory_order_acquire) == JobState::Complete; } - Bool JobNode::IsCancelled() const { - return m_state.load(std::memory_order_acquire) == JobState::Cancelled; + Bool JobNode::IsCanceled() const { + return m_state.load(std::memory_order_acquire) == JobState::Canceled; } Bool JobNode::IsCancellationRequested() const { - return m_cancelled.load(std::memory_order_acquire); + return m_canceled.load(std::memory_order_acquire); } JobState JobNode::State() const { @@ -92,8 +92,8 @@ namespace MobileGL::MG_Util::Async { } void JobNode::Run() { - if (m_cancelled.load(std::memory_order_acquire)) { - TryTransition(JobState::Pending, JobState::Cancelled); + if (m_canceled.load(std::memory_order_acquire)) { + TryTransition(JobState::Pending, JobState::Canceled); return; } // Loses to a concurrent Cancel() that already took the node terminal, and to a second @@ -109,12 +109,12 @@ namespace MobileGL::MG_Util::Async { // it and reports the job as Canceled; the joining GL thread then sees a node // that produced no result, which is the same shape as an abandoned node. diagnostics.logLines.push_back({MOBILEGL_LOG_LEVEL_DEBUG, std::format("Job body threw: {}", e.what())}); - TryTransition(JobState::Running, JobState::Cancelled); + TryTransition(JobState::Running, JobState::Canceled); return; } catch (...) { diagnostics.logLines.push_back({MOBILEGL_LOG_LEVEL_DEBUG, String("Job body threw a non-std exception")}); - TryTransition(JobState::Running, JobState::Cancelled); + TryTransition(JobState::Running, JobState::Canceled); return; } @@ -128,7 +128,7 @@ namespace MobileGL::MG_Util::Async { diagnostics.errors.size()); TryTransition(JobState::Running, - m_cancelled.load(std::memory_order_acquire) ? JobState::Cancelled : JobState::Complete); + m_canceled.load(std::memory_order_acquire) ? JobState::Canceled : JobState::Complete); } void JobNode::RunInline() { @@ -146,12 +146,12 @@ namespace MobileGL::MG_Util::Async { } void JobNode::Cancel() { - m_cancelled.store(true, std::memory_order_release); + m_canceled.store(true, std::memory_order_release); // A node that never reached a worker settles right here. Doing this rather than // waiting for a dispatch that may never come is what lets every cancel site // (glShaderSource over a pending compile, glDeleteProgram, teardown) drop the node // without a wait and without stranding a dependent link job behind it. - TryTransition(JobState::Pending, JobState::Cancelled); + TryTransition(JobState::Pending, JobState::Canceled); } void JobNode::OnTerminal(std::function fn) { diff --git a/MobileGL/MG_Util/Async/JobNode.h b/MobileGL/MG_Util/Async/JobNode.h index 827c2be4..c10d6329 100644 --- a/MobileGL/MG_Util/Async/JobNode.h +++ b/MobileGL/MG_Util/Async/JobNode.h @@ -17,10 +17,10 @@ namespace MobileGL::MG_Util::Async { enum class JobState : Uint8 { - Pending, // constructed, not started; may still be sitting in a queue - Running, // a worker is inside RunBody() - Complete, // RunBody() returned normally and the node's outputs are readable - Cancelled, // abandoned before it started, canceled mid-run, or threw + Pending, // constructed, not started; may still be sitting in a queue + Running, // a worker is inside RunBody() + Complete, // RunBody() returned normally and the node's outputs are readable + Canceled, // abandoned before it started, canceled mid-run, or threw }; // A GL error a job body wants to raise. Nothing in the compile/link pipeline produces @@ -83,13 +83,13 @@ namespace MobileGL::MG_Util::Async { // Lock-free and non-blocking - safe from any thread, including a pool thread. Bool IsTerminal() const; - Bool IsComplete() const; // Complete only; this is what backs GL_COMPLETION_STATUS_KHR - Bool IsCancelled() const; // settled AS canceled - the outcome, not the request + Bool IsComplete() const; // Complete only; this is what backs GL_COMPLETION_STATUS_KHR + Bool IsCanceled() const; // settled AS canceled - the outcome, not the request JobState State() const; // The cancellation *request*, which is what a body polls to bail out early: a - // running job stays Running until its body returns, so IsCancelled() is still false - // at that point. Kept separate from IsCancelled() precisely so the two questions + // running job stays Running until its body returns, so IsCanceled() is still false + // at that point. Kept separate from IsCanceled() precisely so the two questions // ("should I stop?" and "did it end up canceled?") cannot be confused. Bool IsCancellationRequested() const; @@ -142,7 +142,7 @@ namespace MobileGL::MG_Util::Async { mutable std::mutex m_mutex; std::condition_variable m_cv; std::atomic m_state{JobState::Pending}; - std::atomic m_cancelled{false}; + std::atomic m_canceled{false}; Vector> m_continuations; }; diff --git a/MobileGL/MG_Util/SelfTest/PrimitivesGeneratedNoXfbProbe.cpp b/MobileGL/MG_Util/SelfTest/PrimitivesGeneratedNoXfbProbe.cpp index 846a8b93..a9e891de 100644 --- a/MobileGL/MG_Util/SelfTest/PrimitivesGeneratedNoXfbProbe.cpp +++ b/MobileGL/MG_Util/SelfTest/PrimitivesGeneratedNoXfbProbe.cpp @@ -458,7 +458,7 @@ namespace MobileGL::MG_Util::SelfTest { // armed on a device whose stream query was RIGHT on a shape the statistics get // wrong - and the renderer reroutes every XFB-inactive draw, so that shape would // be downgraded from correct to wrong. "Never worse per draw" is what makes - // arming on an uncharacterised driver defensible; it has to be measured, not + // arming on an uncharacterized driver defensible; it has to be measured, not // assumed. Bool statisticsDominateStream = true; for (const auto* shape : shapes) { diff --git a/MobileGL/MG_Util/ShaderTranspiler/SpirvPasses/FlattenXfbInterfaceBlocksPass.h b/MobileGL/MG_Util/ShaderTranspiler/SpirvPasses/FlattenXfbInterfaceBlocksPass.h index 58b81ae9..6248a0dc 100644 --- a/MobileGL/MG_Util/ShaderTranspiler/SpirvPasses/FlattenXfbInterfaceBlocksPass.h +++ b/MobileGL/MG_Util/ShaderTranspiler/SpirvPasses/FlattenXfbInterfaceBlocksPass.h @@ -28,7 +28,7 @@ namespace MobileGL { // glTransformFeedbackVaryings, links, and reports the names straight back from // glGetTransformFeedbackVarying - and then captures NONE of them: the recorded // stream holds gl_Position in slot 0 and leaves the rest of every vertex's record - // untouched. Proven on an Adreno 830 by writing a recognisable gl_Position into + // untouched. Proven on an Adreno 830 by writing a recognizable gl_Position into // the KHR-GL43.vertex_attrib_binding.basic-input capture program: the value landed // in the slot that had asked for StageData.attrib[0]. The same program with the // block flattened into a plain output array captures every member correctly, which diff --git a/MobileGL/MG_Util/ShaderTranspiler/SpirvPasses/LowerViewportIndexPass.cpp b/MobileGL/MG_Util/ShaderTranspiler/SpirvPasses/LowerViewportIndexPass.cpp index 36ff88bd..60b5a91e 100644 --- a/MobileGL/MG_Util/ShaderTranspiler/SpirvPasses/LowerViewportIndexPass.cpp +++ b/MobileGL/MG_Util/ShaderTranspiler/SpirvPasses/LowerViewportIndexPass.cpp @@ -29,7 +29,7 @@ namespace MobileGL { // The name the decompiled ESSL ends up declaring. Same mg_ prefix as the // draw-parameter lowering, so a global that came from a demoted builtin is - // recognisable in a driver log. + // recognizable in a driver log. constexpr const char* kLoweredName = "mg_ViewportIndex"; // The one decoration this pass lowers. OpDecorate only, never OpMemberDecorate: diff --git a/docs/Disaggregated/ARCHITECTURE.md b/docs/Disaggregated/ARCHITECTURE.md index de91545b..0cf1167b 100644 --- a/docs/Disaggregated/ARCHITECTURE.md +++ b/docs/Disaggregated/ARCHITECTURE.md @@ -24,7 +24,7 @@ The backend already maintains a state machine that tracks GLES / Vulkan; all tha | § | Content | File | |---|---|---| | 1–2 | Boundary: two tables, three topologies; object model: handles, two generations, CSO | [`design/01-boundary-and-objects.md`](design/01-boundary-and-objects.md) | -| 3–4 | Call catalog, generators G1–G8, capability bits; record and payload format | [`design/02-catalogue-and-records.md`](design/02-catalogue-and-records.md) | +| 3–4 | Call catalog, generators G1–G8, capability bits; record and payload format | [`design/02-catalog-and-records.md`](design/02-catalog-and-records.md) | | 5–7 | Frontend tracker (when to push, what to push, how to deduplicate); texture upload; shaders | [`design/03-frontend.md`](design/03-frontend.md) | | 8 | Reverse channel: seven callbacks, ordering, errors and ack, texture re-mint (server-local, no pull), XFB | [`design/04-reverse-channel.md`](design/04-reverse-channel.md) | | 9–10 | Backend rework (`PipeInputs`, memo re-key, A/B arms); server-side applier | [`design/05-backend-and-server.md`](design/05-backend-and-server.md) | diff --git a/docs/Disaggregated/design/02-catalogue-and-records.md b/docs/Disaggregated/design/02-catalog-and-records.md similarity index 98% rename from docs/Disaggregated/design/02-catalogue-and-records.md rename to docs/Disaggregated/design/02-catalog-and-records.md index ecd94a89..db042c72 100644 --- a/docs/Disaggregated/design/02-catalogue-and-records.md +++ b/docs/Disaggregated/design/02-catalog-and-records.md @@ -6,7 +6,7 @@ ### 3.1 Single source of truth -`MobileGL/MG_Pipe/PipeCalls.def`: one `X(Name, Payload, Class, Flags, WaitClass)` per line. **The on-wire opcode is the line order**; you can only append, and retired lines keep their slot; the line count is pinned by `MGP_CALL_LIST_DOCUMENTED_COUNT` (81 today) and `PipeCatalogueTest`. Generator outputs are committed to the tree; CI `pipe-gates` regenerates them and runs `git diff --exit-code`: +`MobileGL/MG_Pipe/PipeCalls.def`: one `X(Name, Payload, Class, Flags, WaitClass)` per line. **The on-wire opcode is the line order**; you can only append, and retired lines keep their slot; the line count is pinned by `MGP_CALL_LIST_DOCUMENTED_COUNT` (81 today) and `PipeCatalogTest`. Generator outputs are committed to the tree; CI `pipe-gates` regenerates them and runs `git diff --exit-code`: | | Output | Content | |---|---|---| diff --git a/docs/Disaggregated/design/11-state-ownership.md b/docs/Disaggregated/design/11-state-ownership.md index 37099d0e..44748fd2 100644 --- a/docs/Disaggregated/design/11-state-ownership.md +++ b/docs/Disaggregated/design/11-state-ownership.md @@ -61,7 +61,7 @@ Items 1 and 2 above are P14a's target shape; S1 landed only the layer "identity **S1's token has a writer but no readers**: no apply branch on the server reads `CurrentContextToken()` today (provable by `grep`: nothing outside `ServerSession`'s own accessor calls it), so the whole rendering path behaves character for character as before S1—this layer records ownership first; reading it to act is S4's job (native context) and P14b/c's. A session without `bind_context` behaves identically too: the `ServerLoopTest` MakeCurrent/epoch/liveness cases (`MG_Test/Wire/ServerLoopTest.cpp:1780-1941`) all still pass, and they go through exactly this path. -**S1's acceptance evidence** (the tests of this commit): `PipeCatalogue.LateArrivalsAreAppendedWithoutRenumbering` pins opcode 84 and `kNone`/`kScreen`/`kWaitNone`; `SurfaceControlFrameTest.TheContextLifecycleFramedOpsAreCreateContextAndDestroyContext` pins the values 12/13 and the `shareGroupToken`/`contextFlags` round trip; `SessionHandshakeTest.ARevisionFivePeerIsRefusedByNameAtRevisionSix` pins the revision bump; `FuzzArm2/PeerLatchSite/.../BindContextUnknownToken` is the data-plane end-to-end control—on a real `--serve` supervisor, a forged `bind_context` that points at a token this session never created makes the session latch by name (`exit=75`), and the next session of the same supervisor renders normally. +**S1's acceptance evidence** (the tests of this commit): `PipeCatalog.LateArrivalsAreAppendedWithoutRenumbering` pins opcode 84 and `kNone`/`kScreen`/`kWaitNone`; `SurfaceControlFrameTest.TheContextLifecycleFramedOpsAreCreateContextAndDestroyContext` pins the values 12/13 and the `shareGroupToken`/`contextFlags` round trip; `SessionHandshakeTest.ARevisionFivePeerIsRefusedByNameAtRevisionSix` pins the revision bump; `FuzzArm2/PeerLatchSite/.../BindContextUnknownToken` is the data-plane end-to-end control—on a real `--serve` supervisor, a forged `bind_context` that points at a token this session never created makes the session latch by name (`exit=75`), and the next session of the same supervisor renders normally. ## Frontend (MG_State / MG_Impl) diff --git a/docs/ci/ci-cleanup-log.md b/docs/ci/ci-cleanup-log.md index 06cfb6ca..71d86aff 100644 --- a/docs/ci/ci-cleanup-log.md +++ b/docs/ci/ci-cleanup-log.md @@ -12,7 +12,7 @@ them wrong. | Date | Check | Workflow / job | Reason | Successor | |---|---|---|---|---| | 2026-10-06 | unit `BufferTest.{ANonPersistentWriteMapOfAShadowBackedStoreStillFlushesThroughTheBackend, RespecifyingAShadowBackedStoreWhileItIsMappedPushesNoRangeDown}` | Test / unit | P13 W6: they pinned the monolith frontend arm (`ScopedMonolithFrontendArm`) to assert how a shadow-backed map reaches the backend's own flush op - the arm is deleted; the record arm pushes the mapped span itself | `SplitBufferTest` (persistent-map push, live-host-writes), `PersistentCoherentMapScenario` and the buffer integration lanes on monolith's record arm | -| 2026-10-06 | unit `TextureTest.{ShadowReadbackRefusesALayoutItCannotProduceInsteadOfOverrunningTheBuffer, ShadowReadbackRefusesAPackStateItCannotHonour}` | Test / unit | P13 W6: they pinned the frontend arm's CPU-shadow readback, whose pack-state limits they asserted; that path is deleted - the record arm reads the backend's image under a neutral pack and scatters every pack state itself | `PixelStoreSweepScenario`, `PackBufferReadbackScenario` (every pack state, both backends, every arm) | +| 2026-10-06 | unit `TextureTest.{ShadowReadbackRefusesALayoutItCannotProduceInsteadOfOverrunningTheBuffer, ShadowReadbackRefusesAPackStateItCannotHonor}` | Test / unit | P13 W6: they pinned the frontend arm's CPU-shadow readback, whose pack-state limits they asserted; that path is deleted - the record arm reads the backend's image under a neutral pack and scatters every pack state itself | `PixelStoreSweepScenario`, `PackBufferReadbackScenario` (every pack state, both backends, every arm) | | 2026-10-06 | unit `TextureTest.GetTexImageOfOneCubeFacePacksIntoAOneFacePixelPackBuffer`, `TextureViewTest.CubeMapViewOfAnArrayReadsTheFaceEachTokenNames` | Test / unit | P13 W6: GL rules, but asserted through the deleted frontend arm's shadow readback; a unit process has no backend image to read | moved, not dropped: `CubeFaceReadbackScenario` (integration-gpu on both backends plus the split arms) asserts the same two rules on a real context | | 2026-10-06 | `DirectVulkan.HandleRecycle.AbaControlHandles.*` | Test / integration-gpu (`integration-monolith-control`) | P13 W6: it pinned `MOBILEGL_PIPE_DATA_ARM=frontend` - its knob defeats the identity half of Magma's frontend-arm keys, which the deleted arm owned; the record arm keys every object on the applier's {slot, gen} | `DirectVulkan.HandleRecycle.Handles.*` (the same cases on the record arm) | | 2026-10-06 | `build explicit pull runtime control` (the pull `libMobileGL.so`, `-DMOBILEGL_PIPE_PUSH=OFF`) | Test / `build-linux-monolith-control` | P13 W2 retires the pull build: CMake defaults to push and nothing ships pull (ID-P13-1) | the same job builds the push monolith without MG_Remote (the FCL shape); its `runtime_mode_proof --mode monolith` is the zero-MG_Remote-symbol check | @@ -132,7 +132,7 @@ them wrong. | 2026-10-06 | `Direct{GLES,Vulkan}.PoisonOmitted.PoisonOmissionScenario.OmittedFieldAbortsOnThatVerb` (verify tree, local; P13 W5 S7) | monolith now runs the record arm, which resolves GenerateMipmap's texture from the verb's handle and never reads the omitted `GetActiveTextureUnit` - the control could not go red | the monolith lanes omit `ReadPixels:GetPixelStoreParameters` (the pair the split lane already uses), which the record arm still reads; verified red-for-its-reason on both backends. Same change in test.yml's `integration-verify` "Negative control B (omitted fill point)" step, which went green with the old pair on Test 37515697754 | | 2026-10-06 | `integration-verify`, 184 aborts `Fatal{PipeVerifyDiffer, "GetPixelStoreParameters@ReadPixels"}` (verify tree, local; P13 W5 S7) | the verify read hook took the live context as the pack oracle inside the monolith verb port's neutral-pack readback window (it already used the applied pack for server-stamped verbs) | `MG_Record::MonolithPortApplyingForVerify()`; the hook uses the applied pack payload in that window too | | 2026-10-06 | `ResourceEmit.TheLiveHostWritesWireFiresOnTheCallAPersistentMapProducerWouldSetItOn` (verify unit, local; P13 W5 S7) | the always-false `HasLiveHostWrites` pin is lifted wherever the record arm is built (it gives the bit a producer), and every library builds it now | the case skips under `MOBILEGL_BUILD_RECORD_ARM` with the existing reason; `PinLiveHostWritesNamesABuffer` remains the successor | -| 2026-10-06 | every `ctest` invocation in integration / verify / split jobs exited 8 after the tests passed (`integration-verify`, `integration-split*`, `integration (inproc)`, `spawn_lane_parity.py`) | `PipeCatalogueSourceRoot.cmake` (a CTest include file) used `if(... IN_LIST ...)`; CTest scripts run without policy CMP0057 on the pinned CMake 3.31.10, so the include errored | use `list(FIND)` instead (`MobileGL/MG_Test/Pipe/CMakeLists.txt`) | +| 2026-10-06 | every `ctest` invocation in integration / verify / split jobs exited 8 after the tests passed (`integration-verify`, `integration-split*`, `integration (inproc)`, `spawn_lane_parity.py`) | `PipeCatalogSourceRoot.cmake` (a CTest include file) used `if(... IN_LIST ...)`; CTest scripts run without policy CMP0057 on the pinned CMake 3.31.10, so the include errored | use `list(FIND)` instead (`MobileGL/MG_Test/Pipe/CMakeLists.txt`) | | 2026-10-06 | `TcpServer.Start.P8aUnlocatedIoBlocks` failed in 0.07 s on `integration (monolith)` | the loopback TCP endpoints (40613, knob lanes 41613-41617) sat inside Linux's ephemeral port range; with thousands of loopback client connections in the lane, an outgoing socket can own the port the supervisor binds | default endpoint moved to 30613 (knob lanes 31613-31617), below 32768 | | 2026-10-06 | spawn lanes on hosted runners: `no Welcome within 5000 ms` | a cold `eglInitialize` on the hosted software stack took ~7 s, longer than the spawn handshake's Welcome wait | the Welcome wait takes `max(5000, MOBILEGL_IPC_COLD_START_MS)` (`ClientSession.cpp ColdHandshakeBudgetMs`); the initial-caps wait stays 5000 ms, which `InitialCapsStartup` pins | | 2026-10-06 | `FencePollScenario` on `integration-verify-split` | the test took its `before` counter snapshot after `glFenceSync`, racing the apply thread that answers the fence | snapshot taken before the work and the fence are queued (test bug, not a product bug) | diff --git a/scripts/check_include_closure.py b/scripts/check_include_closure.py index e68818e5..1d32c8ab 100644 --- a/scripts/check_include_closure.py +++ b/scripts/check_include_closure.py @@ -506,9 +506,9 @@ def self_test_parser(): depths = [e[0] for e in entries] if depths != [1, 2, 3]: problems.append("depths misparsed: {}".format(depths)) - normalised = entries[-1][1] if entries else None - if normalised != "MobileGL/MG_State/GLState/SamplerState/SamplerObject.h": - problems.append("`../` spelling did not normalize: {}".format(normalised)) + normalized = entries[-1][1] if entries else None + if normalized != "MobileGL/MG_State/GLState/SamplerState/SamplerObject.h": + problems.append("`../` spelling did not normalize: {}".format(normalized)) elif not find_violations(entries, PROBES[0]["Forbidden"], []): problems.append("normalized path did not match the value-header forbidden list") if problems: diff --git a/scripts/ci/build_fingerprint.py b/scripts/ci/build_fingerprint.py index 2e6298e9..d19817a5 100644 --- a/scripts/ci/build_fingerprint.py +++ b/scripts/ci/build_fingerprint.py @@ -83,7 +83,7 @@ PACKAGES = ('clang-20', 'lld-20', 'libc++-20-dev', 'libc++abi-20-dev', 'libvulka 'libegl1-mesa-dev', 'libgles2-mesa-dev') -def normaliser(build_dir, deps_dir=None): +def normalizer(build_dir, deps_dir=None): roots = [(str(Path(build_dir)), '@BUILD@'), (str(Path(build_dir).resolve()), '@BUILD@')] if deps_dir: roots += [(str(Path(deps_dir)), '@DEPS@'), (str(Path(deps_dir).resolve()), '@DEPS@')] @@ -244,7 +244,7 @@ def read_image(): def fingerprint(build_dir, deps_dir=None): build = Path(build_dir) - norm = normaliser(build, deps_dir) + norm = normalizer(build, deps_dir) result = { 'cache': read_cache(build, norm), 'compile': read_compile(build, norm), diff --git a/scripts/ci/fatal_census_baseline.json b/scripts/ci/fatal_census_baseline.json index ed9bf8d9..0caeb297 100644 --- a/scripts/ci/fatal_census_baseline.json +++ b/scripts/ci/fatal_census_baseline.json @@ -32,7 +32,7 @@ "ApplyThreadJoinTimeout", "ApplyThreadNotRunning", "ArchiveEmpty", - "ArtefactsMissing", + "ArtifactsMissing", "BackendDeviceLost", "BarrierTimeout", "BarrierViolation", diff --git a/scripts/ci/spawn_lane_parity.py b/scripts/ci/spawn_lane_parity.py index 43de49dc..6ed2db91 100644 --- a/scripts/ci/spawn_lane_parity.py +++ b/scripts/ci/spawn_lane_parity.py @@ -29,7 +29,7 @@ P7 PACKAGE L ADDS THE SAME QUESTION FOR MAGMA, IN TWO TIERS, AND THE NORMALIZATI DIFFERENT ON PURPOSE. The Espryt half above strips the sub-lane tails `F1.` and `Ct.` because they name neither the case nor the arm. The Magma half must NOT: `RunAhead.Credit1.` and `RunAhead.Credit3.` are two entries of the same case, differing in the credit the lane pins, and -a normaliser that dropped the tail would fold them together and then report an equal-sized set +a normalizer that dropped the tail would fold them together and then report an equal-sized set that had silently lost one. So there the arm - and only the arm, the SECOND dotted segment - is what comes off. """ @@ -95,7 +95,7 @@ MAGMA_INPROC_ONLY = ("MagmaRunAheadScenario.", "MagmaWireCacheScenario.", "Descr # MEASURED (a temporary fatal in each of the three readers): all five knob=1 entries died on # split and on spawn and ALL FIVE PASSED on tcp. # -# These are TAILS, not scenarios - the normaliser above keeps the sub-lane tail for the Magma +# These are TAILS, not scenarios - the normalizer above keeps the sub-lane tail for the Magma # tier on purpose, so `.MsResolve1.` names the knob entry and `.MsResolve0.` (the default, which # does keep its tcp entry) is untouched. # @@ -233,7 +233,7 @@ def compare_arms(build_dir, tier, labels, inproc_only=(), no_tcp=(), only_on=Non names = lane_names(build_dir, label) - FIXTURE_ENTRIES sets[arm] = arm_keys(names) print(f"{tier}: {label} has {len(names)} case entrie(s), " - f"{len(sets[arm])} after normalisation") + f"{len(sets[arm])} after normalization") if len(names) != len(sets[arm]): print(f"::error::{label}: {len(names) - len(sets[arm])} entry name(s) do not parse " f"as .., so this comparison silently drops them: " diff --git a/scripts/ci/unmigrated_emulation_sites.py b/scripts/ci/unmigrated_emulation_sites.py index bcde44b0..034fe558 100755 --- a/scripts/ci/unmigrated_emulation_sites.py +++ b/scripts/ci/unmigrated_emulation_sites.py @@ -7,11 +7,11 @@ # SPDX-License-Identifier: LGPL-3.0-only # End of Source File Header -"""P8-SE: PipeCatalogueTest's unmigrated-emulation list IS the set of call sites in the tree. +"""P8-SE: PipeCatalogTest's unmigrated-emulation list IS the set of call sites in the tree. THE QUESTION. `MGPipeUnmigratedEmulation("")` (MG_Pipe/PipeApply.h) names one emulation that reaches into client memory; a split server aborts on it, a monolith arm runs past it. The -test `PipeCatalogue.EveryUnmigratedEmulationIsNamedOnce` (MG_Test/Pipe/PipeCatalogueTest.cpp) +test `PipeCatalog.EveryUnmigratedEmulationIsNamedOnce` (MG_Test/Pipe/PipeCatalogTest.cpp) pins the LIST of names, and nothing compared that list with the tree: it drifted twice without a red (P8-B found a name the list never had; P8-SE a name whose only call site no transport could reach). This asserts, every one an error: @@ -34,7 +34,7 @@ import re import sys import tempfile -LIST_FILE = Path("MobileGL/MG_Test/Pipe/PipeCatalogueTest.cpp") +LIST_FILE = Path("MobileGL/MG_Test/Pipe/PipeCatalogTest.cpp") TEST_NAME = "EveryUnmigratedEmulationIsNamedOnce" SOURCE_ROOT = Path("MobileGL") EXCLUDED = (Path("MobileGL/MG_Test"), Path("MobileGL/MG_IntegrationTest")) @@ -161,7 +161,7 @@ def run(root): def self_test(): """Each rule reds on a synthetic tree and a matching tree is green.""" listing = """ -TEST(PipeCatalogue, EveryUnmigratedEmulationIsNamedOnce) { +TEST(PipeCatalog, EveryUnmigratedEmulationIsNamedOnce) { // "commented-out-name" is not in the list const char* const kNames[] = { %s diff --git a/scripts/data/skip_census_baseline.json b/scripts/data/skip_census_baseline.json index e8206326..fa8f6090 100644 --- a/scripts/data/skip_census_baseline.json +++ b/scripts/data/skip_census_baseline.json @@ -25,7 +25,7 @@ "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", "DirectGLES.GenerateMipmapServerScenario.Rgb16fDrawnBaseWithARefusedReadbackDeclinesByName", "DirectGLES.GenerateMipmapServerScenario.Rgb16fUploadedBaseWithARefusedReadbackIsFilteredFromTheStore", - "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.ImageBindableRemintScenario.GpuClearSurvivesTheFirstImageBindingOfAView", "DirectGLES.ImageLoadStoreSsoScenario.AnImageArrayAlongsideAnotherDescriptorKeepsBothBindings", "DirectGLES.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", @@ -151,7 +151,7 @@ "DirectVulkan.TextureUploadShapeScenario.TheEmittedUploadShapeIsRecordedAndTheTwoSidesAgree", "DirectVulkan.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", "DirectVulkan.UnlocatedIoBlockScenario.TheEmulationIsActuallyArmedWhenTheEnvironmentPinsItOn", "DirectVulkan.ViewportArrayScenario.WithoutTheEmulationEveryIndexCollapsesOntoViewportZero", @@ -181,14 +181,14 @@ "DirectGLES.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.AsyncOn.AsyncCompileScenario.IrisShapedTwoPhaseBatchRendersCorrectly", "DirectGLES.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -216,11 +216,11 @@ "DirectGLES.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -270,7 +270,7 @@ "DirectGLES.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -374,7 +374,7 @@ "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -411,7 +411,7 @@ "DirectGLES.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -503,9 +503,9 @@ "DirectGLES.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -540,8 +540,8 @@ "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -664,7 +664,7 @@ "DirectGLES.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -682,7 +682,7 @@ "DirectGLES.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.PrimitivesGeneratedNoXfbScenario.APausedSpanCountsACpuPricedDrawExactlyOnce", @@ -722,8 +722,8 @@ "DirectGLES.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectGLES.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectGLES.SpirvShaderBinaryScenario.AnUnsupportedBinaryFormatIsRejectedInsteadOfSilentlyAccepted", @@ -797,7 +797,7 @@ "DirectGLES.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -919,14 +919,14 @@ "DirectVulkan.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectVulkan.AsyncOn.AsyncCompileScenario.IrisShapedTwoPhaseBatchRendersCorrectly", "DirectVulkan.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectVulkan.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectVulkan.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectVulkan.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectVulkan.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectVulkan.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectVulkan.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectVulkan.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectVulkan.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectVulkan.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectVulkan.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectVulkan.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectVulkan.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectVulkan.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -954,11 +954,11 @@ "DirectVulkan.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectVulkan.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectVulkan.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectVulkan.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectVulkan.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectVulkan.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectVulkan.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectVulkan.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectVulkan.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectVulkan.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectVulkan.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectVulkan.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectVulkan.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -1007,7 +1007,7 @@ "DirectVulkan.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectVulkan.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectVulkan.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectVulkan.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectVulkan.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -1124,7 +1124,7 @@ "DirectVulkan.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectVulkan.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectVulkan.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectVulkan.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectVulkan.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectVulkan.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectVulkan.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectVulkan.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -1216,9 +1216,9 @@ "DirectVulkan.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectVulkan.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectVulkan.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectVulkan.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectVulkan.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectVulkan.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectVulkan.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectVulkan.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectVulkan.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectVulkan.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectVulkan.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectVulkan.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -1253,8 +1253,8 @@ "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectVulkan.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectVulkan.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectVulkan.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectVulkan.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectVulkan.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -1376,7 +1376,7 @@ "DirectVulkan.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectVulkan.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectVulkan.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectVulkan.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectVulkan.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectVulkan.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectVulkan.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectVulkan.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -1402,7 +1402,7 @@ "DirectVulkan.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectVulkan.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectVulkan.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectVulkan.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectVulkan.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectVulkan.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectVulkan.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectVulkan.PrimitivesGeneratedNoXfbScenario.APausedSpanCountsACpuPricedDrawExactlyOnce", @@ -1442,8 +1442,8 @@ "DirectVulkan.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectVulkan.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectVulkan.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectVulkan.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectVulkan.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectVulkan.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectVulkan.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectVulkan.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectVulkan.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectVulkan.SpirvShaderBinaryScenario.AnUnsupportedBinaryFormatIsRejectedInsteadOfSilentlyAccepted", @@ -1524,7 +1524,7 @@ "DirectVulkan.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectVulkan.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectVulkan.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectVulkan.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -1637,7 +1637,7 @@ "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", "DirectGLES.GenerateMipmapServerScenario.Rgb16fDrawnBaseWithARefusedReadbackDeclinesByName", "DirectGLES.GenerateMipmapServerScenario.Rgb16fUploadedBaseWithARefusedReadbackIsFilteredFromTheStore", - "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.HandleRecycleScenario.ABufferAtARecycledAddressDoesNotInheritItsPredecessorsContents", "DirectGLES.HandleRecycleScenario.AFramebufferAtARecycledAddressDoesNotInheritItsPredecessorsTwin", "DirectGLES.HandleRecycleScenario.AProgramAtARecycledAddressDoesNotInheritItsPredecessorsShaderCso", @@ -1721,7 +1721,7 @@ "DirectGLES.Spawn.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Spawn.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -1739,7 +1739,7 @@ "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -1760,7 +1760,7 @@ "DirectGLES.Tcp.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Tcp.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -1892,7 +1892,7 @@ "DirectVulkan.TextureUploadShapeScenario.TheEmittedUploadShapeIsRecordedAndTheTwoSidesAgree", "DirectVulkan.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", "DirectVulkan.UnlocatedIoBlockScenario.TheEmulationIsActuallyArmedWhenTheEnvironmentPinsItOn", "DirectVulkan.ViewportArrayScenario.WithoutTheEmulationEveryIndexCollapsesOntoViewportZero", @@ -1934,14 +1934,14 @@ "names": [ "DirectGLES.AdvertisedLimitsScenario.EveryBufferLimitIsWithinItsAdvertisedRange", "DirectGLES.AdvertisedLimitsScenario.IndexedBufferBindingsAreReportedVerbatimOnBothWidths", - "DirectGLES.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -1986,7 +1986,7 @@ "DirectGLES.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -2025,7 +2025,7 @@ "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -2079,7 +2079,7 @@ "DirectGLES.PackedWordReadbackScenario.ACopyThroughARenderbufferReachesAnRgb9E5Destination", "DirectGLES.PackedWordReadbackScenario.AnUploadedPackedWordReadsBackVerbatim", "DirectGLES.PartialUploadOverGpuContentScenario.SubImageAfterAQueuedClearLandsOnTheClearForAReadback", - "DirectGLES.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.ResidentIndexScenario.EboAlsoBoundAsVertexBufferLater", "DirectGLES.SsboArrayDynamicIndexScenario.ReadsAndWritesTheBlockTheIndexNames", "DirectGLES.SsboArrayLengthScenario.AReadonlyWriteonlyArrayStillReportsItsLength", @@ -2114,14 +2114,14 @@ "DirectGLES.XfbRepeatedCaptureScenario.ASpanThatNeverDrawsLeavesTheCaptureBufferAlone", "DirectVulkan.AdvertisedLimitsScenario.EveryBufferLimitIsWithinItsAdvertisedRange", "DirectVulkan.AdvertisedLimitsScenario.IndexedBufferBindingsAreReportedVerbatimOnBothWidths", - "DirectVulkan.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectVulkan.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectVulkan.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectVulkan.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectVulkan.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectVulkan.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectVulkan.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectVulkan.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectVulkan.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectVulkan.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectVulkan.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectVulkan.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectVulkan.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -2165,7 +2165,7 @@ "DirectVulkan.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectVulkan.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectVulkan.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectVulkan.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectVulkan.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -2234,7 +2234,7 @@ "DirectVulkan.PackedWordReadbackScenario.ACopyThroughARenderbufferReachesAnRgb9E5Destination", "DirectVulkan.PackedWordReadbackScenario.AnUploadedPackedWordReadsBackVerbatim", "DirectVulkan.PartialUploadOverGpuContentScenario.SubImageAfterAQueuedClearLandsOnTheClearForAReadback", - "DirectVulkan.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectVulkan.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectVulkan.ResidentIndexScenario.EboAlsoBoundAsVertexBufferLater", "DirectVulkan.SplitRecording.OversizedRecordingSplitScenario.EveryDrawOfTheFrameLandsAcrossCommandBufferSplits", "DirectVulkan.SsboArrayDynamicIndexScenario.ReadsAndWritesTheBlockTheIndexNames", @@ -2412,7 +2412,7 @@ "DirectGLES.GenerateMipmapServerScenario.Rgb16fRenderTargetBaseGeneratesFromTheGpuWrittenLevel", "DirectGLES.GenerateMipmapServerScenario.Rgb16fUploadedBaseWithARefusedReadbackIsFilteredFromTheStore", "DirectGLES.GenerateMipmapServerScenario.Rgb32fRenderTargetBaseGeneratesFromTheGpuWrittenLevel", - "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.GpuWrittenDrawInputScenario.ABaseVertexAComputeShaderWroteReachesGlBaseVertex", "DirectGLES.GpuWrittenDrawInputScenario.ACountAComputeShaderWroteDrivesMultiDrawArraysIndirectCount", "DirectGLES.GpuWrittenDrawInputScenario.ACountAComputeShaderWroteDrivesMultiDrawElementsIndirectCount", @@ -2502,7 +2502,7 @@ "DirectGLES.Spawn.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Spawn.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -2520,7 +2520,7 @@ "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -2542,7 +2542,7 @@ "DirectGLES.Tcp.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Tcp.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -2751,7 +2751,7 @@ "DirectVulkan.TextureUploadShapeScenario.TheEmittedUploadShapeIsRecordedAndTheTwoSidesAgree", "DirectVulkan.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", "DirectVulkan.UnlocatedIoBlockScenario.TheEmulationIsActuallyArmedWhenTheEnvironmentPinsItOn", "DirectVulkan.ViewportArrayScenario.WithoutTheEmulationEveryIndexCollapsesOntoViewportZero", @@ -2783,14 +2783,14 @@ "DirectGLES.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.AsyncOn.AsyncCompileScenario.IrisShapedTwoPhaseBatchRendersCorrectly", "DirectGLES.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -2818,11 +2818,11 @@ "DirectGLES.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -2875,7 +2875,7 @@ "DirectGLES.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -2979,7 +2979,7 @@ "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -3016,7 +3016,7 @@ "DirectGLES.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -3144,9 +3144,9 @@ "DirectGLES.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -3182,8 +3182,8 @@ "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -3318,7 +3318,7 @@ "DirectGLES.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -3339,7 +3339,7 @@ "DirectGLES.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.PrimitivesGeneratedNoXfbScenario.APausedSpanCountsACpuPricedDrawExactlyOnce", @@ -3395,8 +3395,8 @@ "DirectGLES.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectGLES.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectGLES.Spawn.AdoptT0Disallowed.LargeArenaAdoptionScenario.ASessionThatCannotRunT0FallsBackToT2OnceByName", @@ -3418,14 +3418,14 @@ "DirectGLES.Spawn.AsyncOn.AsyncCompileScenario.CompletionStatusPollingThenForcedJoin", "DirectGLES.Spawn.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.Spawn.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.Spawn.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Spawn.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Spawn.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Spawn.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Spawn.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Spawn.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Spawn.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Spawn.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Spawn.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Spawn.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Spawn.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Spawn.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Spawn.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -3454,11 +3454,11 @@ "DirectGLES.Spawn.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Spawn.ColdStart.ClearThenReadPixelsScenario.ClearWithNoDrawIsVisibleToDefaultFramebufferReadPixels", "DirectGLES.Spawn.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.Spawn.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.Spawn.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.Spawn.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.Spawn.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.Spawn.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.Spawn.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.Spawn.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.Spawn.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.Spawn.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.Spawn.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -3588,7 +3588,7 @@ "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -3623,7 +3623,7 @@ "DirectGLES.Spawn.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.Spawn.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.Spawn.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Spawn.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Spawn.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Spawn.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -3714,9 +3714,9 @@ "DirectGLES.Spawn.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.Spawn.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.Spawn.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.Spawn.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.Spawn.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.Spawn.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.Spawn.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.Spawn.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.Spawn.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.Spawn.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.Spawn.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.Spawn.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -3750,8 +3750,8 @@ "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.Spawn.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.Spawn.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -3850,7 +3850,7 @@ "DirectGLES.Spawn.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.Spawn.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.Spawn.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.Spawn.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Spawn.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Spawn.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.Spawn.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.Spawn.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -3866,7 +3866,7 @@ "DirectGLES.Spawn.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.Spawn.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.Spawn.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.Spawn.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.Spawn.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.Spawn.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.Spawn.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.Spawn.ProgramPipelineScenario.ASamplerUnitRewrittenBetweenDrawsKeepsPaintingTheRightTexture", @@ -3901,8 +3901,8 @@ "DirectGLES.Spawn.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.Spawn.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.Spawn.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.Spawn.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.Spawn.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.Spawn.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.Spawn.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.Spawn.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectGLES.Spawn.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectGLES.Spawn.SpirvShaderBinaryScenario.SpecializedModulesLinkAndRenderWithTheirConstantsApplied", @@ -3975,7 +3975,7 @@ "DirectGLES.Spawn.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.Spawn.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.Spawn.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.Spawn.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.Spawn.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.Spawn.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.Spawn.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.Spawn.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -4081,14 +4081,14 @@ "DirectGLES.Split.AsyncOn.AsyncCompileScenario.CompletionStatusPollingThenForcedJoin", "DirectGLES.Split.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.Split.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.Split.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Split.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Split.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Split.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Split.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Split.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Split.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Split.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Split.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Split.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Split.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Split.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Split.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -4116,11 +4116,11 @@ "DirectGLES.Split.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.Split.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.Split.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.Split.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.Split.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.Split.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -4250,7 +4250,7 @@ "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -4285,7 +4285,7 @@ "DirectGLES.Split.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.Split.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.Split.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Split.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Split.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -4376,9 +4376,9 @@ "DirectGLES.Split.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.Split.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.Split.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.Split.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.Split.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.Split.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.Split.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.Split.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.Split.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.Split.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.Split.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.Split.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -4412,8 +4412,8 @@ "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.Split.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.Split.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -4578,7 +4578,7 @@ "DirectGLES.Split.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.Split.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.Split.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.Split.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.Split.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -4594,7 +4594,7 @@ "DirectGLES.Split.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.Split.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.Split.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.Split.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.Split.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.Split.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.Split.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.Split.ProgramPipelineScenario.ASamplerUnitRewrittenBetweenDrawsKeepsPaintingTheRightTexture", @@ -4629,8 +4629,8 @@ "DirectGLES.Split.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.Split.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.Split.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.ABlitIntoTheDefaultFramebufferSurvivesAnEarlierClear", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.ADrawIntoTheDefaultFramebufferSurvivesAnEarlierClear", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.AMultisampleResolveBlitIntoTheDefaultFramebufferKeepsItsOrientation", @@ -4716,7 +4716,7 @@ "DirectGLES.Split.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.Split.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.Split.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.Split.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.Split.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.Split.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.Split.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.Split.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -4839,14 +4839,14 @@ "DirectGLES.Tcp.AsyncOn.AsyncCompileScenario.CompletionStatusPollingThenForcedJoin", "DirectGLES.Tcp.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.Tcp.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.Tcp.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Tcp.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Tcp.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Tcp.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Tcp.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Tcp.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Tcp.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Tcp.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Tcp.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Tcp.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Tcp.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Tcp.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Tcp.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -4874,11 +4874,11 @@ "DirectGLES.Tcp.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.Tcp.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Tcp.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.Tcp.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.Tcp.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.Tcp.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.Tcp.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.Tcp.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.Tcp.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.Tcp.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.Tcp.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.Tcp.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.Tcp.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -5002,7 +5002,7 @@ "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -5037,7 +5037,7 @@ "DirectGLES.Tcp.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.Tcp.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.Tcp.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Tcp.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Tcp.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Tcp.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -5128,9 +5128,9 @@ "DirectGLES.Tcp.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.Tcp.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.Tcp.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.Tcp.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.Tcp.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.Tcp.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.Tcp.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.Tcp.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.Tcp.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.Tcp.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.Tcp.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.Tcp.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -5164,8 +5164,8 @@ "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.Tcp.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.Tcp.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -5264,7 +5264,7 @@ "DirectGLES.Tcp.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.Tcp.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.Tcp.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.Tcp.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Tcp.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Tcp.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.Tcp.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.Tcp.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -5280,7 +5280,7 @@ "DirectGLES.Tcp.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.Tcp.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.Tcp.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.Tcp.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.Tcp.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.Tcp.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.Tcp.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.Tcp.ProgramPipelineScenario.ASamplerUnitRewrittenBetweenDrawsKeepsPaintingTheRightTexture", @@ -5311,8 +5311,8 @@ "DirectGLES.Tcp.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.Tcp.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.Tcp.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.Tcp.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.Tcp.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.Tcp.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.Tcp.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.Tcp.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectGLES.Tcp.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectGLES.Tcp.SpirvShaderBinaryScenario.SpecializedModulesLinkAndRenderWithTheirConstantsApplied", @@ -5385,7 +5385,7 @@ "DirectGLES.Tcp.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.Tcp.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.Tcp.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.Tcp.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.Tcp.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.Tcp.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.Tcp.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.Tcp.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -5514,7 +5514,7 @@ "DirectGLES.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -5637,14 +5637,14 @@ "DirectVulkan.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectVulkan.AsyncOn.AsyncCompileScenario.IrisShapedTwoPhaseBatchRendersCorrectly", "DirectVulkan.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectVulkan.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectVulkan.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectVulkan.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectVulkan.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectVulkan.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectVulkan.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectVulkan.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectVulkan.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectVulkan.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectVulkan.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectVulkan.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectVulkan.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectVulkan.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -5672,11 +5672,11 @@ "DirectVulkan.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectVulkan.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectVulkan.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectVulkan.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectVulkan.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectVulkan.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectVulkan.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectVulkan.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectVulkan.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectVulkan.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectVulkan.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectVulkan.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectVulkan.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -5728,7 +5728,7 @@ "DirectVulkan.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectVulkan.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectVulkan.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectVulkan.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectVulkan.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -5845,7 +5845,7 @@ "DirectVulkan.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectVulkan.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectVulkan.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectVulkan.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectVulkan.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectVulkan.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectVulkan.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectVulkan.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -5973,9 +5973,9 @@ "DirectVulkan.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectVulkan.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectVulkan.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectVulkan.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectVulkan.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectVulkan.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectVulkan.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectVulkan.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectVulkan.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectVulkan.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectVulkan.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectVulkan.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -6011,8 +6011,8 @@ "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectVulkan.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectVulkan.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectVulkan.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectVulkan.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectVulkan.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectVulkan.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -6142,7 +6142,7 @@ "DirectVulkan.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectVulkan.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectVulkan.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectVulkan.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectVulkan.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectVulkan.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectVulkan.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectVulkan.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -6171,7 +6171,7 @@ "DirectVulkan.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectVulkan.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectVulkan.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectVulkan.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectVulkan.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectVulkan.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectVulkan.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectVulkan.PrimitivesGeneratedNoXfbScenario.APausedSpanCountsACpuPricedDrawExactlyOnce", @@ -6212,8 +6212,8 @@ "DirectVulkan.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectVulkan.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectVulkan.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectVulkan.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectVulkan.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectVulkan.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectVulkan.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectVulkan.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectVulkan.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectVulkan.Spawn.ColdStart.ClearThenReadPixelsScenario.ClearWithNoDrawIsVisibleToDefaultFramebufferReadPixels", @@ -6296,7 +6296,7 @@ "DirectVulkan.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectVulkan.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectVulkan.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectVulkan.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -6479,14 +6479,14 @@ "names": [ "DirectGLES.AdvertisedLimitsScenario.EveryBufferLimitIsWithinItsAdvertisedRange", "DirectGLES.AdvertisedLimitsScenario.IndexedBufferBindingsAreReportedVerbatimOnBothWidths", - "DirectGLES.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -6531,7 +6531,7 @@ "DirectGLES.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -6570,7 +6570,7 @@ "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -6631,7 +6631,7 @@ "DirectGLES.PackedWordReadbackScenario.ACopyThroughARenderbufferReachesAnRgb9E5Destination", "DirectGLES.PackedWordReadbackScenario.AnUploadedPackedWordReadsBackVerbatim", "DirectGLES.PartialUploadOverGpuContentScenario.SubImageAfterAQueuedClearLandsOnTheClearForAReadback", - "DirectGLES.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.ResidentIndexScenario.EboAlsoBoundAsVertexBufferLater", "DirectGLES.ResourceSubsystemOn.LargeArenaAdoptionScenario.ADrawQueuedBeforeASubDataKeepsItsOwnBytes", "DirectGLES.ResourceSubsystemOn.LargeArenaAdoptionScenario.ARespecifyWithADrawQueuedKeepsThatDrawsStore", @@ -6656,14 +6656,14 @@ "DirectGLES.Spawn.AdoptTier0.LargeArenaAdoptionScenario.SubDataAfterAnInFlightDrawReachesTheNextDraw", "DirectGLES.Spawn.AdoptTier0.LargeArenaAdoptionScenario.TheArenaLandsInTheTierItsLaneDeclares", "DirectGLES.Spawn.AdvertisedLimitsScenario.IndexedBufferBindingsAreReportedVerbatimOnBothWidths", - "DirectGLES.Spawn.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Spawn.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Spawn.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Spawn.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Spawn.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Spawn.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Spawn.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Spawn.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Spawn.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Spawn.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Spawn.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Spawn.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Spawn.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -6731,7 +6731,7 @@ "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -6781,7 +6781,7 @@ "DirectGLES.Spawn.PackedWordReadbackScenario.ACopyThroughARenderbufferReachesAnRgb9E5Destination", "DirectGLES.Spawn.PackedWordReadbackScenario.AnUploadedPackedWordReadsBackVerbatim", "DirectGLES.Spawn.PartialUploadOverGpuContentScenario.SubImageAfterAQueuedClearLandsOnTheClearForAReadback", - "DirectGLES.Spawn.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Spawn.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Spawn.ResidentIndexScenario.EboAlsoBoundAsVertexBufferLater", "DirectGLES.Spawn.SsboArrayDynamicIndexScenario.ReadsAndWritesTheBlockTheIndexNames", "DirectGLES.Spawn.SsboArrayLengthScenario.AReadonlyWriteonlyArrayStillReportsItsLength", @@ -6828,14 +6828,14 @@ "DirectGLES.Split.AdoptTier0.LargeArenaAdoptionScenario.SubDataAfterAnInFlightDrawReachesTheNextDraw", "DirectGLES.Split.AdoptTier0.LargeArenaAdoptionScenario.TheArenaLandsInTheTierItsLaneDeclares", "DirectGLES.Split.AdvertisedLimitsScenario.IndexedBufferBindingsAreReportedVerbatimOnBothWidths", - "DirectGLES.Split.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Split.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Split.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Split.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Split.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Split.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Split.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Split.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Split.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Split.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Split.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Split.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Split.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -6903,7 +6903,7 @@ "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -6958,7 +6958,7 @@ "DirectGLES.Split.PackedWordReadbackScenario.ACopyThroughARenderbufferReachesAnRgb9E5Destination", "DirectGLES.Split.PackedWordReadbackScenario.AnUploadedPackedWordReadsBackVerbatim", "DirectGLES.Split.PartialUploadOverGpuContentScenario.SubImageAfterAQueuedClearLandsOnTheClearForAReadback", - "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Split.ResidentIndexScenario.EboAlsoBoundAsVertexBufferLater", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.ClearWithNoDrawIsVisibleToASubRectReadback", "DirectGLES.Split.SsboArrayDynamicIndexScenario.ReadsAndWritesTheBlockTheIndexNames", @@ -7023,14 +7023,14 @@ "DirectGLES.Tcp.AdoptTier0.LargeArenaAdoptionScenario.SubDataAfterAnInFlightDrawReachesTheNextDraw", "DirectGLES.Tcp.AdoptTier0.LargeArenaAdoptionScenario.TheArenaLandsInTheTierItsLaneDeclares", "DirectGLES.Tcp.AdvertisedLimitsScenario.IndexedBufferBindingsAreReportedVerbatimOnBothWidths", - "DirectGLES.Tcp.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Tcp.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Tcp.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Tcp.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Tcp.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Tcp.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Tcp.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Tcp.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Tcp.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Tcp.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Tcp.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Tcp.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Tcp.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -7096,7 +7096,7 @@ "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -7146,7 +7146,7 @@ "DirectGLES.Tcp.PackedWordReadbackScenario.ACopyThroughARenderbufferReachesAnRgb9E5Destination", "DirectGLES.Tcp.PackedWordReadbackScenario.AnUploadedPackedWordReadsBackVerbatim", "DirectGLES.Tcp.PartialUploadOverGpuContentScenario.SubImageAfterAQueuedClearLandsOnTheClearForAReadback", - "DirectGLES.Tcp.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Tcp.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Tcp.ResidentIndexScenario.EboAlsoBoundAsVertexBufferLater", "DirectGLES.Tcp.SsboArrayDynamicIndexScenario.ReadsAndWritesTheBlockTheIndexNames", "DirectGLES.Tcp.SsboArrayLengthScenario.AReadonlyWriteonlyArrayStillReportsItsLength", @@ -7201,14 +7201,14 @@ "DirectVulkan.AdvertisedLimitsScenario.EveryBufferLimitIsWithinItsAdvertisedRange", "DirectVulkan.AdvertisedLimitsScenario.IndexedBufferBindingsAreReportedVerbatimOnBothWidths", "DirectVulkan.ArenaArm.LargeArenaAdoptionScenario.TheArenaLandsInTheTierItsLaneDeclares", - "DirectVulkan.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectVulkan.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectVulkan.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectVulkan.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectVulkan.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectVulkan.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectVulkan.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectVulkan.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectVulkan.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectVulkan.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectVulkan.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectVulkan.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectVulkan.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -7252,7 +7252,7 @@ "DirectVulkan.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectVulkan.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectVulkan.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectVulkan.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectVulkan.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectVulkan.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -7326,7 +7326,7 @@ "DirectVulkan.PackedWordReadbackScenario.ACopyThroughARenderbufferReachesAnRgb9E5Destination", "DirectVulkan.PackedWordReadbackScenario.AnUploadedPackedWordReadsBackVerbatim", "DirectVulkan.PartialUploadOverGpuContentScenario.SubImageAfterAQueuedClearLandsOnTheClearForAReadback", - "DirectVulkan.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectVulkan.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectVulkan.ResidentIndexScenario.EboAlsoBoundAsVertexBufferLater", "DirectVulkan.SplitRecording.OversizedRecordingSplitScenario.EveryDrawOfTheFrameLandsAcrossCommandBufferSplits", "DirectVulkan.SsboArrayDynamicIndexScenario.ReadsAndWritesTheBlockTheIndexNames", @@ -7384,7 +7384,7 @@ "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -7423,14 +7423,14 @@ "DirectGLES.Split.AsyncOn.AsyncCompileScenario.CompletionStatusPollingThenForcedJoin", "DirectGLES.Split.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.Split.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.Split.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Split.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Split.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Split.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Split.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Split.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Split.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Split.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Split.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Split.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Split.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Split.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Split.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -7458,11 +7458,11 @@ "DirectGLES.Split.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.Split.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.Split.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.Split.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.Split.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.Split.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -7586,7 +7586,7 @@ "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -7621,7 +7621,7 @@ "DirectGLES.Split.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.Split.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.Split.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Split.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Split.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -7712,9 +7712,9 @@ "DirectGLES.Split.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.Split.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.Split.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.Split.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.Split.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.Split.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.Split.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.Split.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.Split.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.Split.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.Split.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.Split.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -7748,8 +7748,8 @@ "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.Split.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.Split.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -7917,7 +7917,7 @@ "DirectGLES.Split.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.Split.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.Split.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.Split.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.Split.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -7933,7 +7933,7 @@ "DirectGLES.Split.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.Split.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.Split.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.Split.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.Split.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.Split.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.Split.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.Split.ProgramPipelineScenario.ASamplerUnitRewrittenBetweenDrawsKeepsPaintingTheRightTexture", @@ -7964,8 +7964,8 @@ "DirectGLES.Split.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.Split.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.Split.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.ABlitIntoTheDefaultFramebufferSurvivesAnEarlierClear", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.ADrawIntoTheDefaultFramebufferSurvivesAnEarlierClear", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.AMultisampleResolveBlitIntoTheDefaultFramebufferKeepsItsOrientation", @@ -8002,7 +8002,7 @@ "DirectGLES.Split.StreamedArenaScenario.StreamedIndexDataSurvivesArenaRecycling", "DirectGLES.Split.StreamedArenaScenario.StreamedVertexDataSurvivesArenaRecycling", "DirectGLES.Split.StrictArming.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", - "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", @@ -8056,7 +8056,7 @@ "DirectGLES.Split.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.Split.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.Split.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.Split.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.Split.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.Split.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.Split.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.Split.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -8162,7 +8162,7 @@ "DirectVulkan.Split.Band.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectVulkan.Split.Band.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectVulkan.Split.Band.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectVulkan.Split.Band.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectVulkan.Split.Band.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectVulkan.Split.Band.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectVulkan.Split.Band.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectVulkan.Split.Band.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -8224,11 +8224,11 @@ "DirectVulkan.Split.Fm.ClipDistanceScenario.AnEnabledClipDistanceRemovesTheNegativeHalf", "DirectVulkan.Split.Fm.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectVulkan.Split.Fm.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectVulkan.Split.Fm.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectVulkan.Split.Fm.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectVulkan.Split.Fm.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectVulkan.Split.Fm.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectVulkan.Split.Fm.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectVulkan.Split.Fm.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectVulkan.Split.Fm.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectVulkan.Split.Fm.EmptyTextureLevelScenario.ALevelDefinedEmptyThenRedefinedCarriesTheNewTexels", "DirectVulkan.Split.Fm.EmptyTextureLevelScenario.TheCtsStateResetDefinesEveryDefaultTargetEmpty", "DirectVulkan.Split.Fm.F1WireScenario.ClearBufferfiPixels", @@ -8610,7 +8610,7 @@ "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -8646,14 +8646,14 @@ "DirectGLES.Split.AsyncOn.AsyncCompileScenario.CompletionStatusPollingThenForcedJoin", "DirectGLES.Split.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.Split.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.Split.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Split.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Split.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Split.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Split.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Split.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Split.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Split.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Split.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Split.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Split.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Split.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Split.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -8681,11 +8681,11 @@ "DirectGLES.Split.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.Split.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.Split.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.Split.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.Split.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.Split.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.Split.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.Split.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -8809,7 +8809,7 @@ "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -8844,7 +8844,7 @@ "DirectGLES.Split.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.Split.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.Split.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Split.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Split.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -8935,9 +8935,9 @@ "DirectGLES.Split.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.Split.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.Split.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.Split.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.Split.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.Split.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.Split.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.Split.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.Split.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.Split.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.Split.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.Split.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -8971,8 +8971,8 @@ "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.Split.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.Split.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.Split.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -9140,7 +9140,7 @@ "DirectGLES.Split.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.Split.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.Split.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Split.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.Split.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.Split.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -9156,7 +9156,7 @@ "DirectGLES.Split.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.Split.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.Split.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.Split.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.Split.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.Split.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.Split.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.Split.ProgramPipelineScenario.ASamplerUnitRewrittenBetweenDrawsKeepsPaintingTheRightTexture", @@ -9187,8 +9187,8 @@ "DirectGLES.Split.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.Split.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.Split.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.Split.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.ABlitIntoTheDefaultFramebufferSurvivesAnEarlierClear", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.ADrawIntoTheDefaultFramebufferSurvivesAnEarlierClear", "DirectGLES.Split.SmallRing.ClearThenReadPixelsScenario.AMultisampleResolveBlitIntoTheDefaultFramebufferKeepsItsOrientation", @@ -9225,7 +9225,7 @@ "DirectGLES.Split.StreamedArenaScenario.StreamedIndexDataSurvivesArenaRecycling", "DirectGLES.Split.StreamedArenaScenario.StreamedVertexDataSurvivesArenaRecycling", "DirectGLES.Split.StrictArming.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", - "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Split.StrictProgramArm.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", @@ -9279,7 +9279,7 @@ "DirectGLES.Split.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.Split.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.Split.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.Split.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.Split.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.Split.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.Split.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.Split.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -9423,7 +9423,7 @@ "AsyncLinkTest.TwoProgramsSharingAShaderGenerateIdenticalSpirv", "AsyncSpirvPhaseTest.AFragmentOutputRangeFailureIsDecidedInPhaseA", "AsyncSpirvPhaseTest.ALinkThatFailsNeverProducesSpirv", - "AsyncSpirvPhaseTest.ALinkedProgramWhoseSpirvJobWasCancelledDegradesInsteadOfFaulting", + "AsyncSpirvPhaseTest.ALinkedProgramWhoseSpirvJobWasCanceledDegradesInsteadOfFaulting", "AsyncSpirvPhaseTest.AsyncOffAndAsyncOnProduceIdenticalSpirvAndShadow", "AsyncSpirvPhaseTest.AsyncOffNeverProducesALinkedProgramWithoutSpirv", "AsyncSpirvPhaseTest.DeletingAProgramWithAPendingSpirvJobDoesNotBlock", @@ -9515,7 +9515,7 @@ "BufferTest.ImmutableStorageOnAnAdoptedBufferHandsTheMappingBackToo", "BufferTest.IndexedBufferSizeQueryReportsTheRequestedSizeNotTheBuffersStorage", "BufferTest.MapBufferRangeAndUnmapBufferReseedAnAdoptedShaderStorageBuffer", - "BufferTest.MappedPointersHonourTheAdvertisedMapBufferAlignment", + "BufferTest.MappedPointersHonorTheAdvertisedMapBufferAlignment", "BufferTest.ParameterBufferBindingAndQuery", "BufferTest.PartialUpdate", "BufferTest.PingPong", @@ -9648,10 +9648,10 @@ "DebugTest.ALabelWrittenComesBack", "DebugTest.AMessageLongerThanTheAdvertisedLimitIsInvalidValue", "DebugTest.ANullLabelRemovesTheLabel", - "DebugTest.AnUnlabelledObjectAnswersWithAnEmptyString", + "DebugTest.AnUnlabeledObjectAnswersWithAnEmptyString", "DebugTest.DebugMessageInsertValidatesItsEnums", - "DebugTest.LabellingANonObjectTypeIsInvalidEnum", - "DebugTest.LabellingSomethingThatDoesNotExistIsInvalidValue", + "DebugTest.LabelingANonObjectTypeIsInvalidEnum", + "DebugTest.LabelingSomethingThatDoesNotExistIsInvalidValue", "DebugTest.LabelsAreScopedToTheObjectAndItsType", "DebugTest.OnlyApplicationAndThirdPartySourcesMayBePushed", "DebugTest.PoppingTheBaseGroupIsStackUnderflow", @@ -9665,7 +9665,7 @@ "DemoteFloat64Test.AComparisonAgainstANonZeroDoubleIsLeftAlone", "DemoteFloat64Test.AComparisonAgainstASmallNonZeroLiteralIsLeftAlone", "DemoteFloat64Test.AComparisonAgainstZeroIsStillRewritten", - "DemoteFloat64Test.AFloat64VertexInputIsRecognisedAndOnlyOnAVertexStage", + "DemoteFloat64Test.AFloat64VertexInputIsRecognizedAndOnlyOnAVertexStage", "DemoteFloat64Test.DeclinesAModuleThatBitcastsAcrossTheWidthBoundary", "DemoteFloat64Test.DemotesEveryWidthAndDropsTheCapability", "DemoteFloat64Test.FoldsTheConversionsThatBecameIdentities", @@ -9679,7 +9679,7 @@ "DemoteFloat64Test.TheRewriteComparesAbsAgainstTheModulesOwnZero", "DemoteFloat64Test.TheSharedChainDemotesToo", "DemoteFloat64Test.TheSharedChainKeepsFloat64WhenTheBackendConsumesIt", - "DemoteFloat64Test.TheThirtyTwoBitBehaviourIsUnchanged", + "DemoteFloat64Test.TheThirtyTwoBitBehaviorIsUnchanged", "DemotePointSizeTest.ACaptureRequestForcesTheCarrierOnANonWritingCaptureStage", "DemotePointSizeTest.AControlStageCarryingClipDistanceDeclinesTheProgram", "DemotePointSizeTest.AGeometryOnlyProgramReadsTheVertexBoundary", @@ -9784,7 +9784,7 @@ "DriverBugProbes.ImageLocationBudgetNeedsAGeometryStageThatCanHoldImages", "DriverBugProbes.ImageLocationBudgetReportsNothingWhenTheControlAlsoFails", "DriverBugProbes.ImageLocationBudgetStaysSilentOnAContextWithoutTheGeometryLimit", - "DriverBugProbes.LayeredBlitDestinationIsCleanWhenTheLayerIsHonoured", + "DriverBugProbes.LayeredBlitDestinationIsCleanWhenTheLayerIsHonored", "DriverBugProbes.LayeredBlitDestinationIsDetectedWhenTheCopyLandsOnLayerZero", "DriverBugProbes.LayeredBlitDestinationReportsNothingWhenTheBlitMovesNothing", "DriverBugProbes.LayeredBlitDestinationReportsNothingWhenTheSourceLayerIsIgnoredToo", @@ -9931,7 +9931,7 @@ "FieldOwnershipTest.TheResidualFillsSuppliedMemoReKeysOnEveryInputThatMovesAnAnswer", "FieldOwnershipTest.TheSameReadWithoutStrictErrorsSurvivesAndIsCounted", "FieldOwnershipTest.TheSevenStickyForwardsAgreeWithTheirFieldRows", - "FieldOwnershipTest.TheStickyExemptionIsCancelledByTheServerStamp", + "FieldOwnershipTest.TheStickyExemptionIsCanceledByTheServerStamp", "FieldOwnershipTest.TheUnpackHalfOfThePixelStoreAbortsWhileThePackHalfDoesNot", "FieldOwnershipTest.VerbBoundaryOpsCoverEveryVerbShapedCall", "FixIterationRPBarrierPass.InsertsWorkgroupBarrierBeforeSecondReduction", @@ -10013,7 +10013,7 @@ "FramebufferEmit.TheDefaultFramebuffersRecordNamesNoSurfaceAShareGroupWouldHaveToHold", "FramebufferEmit.TheEmitterIsOneNeverDestroyedProcessSingleton", "FramebufferEmit.TheRecordsElevenSurfacesAreTheWholePointSetTheServerReads", - "FramebufferTest.ApplicationAlphaMaskOffIsStillHonouredOnANativeDrawBuffer", + "FramebufferTest.ApplicationAlphaMaskOffIsStillHonoredOnANativeDrawBuffer", "FramebufferTest.BindRenderbufferZeroUnbindsWithoutError", "FramebufferTest.BlitNamedFramebufferAllowsDefaultFramebufferZero", "FramebufferTest.ClearIntoAWidenedDrawBufferKeepsAlphaWritableAndSubstitutesOne", @@ -10037,7 +10037,7 @@ "FramebufferTest.FramebufferTexture3DAttachesSliceWithLayerTracking", "FramebufferTest.FramebufferTextureBumpsAttachmentVersionOnlyOnce", "FramebufferTest.FramebufferTextureLayerRejectsTheDefaultFramebufferAndBadLevels", - "FramebufferTest.FramebufferTextureRejectsAColourAttachmentPastTheLimit", + "FramebufferTest.FramebufferTextureRejectsAColorAttachmentPastTheLimit", "FramebufferTest.FramebufferTextureRejectsALevelTheTextureDoesNotHave", "FramebufferTest.FramebufferTextureRejectsTheDefaultFramebuffer", "FramebufferTest.FramebufferTextureReportsInvalidValueForANameThatWasNeverGenerated", @@ -10267,7 +10267,7 @@ "JobNodeCancel.CancelAfterCompletionDoesNotUndoTheResult", "JobNodeCancel.CancelBeforeAnyDispatchSettlesTheNodeAndSkipsTheBody", "JobNodeCancel.CancelReleasesContinuationsSoDependentsAreNotStranded", - "JobNodeCancel.CancelWhileTheBodyIsRunningLetsItFinishAndReportsCancelled", + "JobNodeCancel.CancelWhileTheBodyIsRunningLetsItFinishAndReportsCanceled", "JobNodeContinuation.AlreadyTerminalDependenciesStillSettleTheCounterExactlyOnce", "JobNodeContinuation.DependencyCounterReachesZeroExactlyOnceAndOnlyAfterEveryDependency", "JobNodeContinuation.EveryContinuationFiresExactlyOnce", @@ -10426,7 +10426,7 @@ "ParallelShaderCompileTest.ZeroCompilerThreadsJoinsPendingLinksAndTheirSpirvJobs", "PassthroughTessControlEsslTest.BakesTheDefaultTessLevelsIn", "PassthroughTessControlEsslTest.DeclaresThePatchSizeAndWritesEveryTessLevel", - "PassthroughTessControlEsslTest.MirrorsTheNeighboursPerVertexBlocks", + "PassthroughTessControlEsslTest.MirrorsTheNeighborsPerVertexBlocks", "PassthroughTessControlEsslTest.NonFiniteLevelsFollowTheDiscardRule", "PassthroughTessControlEsslTest.RequestsTheExtensionBelowEs32", "PassthroughTessControlEsslTest.SpellsIntegralLevelsAsFloatLiterals", @@ -10460,47 +10460,47 @@ "PersistentBufferOrderingProbeTest.ReadbackErrorAfterAMismatchDoesNotProduceAFinding", "PersistentBufferOrderingProbeTest.RequiresExtensionAndCompleteDispatchBeforeAllocating", "PersistentMapFaultOwnership.AKernelsUntaggedFaultAddressIsOwnedByATaggedShadowsSlot", - "PersistentMapFaultOwnership.TheOwnershipRowNormalisesBothSidesBeforeItCompares", + "PersistentMapFaultOwnership.TheOwnershipRowNormalizesBothSidesBeforeItCompares", "PersistentMapFaultOwnership.UntagAddressClearsTheTopByteAndNothingBelowIt", "PersistentMapWritability.AMapHandsBackARangeWritableWithoutTheFaultHandler", "PersistentMapWritability.AnArmedPageIsStillAnsweredByTheHandlerAndMadeWritable", "PersistentMapWritability.RegistrationLeavesEveryPageOfTheRangeReadWrite", - "PipeCatalogue.ApplierAcceptsAWellFormedRecord", - "PipeCatalogue.BufferRangeCarriesNoInlineHostSpan", - "PipeCatalogue.CoverageAccountsForEveryInventoryRow", - "PipeCatalogue.EntryCountMatchesTheDocumentedCount", - "PipeCatalogue.EveryRowCarriesTheWaitClassTheContractGivesIt", - "PipeCatalogue.EveryTextureTargetMapsToItsOwnResourceTarget", - "PipeCatalogue.EveryUnmigratedEmulationIsNamedOnce", - "PipeCatalogue.ExactlyTheRoutedRowsAreInstalledAndTheRestAreStillNull", - "PipeCatalogue.FloatVectorsCompareBitwise", - "PipeCatalogue.FrontendNeverTakesAnApplierAddress", - "PipeCatalogue.GeneratedTablesHoldTheWholeCatalogue", - "PipeCatalogue.HandleIsEightBytes", - "PipeCatalogue.HostSpanResolvesTheMonolithPointer", - "PipeCatalogue.LateArrivalsAreAppendedWithoutRenumbering", - "PipeCatalogue.PipeInputFieldsStartUnfilled", - "PipeCatalogue.PipelineSubsetMembersArePinned", - "PipeCatalogue.ResidualBlockIsExactlyItsTwoValueStructsPlusPatchTail", - "PipeCatalogue.ResidualBlockSizeIsPinned", - "PipeCatalogue.ResourceRespecifyAcksOnlyImmutableStorage", - "PipeCatalogue.ReverseChannelHasTenCallbacks", - "PipeCatalogue.SixValueStructsHaveFieldLists", - "PipeCatalogue.StickyFieldsAreExactlyTheSeven", - "PipeCatalogue.SubDataBufferRangeRidesInTheUnionBox", - "PipeCatalogue.SubDataTargetPacksAResourceTargetAndAnUploadTarget", - "PipeCatalogue.SurfaceNamesItsKindItsTextureTargetAndItsDepthStencilAspect", - "PipeCatalogue.TextureParamsNameTheirBuiltinSamplerAndFramebufferStateNamesItsTarget", - "PipeCatalogue.TheCompositeShaderBandIsCountedApartFromTheOrdinarySpace", - "PipeCatalogue.UninstalledTablesAreAllNull", - "PipeCatalogue.UnmigratedEmulationSitesMatchTheList", - "PipeCatalogue.UnmigratedEmulationSitesSelfTest", - "PipeCatalogue.ValueTypeLayoutsArePinned", - "PipeCatalogue.VerbTableIsTheFunctionTable", - "PipeCatalogue.VerifyComparatorNamesTheDifferingField", - "PipeCatalogue.VertexBufferSetCarriesAnExplicitBaseInstance", - "PipeCatalogue.VertexWireViewsAreFlatAndCarryIsLongSeparately", - "PipeCatalogue.WireOpcodesAreThePositionsInTheCatalogue", + "PipeCatalog.ApplierAcceptsAWellFormedRecord", + "PipeCatalog.BufferRangeCarriesNoInlineHostSpan", + "PipeCatalog.CoverageAccountsForEveryInventoryRow", + "PipeCatalog.EntryCountMatchesTheDocumentedCount", + "PipeCatalog.EveryRowCarriesTheWaitClassTheContractGivesIt", + "PipeCatalog.EveryTextureTargetMapsToItsOwnResourceTarget", + "PipeCatalog.EveryUnmigratedEmulationIsNamedOnce", + "PipeCatalog.ExactlyTheRoutedRowsAreInstalledAndTheRestAreStillNull", + "PipeCatalog.FloatVectorsCompareBitwise", + "PipeCatalog.FrontendNeverTakesAnApplierAddress", + "PipeCatalog.GeneratedTablesHoldTheWholeCatalog", + "PipeCatalog.HandleIsEightBytes", + "PipeCatalog.HostSpanResolvesTheMonolithPointer", + "PipeCatalog.LateArrivalsAreAppendedWithoutRenumbering", + "PipeCatalog.PipeInputFieldsStartUnfilled", + "PipeCatalog.PipelineSubsetMembersArePinned", + "PipeCatalog.ResidualBlockIsExactlyItsTwoValueStructsPlusPatchTail", + "PipeCatalog.ResidualBlockSizeIsPinned", + "PipeCatalog.ResourceRespecifyAcksOnlyImmutableStorage", + "PipeCatalog.ReverseChannelHasTenCallbacks", + "PipeCatalog.SixValueStructsHaveFieldLists", + "PipeCatalog.StickyFieldsAreExactlyTheSeven", + "PipeCatalog.SubDataBufferRangeRidesInTheUnionBox", + "PipeCatalog.SubDataTargetPacksAResourceTargetAndAnUploadTarget", + "PipeCatalog.SurfaceNamesItsKindItsTextureTargetAndItsDepthStencilAspect", + "PipeCatalog.TextureParamsNameTheirBuiltinSamplerAndFramebufferStateNamesItsTarget", + "PipeCatalog.TheCompositeShaderBandIsCountedApartFromTheOrdinarySpace", + "PipeCatalog.UninstalledTablesAreAllNull", + "PipeCatalog.UnmigratedEmulationSitesMatchTheList", + "PipeCatalog.UnmigratedEmulationSitesSelfTest", + "PipeCatalog.ValueTypeLayoutsArePinned", + "PipeCatalog.VerbTableIsTheFunctionTable", + "PipeCatalog.VerifyComparatorNamesTheDifferingField", + "PipeCatalog.VertexBufferSetCarriesAnExplicitBaseInstance", + "PipeCatalog.VertexWireViewsAreFlatAndCarryIsLongSeparately", + "PipeCatalog.WireOpcodesAreThePositionsInTheCatalog", "PipeInputsTest.AFrontendMutationInsideAVerbDoesNotDivergeAtRead", "PipeInputsTest.AFrontendMutationInsideAVerbRefreshesThePushedField", "PipeInputsTest.BadVerifyCorruptKnobIsFatalNamingTheKnob", @@ -10602,7 +10602,7 @@ "PipeWireCodecTest.LaunchGridReachesTheSink", "PipeWireCodecTest.MaxRecordBytesSeenStaysFarBelowHalfTheRing", "PipeWireCodecTest.MemoryBarrierReachesTheSink", - "PipeWireCodecTest.NoReplyIsWrittenForARowTheCatalogueGivesNoReplySlot", + "PipeWireCodecTest.NoReplyIsWrittenForARowTheCatalogGivesNoReplySlot", "PipeWireCodecTest.ObjectDeathReachesTheSinkWithItsHandleAndKind", "PipeWireCodecTest.PackBufferReadbacksReachTheirOwnArmsAndPostNoReply", "PipeWireCodecTest.PatchParameterReachesTheSink", @@ -10684,7 +10684,7 @@ "PrimitivesGeneratedNoXfbArmingTest.ForceOffNeverReroutes", "PrimitivesGeneratedNoXfbArmingTest.ForceOnBypassesTheVerdictButNeverTheStructuralChecks", "PrimitivesGeneratedNoXfbProbeTeardownTest.AFenceTimeoutLeaksEverythingAndReportsItself", - "PrimitivesGeneratedNoXfbProbeTeardownTest.ASignalledFenceTearsDownNormally", + "PrimitivesGeneratedNoXfbProbeTeardownTest.ASignaledFenceTearsDownNormally", "PrimitivesGeneratedNoXfbVerdictTest.AConformingDriverReadsStreamCounts", "PrimitivesGeneratedNoXfbVerdictTest.ASilentDedicatedQueryFallsThroughToStatistics", "PrimitivesGeneratedNoXfbVerdictTest.ASubstituteWorseThanTheStreamOnAnyShapeIsRefused", @@ -10710,7 +10710,7 @@ "ProgramArtifactsCodec.RoundTripsAFullyPopulatedArchive", "ProgramArtifactsCodec.TheTablesVisitEveryMemberExceptTheLiveProgram", "ProgramEmit.ACreateStoresTheDescriptorAndARelinkCountsUpAndDropsTheBlockKeyedToTheOldLayout", - "ProgramEmit.ACreateWithNoArtefactsAnOversizedBlockOrACorruptSlotIsRefusedNamingTheProgram", + "ProgramEmit.ACreateWithNoArtifactsAnOversizedBlockOrACorruptSlotIsRefusedNamingTheProgram", "ProgramEmit.ADeadProgramsRecordLatchIsRetiredAtItsDeath", "ProgramEmit.ADeleteDropsTheRecordAndClearsEveryBindingThatNamedIt", "ProgramEmit.AFailedRelinkReIssuesWithLinkStatusZeroAndNeverAnObjectDeath", @@ -10806,7 +10806,7 @@ "ProgramTest.DoWhileDeadLoopUniformsKeepBackingStorage", "ProgramTest.ExplicitUniformLocationOverlapAcrossStagesFailsLink", "ProgramTest.ExplicitUniformLocationsHonoredForPlainAndOpaqueUniforms", - "ProgramTest.ExplicitUniformLocationsHonourMaxUniformLocations", + "ProgramTest.ExplicitUniformLocationsHonorMaxUniformLocations", "ProgramTest.FailedCompileIsMemoizedAndStillRecoversOnGoodSource", "ProgramTest.FragmentOutputsMayShareALocationWhenTheirColorIndexDiffers", "ProgramTest.FragmentOutputsSharingAColorNumberAtTheSameIndexStillFailToLink", @@ -10930,7 +10930,7 @@ "ProgramUtilTest.MidLineVersionDetectionSurvivesALongDirectiveFreeBody", "ProgramUtilTest.NoperspectiveInterpolationSurvivesToEssl", "ProgramUtilTest.NumSamplesShimDoesNotDoubleInject", - "ProgramUtilTest.NumSamplesShimHonoursTheVersionAndExtensionGate", + "ProgramUtilTest.NumSamplesShimHonorsTheVersionAndExtensionGate", "ProgramUtilTest.NumSamplesShimIgnoresCommentedAndPartialTokens", "ProgramUtilTest.NumSamplesShimIsFragmentStageOnly", "ProgramUtilTest.OnlyAnExactVersionRepeatIsElided", @@ -11277,7 +11277,7 @@ "ResourceEmit.ADrawTimeIndexBindingPublishesElementArrayEvenWhenTheRespecifyCannotSeeIt", "ResourceEmit.APerLevelRespecifyCoveringItsDeclaredRangeKeepsTheOtherLevelsTexels", "ResourceEmit.APerLevelRespecifyThatDoesNotCoverItsDeclaredRangeIsRefusedByName", - "ResourceEmit.AResourceTargetOrKindTheCatalogueDoesNotNameIsRefusedRatherThanRouted", + "ResourceEmit.AResourceTargetOrKindTheCatalogDoesNotNameIsRefusedRatherThanRouted", "ResourceEmit.ARespecifyPublishesTheCreateAHandleNeverGot", "ResourceEmit.ARespecifyReplacesTheDescriptorAndOnlyAMutationMovesTheSerial", "ResourceEmit.ASlotOutsideTheRecordTablesBoundIsRefusedRatherThanAllocated", @@ -11306,7 +11306,7 @@ "RetargetTextureBufferExtensionTest.ExtDriverKeepsWhatSpirvCrossEmitted", "RetargetTextureBufferExtensionTest.OesOnlyDriverGetsTheOesDirective", "RetargetTextureBufferExtensionTest.OnlyExtensionDirectivesAreRewritten", - "RetargetTextureBufferExtensionTest.SpacedDirectiveIsRewrittenAndNeighboursAreLeftAlone", + "RetargetTextureBufferExtensionTest.SpacedDirectiveIsRewrittenAndNeighborsAreLeftAlone", "RingTest.ALazyWatermarkMayTrailTheWorkButMustNeverLeadIt", "RingTest.AWatermarkWaiterMustTestGreaterOrEqualRatherThanEqual", "RingTest.AWrapFillerDoesNotAdvanceTheRecordSequence", @@ -11356,7 +11356,7 @@ "SamplerEmit.TheTwoUnitSetsLandInTheirWindowAndLeaveEverythingOutsideItAlone", "SamplerEmit.TwoIdenticalSamplersShareOneCso", "Sanity.BasicAssertions", - "ServerContextLiveTest.OneSessionsReleaseDoesNotKillANeighboursContext", + "ServerContextLiveTest.OneSessionsReleaseDoesNotKillANeighborsContext", "ServerDisplayTest.ADetachThatTimesOutKeepsTheReferenceUntilTheLeaseEnds", "ServerDisplayTest.ALeaseWhoseSessionIsEndingIsWaitedForAndThenHandedOver", "ServerDisplayTest.AProcessThatInstalledNothingHasNoDisplay", @@ -11531,7 +11531,7 @@ "ShaderBufferEmit.OnlyTheWritableClassesSetAMaskAndItReachesTheLastPoint", "ShaderBufferEmit.TheAppliedWindowIsPerClassAndTheSerialMovesOnEveryRecord", "ShaderBufferEmit.TheEmitterIsOneNeverDestroyedProcessSingleton", - "ShaderCompileAdoptionMapTest.CancelledNodeIsNotAdoptedAndIsPruned", + "ShaderCompileAdoptionMapTest.CanceledNodeIsNotAdoptedAndIsPruned", "ShaderCompileAdoptionMapTest.EnvFingerprintMismatchIsNotAdopted", "ShaderCompileAdoptionMapTest.ExpiredNodeIsNotAdoptedAndIsPruned", "ShaderCompileAdoptionMapTest.RegisteredNodeIsAdoptedOnAnExactMatch", @@ -11584,7 +11584,7 @@ "SharedImageYuv.AForeignBufferIsCopiedIntoAnImageOfItsOwn", "SharedImageYuv.AForeignBufferTooSmallForItsPlanesIsRefused", "SharedImageYuv.AnNv12ImageHasTwoPlanesInOneDescriptor", - "SharedImageYuv.TheConversionDecodesTheHintedColourSpace", + "SharedImageYuv.TheConversionDecodesTheHintedColorSpace", "SharedImageYuv.ThePlaneCopyFillsEveryDestinationLayout", "SlotAllocator.CompositeShaderBandIsNeverHandedOut", "SlotAllocator.FreedSlotComesBackBeforeHighWaterGrows", @@ -12038,7 +12038,7 @@ "TextureViewTest.ViewDerivesItsRangeAndInheritsImmutableLevels", "TextureViewTest.ViewOfAViewComposesOntoTheOriginalRatherThanRestarting", "TextureViewTest.ZeroTextureIsInvalidValue", - "Tracker.SubsystemBitsDoNotOverlapTheBehaviourBit", + "Tracker.SubsystemBitsDoNotOverlapTheBehaviorBit", "TrackerAggregates.ABufferRespecifyMovesOnlyTheBufferAggregate", "TrackerAggregates.AFramebufferDefaultSetterMovesOnlyTheFramebufferAggregate", "TrackerAggregates.AFramebufferObjectWriteMovesOnlyTheFramebufferAggregate", @@ -12274,7 +12274,7 @@ "DirectGLES.ForcedDepthStencilEmulation.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", "DirectGLES.GenerateMipmapServerScenario.Rgb16fDrawnBaseWithARefusedReadbackDeclinesByName", "DirectGLES.GenerateMipmapServerScenario.Rgb16fUploadedBaseWithARefusedReadbackIsFilteredFromTheStore", - "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.HandleRecycleScenario.ABufferAtARecycledAddressDoesNotInheritItsPredecessorsContents", "DirectGLES.HandleRecycleScenario.AFramebufferAtARecycledAddressDoesNotInheritItsPredecessorsTwin", "DirectGLES.HandleRecycleScenario.AProgramAtARecycledAddressDoesNotInheritItsPredecessorsShaderCso", @@ -12358,7 +12358,7 @@ "DirectGLES.Spawn.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Spawn.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -12376,7 +12376,7 @@ "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -12397,7 +12397,7 @@ "DirectGLES.Tcp.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Tcp.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -12529,7 +12529,7 @@ "DirectVulkan.TextureUploadShapeScenario.TheEmittedUploadShapeIsRecordedAndTheTwoSidesAgree", "DirectVulkan.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", "DirectVulkan.UnlocatedIoBlockScenario.TheEmulationIsActuallyArmedWhenTheEnvironmentPinsItOn", "DirectVulkan.ViewportArrayScenario.WithoutTheEmulationEveryIndexCollapsesOntoViewportZero", @@ -12617,7 +12617,7 @@ "DirectGLES.GenerateMipmapServerScenario.Rgb16fRenderTargetBaseGeneratesFromTheGpuWrittenLevel", "DirectGLES.GenerateMipmapServerScenario.Rgb16fUploadedBaseWithARefusedReadbackIsFilteredFromTheStore", "DirectGLES.GenerateMipmapServerScenario.Rgb32fRenderTargetBaseGeneratesFromTheGpuWrittenLevel", - "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.GpuWrittenDrawInputScenario.ABaseVertexAComputeShaderWroteReachesGlBaseVertex", "DirectGLES.GpuWrittenDrawInputScenario.ACountAComputeShaderWroteDrivesMultiDrawArraysIndirectCount", "DirectGLES.GpuWrittenDrawInputScenario.ACountAComputeShaderWroteDrivesMultiDrawElementsIndirectCount", @@ -12707,7 +12707,7 @@ "DirectGLES.Spawn.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Spawn.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -12725,7 +12725,7 @@ "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -12747,7 +12747,7 @@ "DirectGLES.Tcp.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Tcp.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -12956,7 +12956,7 @@ "DirectVulkan.TextureUploadShapeScenario.TheEmittedUploadShapeIsRecordedAndTheTwoSidesAgree", "DirectVulkan.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", "DirectVulkan.UnlocatedIoBlockScenario.TheEmulationIsActuallyArmedWhenTheEnvironmentPinsItOn", "DirectVulkan.ViewportArrayScenario.WithoutTheEmulationEveryIndexCollapsesOntoViewportZero", @@ -12973,7 +12973,7 @@ "DirectGLES.Spawn.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Spawn.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Spawn.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -13008,14 +13008,14 @@ "DirectGLES.Spawn.AsyncOn.AsyncCompileScenario.CompletionStatusPollingThenForcedJoin", "DirectGLES.Spawn.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.Spawn.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.Spawn.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Spawn.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Spawn.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Spawn.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Spawn.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Spawn.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Spawn.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Spawn.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Spawn.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Spawn.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Spawn.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Spawn.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Spawn.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -13043,11 +13043,11 @@ "DirectGLES.Spawn.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.Spawn.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Spawn.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.Spawn.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.Spawn.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.Spawn.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.Spawn.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.Spawn.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.Spawn.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.Spawn.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.Spawn.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.Spawn.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.Spawn.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -13171,7 +13171,7 @@ "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Spawn.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -13206,7 +13206,7 @@ "DirectGLES.Spawn.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.Spawn.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.Spawn.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Spawn.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Spawn.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Spawn.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Spawn.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -13297,9 +13297,9 @@ "DirectGLES.Spawn.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.Spawn.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.Spawn.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.Spawn.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.Spawn.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.Spawn.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.Spawn.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.Spawn.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.Spawn.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.Spawn.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.Spawn.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.Spawn.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -13333,8 +13333,8 @@ "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.Spawn.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.Spawn.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.Spawn.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -13433,7 +13433,7 @@ "DirectGLES.Spawn.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.Spawn.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.Spawn.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.Spawn.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Spawn.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Spawn.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.Spawn.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.Spawn.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -13449,7 +13449,7 @@ "DirectGLES.Spawn.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.Spawn.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.Spawn.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.Spawn.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.Spawn.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.Spawn.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.Spawn.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.Spawn.ProgramPipelineScenario.ASamplerUnitRewrittenBetweenDrawsKeepsPaintingTheRightTexture", @@ -13480,8 +13480,8 @@ "DirectGLES.Spawn.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.Spawn.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.Spawn.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.Spawn.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.Spawn.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.Spawn.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.Spawn.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.Spawn.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectGLES.Spawn.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectGLES.Spawn.SpirvShaderBinaryScenario.SpecializedModulesLinkAndRenderWithTheirConstantsApplied", @@ -13554,7 +13554,7 @@ "DirectGLES.Spawn.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.Spawn.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.Spawn.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.Spawn.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.Spawn.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.Spawn.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.Spawn.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.Spawn.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -13647,7 +13647,7 @@ "DirectGLES.Split.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Split.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Split.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Split.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Split.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -13670,7 +13670,7 @@ "DirectGLES.Tcp.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.AFlippedMultisampleResolveMirrorsTheBandsAndAScaleDeclines", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.SeparateDepthAndStencilAttachmentsAreBothReadable", - "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Tcp.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisample", "DirectGLES.Tcp.ImageTargetKindScenario.LoadsTexture2DMultisampleArray", @@ -13703,14 +13703,14 @@ "DirectGLES.Tcp.AsyncOn.AsyncCompileScenario.CompletionStatusPollingThenForcedJoin", "DirectGLES.Tcp.AsyncOn.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.Tcp.AsyncOn.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.Tcp.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Tcp.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Tcp.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Tcp.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Tcp.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Tcp.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Tcp.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Tcp.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Tcp.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Tcp.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Tcp.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Tcp.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Tcp.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -13738,11 +13738,11 @@ "DirectGLES.Tcp.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.Tcp.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Tcp.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.Tcp.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.Tcp.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.Tcp.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.Tcp.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.Tcp.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.Tcp.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.Tcp.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.Tcp.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.Tcp.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.Tcp.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -13866,7 +13866,7 @@ "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Tcp.ForcedDs.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -13901,7 +13901,7 @@ "DirectGLES.Tcp.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.Tcp.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.Tcp.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Tcp.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Tcp.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Tcp.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Tcp.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -13992,9 +13992,9 @@ "DirectGLES.Tcp.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.Tcp.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.Tcp.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.Tcp.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.Tcp.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.Tcp.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.Tcp.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.Tcp.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.Tcp.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.Tcp.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.Tcp.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.Tcp.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -14028,8 +14028,8 @@ "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.Tcp.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.Tcp.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.Tcp.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -14128,7 +14128,7 @@ "DirectGLES.Tcp.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.Tcp.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.Tcp.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.Tcp.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Tcp.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Tcp.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.Tcp.PointSizeDemotion.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.Tcp.PointSizeDemotion.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -14144,7 +14144,7 @@ "DirectGLES.Tcp.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.Tcp.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.Tcp.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.Tcp.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.Tcp.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.Tcp.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.Tcp.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.Tcp.ProgramPipelineScenario.ASamplerUnitRewrittenBetweenDrawsKeepsPaintingTheRightTexture", @@ -14175,8 +14175,8 @@ "DirectGLES.Tcp.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.Tcp.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.Tcp.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.Tcp.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.Tcp.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.Tcp.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.Tcp.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.Tcp.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectGLES.Tcp.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectGLES.Tcp.SpirvShaderBinaryScenario.SpecializedModulesLinkAndRenderWithTheirConstantsApplied", @@ -14249,7 +14249,7 @@ "DirectGLES.Tcp.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.Tcp.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.Tcp.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.Tcp.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.Tcp.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.Tcp.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.Tcp.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.Tcp.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -14387,7 +14387,7 @@ "DirectGLES.VerifySplit.FencePollScenario.PacedFrameFenceWaitsBench", "DirectGLES.VerifySplit.GenerateMipmapServerScenario.Rgb16fDrawnBaseWithARefusedReadbackDeclinesByName", "DirectGLES.VerifySplit.GenerateMipmapServerScenario.Rgb16fUploadedBaseWithARefusedReadbackIsFilteredFromTheStore", - "DirectGLES.VerifySplit.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.VerifySplit.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.VerifySplit.ImageBindableRemintScenario.GpuClearSurvivesTheFirstImageBindingOfAView", "DirectGLES.VerifySplit.ImageLoadStoreSsoScenario.AnImageArrayAlongsideAnotherDescriptorKeepsBothBindings", "DirectGLES.VerifySplit.ImageTargetKindScenario.IgnoresLayerForTexture2DMultisample", @@ -14512,7 +14512,7 @@ "DirectVulkan.VerifySplit.TextureUploadShapeScenario.TheEmittedUploadShapeIsRecordedAndTheTwoSidesAgree", "DirectVulkan.VerifySplit.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.VerifySplit.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.VerifySplit.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.VerifySplit.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.VerifySplit.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", "DirectVulkan.VerifySplit.UnlocatedIoBlockScenario.TheEmulationIsActuallyArmedWhenTheEnvironmentPinsItOn", "DirectVulkan.VerifySplit.ViewportArrayScenario.WithoutTheEmulationEveryIndexCollapsesOntoViewportZero", @@ -14535,14 +14535,14 @@ "DirectGLES.VerifySplit.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.VerifySplit.AsyncCompileScenario.IrisShapedTwoPhaseBatchRendersCorrectly", "DirectGLES.VerifySplit.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.VerifySplit.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.VerifySplit.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.VerifySplit.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.VerifySplit.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.VerifySplit.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.VerifySplit.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.VerifySplit.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.VerifySplit.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.VerifySplit.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.VerifySplit.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.VerifySplit.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.VerifySplit.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.VerifySplit.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -14570,11 +14570,11 @@ "DirectGLES.VerifySplit.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.VerifySplit.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.VerifySplit.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.VerifySplit.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.VerifySplit.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.VerifySplit.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.VerifySplit.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.VerifySplit.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.VerifySplit.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.VerifySplit.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.VerifySplit.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.VerifySplit.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.VerifySplit.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -14624,7 +14624,7 @@ "DirectGLES.VerifySplit.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.VerifySplit.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.VerifySplit.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.VerifySplit.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.VerifySplit.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.VerifySplit.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.VerifySplit.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.VerifySplit.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -14736,7 +14736,7 @@ "DirectGLES.VerifySplit.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.VerifySplit.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.VerifySplit.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.VerifySplit.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.VerifySplit.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.VerifySplit.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.VerifySplit.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.VerifySplit.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -14828,9 +14828,9 @@ "DirectGLES.VerifySplit.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.VerifySplit.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.VerifySplit.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.VerifySplit.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.VerifySplit.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.VerifySplit.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.VerifySplit.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.VerifySplit.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.VerifySplit.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.VerifySplit.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.VerifySplit.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.VerifySplit.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -14865,8 +14865,8 @@ "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.VerifySplit.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.VerifySplit.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -14986,7 +14986,7 @@ "DirectGLES.VerifySplit.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.VerifySplit.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.VerifySplit.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.VerifySplit.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.VerifySplit.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.VerifySplit.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.VerifySplit.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.VerifySplit.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -15000,7 +15000,7 @@ "DirectGLES.VerifySplit.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.VerifySplit.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.VerifySplit.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.VerifySplit.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.VerifySplit.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.VerifySplit.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.VerifySplit.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.VerifySplit.PrimitivesGeneratedNoXfbScenario.APausedSpanCountsACpuPricedDrawExactlyOnce", @@ -15040,8 +15040,8 @@ "DirectGLES.VerifySplit.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.VerifySplit.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.VerifySplit.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.VerifySplit.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.VerifySplit.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.VerifySplit.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.VerifySplit.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.VerifySplit.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectGLES.VerifySplit.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectGLES.VerifySplit.SpirvShaderBinaryScenario.AnUnsupportedBinaryFormatIsRejectedInsteadOfSilentlyAccepted", @@ -15114,7 +15114,7 @@ "DirectGLES.VerifySplit.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.VerifySplit.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.VerifySplit.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.VerifySplit.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.VerifySplit.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.VerifySplit.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.VerifySplit.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.VerifySplit.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -15218,14 +15218,14 @@ "DirectVulkan.VerifySplit.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectVulkan.VerifySplit.AsyncCompileScenario.IrisShapedTwoPhaseBatchRendersCorrectly", "DirectVulkan.VerifySplit.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectVulkan.VerifySplit.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectVulkan.VerifySplit.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectVulkan.VerifySplit.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectVulkan.VerifySplit.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectVulkan.VerifySplit.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectVulkan.VerifySplit.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectVulkan.VerifySplit.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectVulkan.VerifySplit.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectVulkan.VerifySplit.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectVulkan.VerifySplit.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectVulkan.VerifySplit.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectVulkan.VerifySplit.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectVulkan.VerifySplit.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -15253,11 +15253,11 @@ "DirectVulkan.VerifySplit.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectVulkan.VerifySplit.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectVulkan.VerifySplit.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectVulkan.VerifySplit.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectVulkan.VerifySplit.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectVulkan.VerifySplit.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectVulkan.VerifySplit.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectVulkan.VerifySplit.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectVulkan.VerifySplit.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectVulkan.VerifySplit.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectVulkan.VerifySplit.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectVulkan.VerifySplit.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectVulkan.VerifySplit.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -15306,7 +15306,7 @@ "DirectVulkan.VerifySplit.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectVulkan.VerifySplit.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectVulkan.VerifySplit.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectVulkan.VerifySplit.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectVulkan.VerifySplit.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectVulkan.VerifySplit.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectVulkan.VerifySplit.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectVulkan.VerifySplit.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -15422,7 +15422,7 @@ "DirectVulkan.VerifySplit.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectVulkan.VerifySplit.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectVulkan.VerifySplit.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectVulkan.VerifySplit.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectVulkan.VerifySplit.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectVulkan.VerifySplit.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectVulkan.VerifySplit.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectVulkan.VerifySplit.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -15514,9 +15514,9 @@ "DirectVulkan.VerifySplit.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectVulkan.VerifySplit.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectVulkan.VerifySplit.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectVulkan.VerifySplit.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectVulkan.VerifySplit.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectVulkan.VerifySplit.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectVulkan.VerifySplit.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectVulkan.VerifySplit.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectVulkan.VerifySplit.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectVulkan.VerifySplit.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectVulkan.VerifySplit.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectVulkan.VerifySplit.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -15551,8 +15551,8 @@ "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectVulkan.VerifySplit.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectVulkan.VerifySplit.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -15672,7 +15672,7 @@ "DirectVulkan.VerifySplit.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectVulkan.VerifySplit.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectVulkan.VerifySplit.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectVulkan.VerifySplit.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectVulkan.VerifySplit.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectVulkan.VerifySplit.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectVulkan.VerifySplit.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectVulkan.VerifySplit.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -15686,7 +15686,7 @@ "DirectVulkan.VerifySplit.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectVulkan.VerifySplit.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectVulkan.VerifySplit.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectVulkan.VerifySplit.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectVulkan.VerifySplit.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectVulkan.VerifySplit.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectVulkan.VerifySplit.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectVulkan.VerifySplit.PrimitivesGeneratedNoXfbScenario.APausedSpanCountsACpuPricedDrawExactlyOnce", @@ -15726,8 +15726,8 @@ "DirectVulkan.VerifySplit.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectVulkan.VerifySplit.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectVulkan.VerifySplit.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectVulkan.VerifySplit.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectVulkan.VerifySplit.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectVulkan.VerifySplit.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectVulkan.VerifySplit.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectVulkan.VerifySplit.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectVulkan.VerifySplit.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectVulkan.VerifySplit.SpirvShaderBinaryScenario.AnUnsupportedBinaryFormatIsRejectedInsteadOfSilentlyAccepted", @@ -15800,7 +15800,7 @@ "DirectVulkan.VerifySplit.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectVulkan.VerifySplit.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.VerifySplit.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.VerifySplit.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.VerifySplit.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.VerifySplit.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectVulkan.VerifySplit.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectVulkan.VerifySplit.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -15984,7 +15984,7 @@ "AsyncLinkTest.TwoProgramsSharingAShaderGenerateIdenticalSpirv", "AsyncSpirvPhaseTest.AFragmentOutputRangeFailureIsDecidedInPhaseA", "AsyncSpirvPhaseTest.ALinkThatFailsNeverProducesSpirv", - "AsyncSpirvPhaseTest.ALinkedProgramWhoseSpirvJobWasCancelledDegradesInsteadOfFaulting", + "AsyncSpirvPhaseTest.ALinkedProgramWhoseSpirvJobWasCanceledDegradesInsteadOfFaulting", "AsyncSpirvPhaseTest.AsyncOffAndAsyncOnProduceIdenticalSpirvAndShadow", "AsyncSpirvPhaseTest.AsyncOffNeverProducesALinkedProgramWithoutSpirv", "AsyncSpirvPhaseTest.DeletingAProgramWithAPendingSpirvJobDoesNotBlock", @@ -16076,7 +16076,7 @@ "BufferTest.ImmutableStorageOnAnAdoptedBufferHandsTheMappingBackToo", "BufferTest.IndexedBufferSizeQueryReportsTheRequestedSizeNotTheBuffersStorage", "BufferTest.MapBufferRangeAndUnmapBufferReseedAnAdoptedShaderStorageBuffer", - "BufferTest.MappedPointersHonourTheAdvertisedMapBufferAlignment", + "BufferTest.MappedPointersHonorTheAdvertisedMapBufferAlignment", "BufferTest.ParameterBufferBindingAndQuery", "BufferTest.PartialUpdate", "BufferTest.PingPong", @@ -16163,10 +16163,10 @@ "DebugTest.ALabelWrittenComesBack", "DebugTest.AMessageLongerThanTheAdvertisedLimitIsInvalidValue", "DebugTest.ANullLabelRemovesTheLabel", - "DebugTest.AnUnlabelledObjectAnswersWithAnEmptyString", + "DebugTest.AnUnlabeledObjectAnswersWithAnEmptyString", "DebugTest.DebugMessageInsertValidatesItsEnums", - "DebugTest.LabellingANonObjectTypeIsInvalidEnum", - "DebugTest.LabellingSomethingThatDoesNotExistIsInvalidValue", + "DebugTest.LabelingANonObjectTypeIsInvalidEnum", + "DebugTest.LabelingSomethingThatDoesNotExistIsInvalidValue", "DebugTest.LabelsAreScopedToTheObjectAndItsType", "DebugTest.OnlyApplicationAndThirdPartySourcesMayBePushed", "DebugTest.PoppingTheBaseGroupIsStackUnderflow", @@ -16180,7 +16180,7 @@ "DemoteFloat64Test.AComparisonAgainstANonZeroDoubleIsLeftAlone", "DemoteFloat64Test.AComparisonAgainstASmallNonZeroLiteralIsLeftAlone", "DemoteFloat64Test.AComparisonAgainstZeroIsStillRewritten", - "DemoteFloat64Test.AFloat64VertexInputIsRecognisedAndOnlyOnAVertexStage", + "DemoteFloat64Test.AFloat64VertexInputIsRecognizedAndOnlyOnAVertexStage", "DemoteFloat64Test.DeclinesAModuleThatBitcastsAcrossTheWidthBoundary", "DemoteFloat64Test.DemotesEveryWidthAndDropsTheCapability", "DemoteFloat64Test.FoldsTheConversionsThatBecameIdentities", @@ -16194,7 +16194,7 @@ "DemoteFloat64Test.TheRewriteComparesAbsAgainstTheModulesOwnZero", "DemoteFloat64Test.TheSharedChainDemotesToo", "DemoteFloat64Test.TheSharedChainKeepsFloat64WhenTheBackendConsumesIt", - "DemoteFloat64Test.TheThirtyTwoBitBehaviourIsUnchanged", + "DemoteFloat64Test.TheThirtyTwoBitBehaviorIsUnchanged", "DemotePointSizeTest.ACaptureRequestForcesTheCarrierOnANonWritingCaptureStage", "DemotePointSizeTest.AControlStageCarryingClipDistanceDeclinesTheProgram", "DemotePointSizeTest.AGeometryOnlyProgramReadsTheVertexBoundary", @@ -16299,7 +16299,7 @@ "DriverBugProbes.ImageLocationBudgetNeedsAGeometryStageThatCanHoldImages", "DriverBugProbes.ImageLocationBudgetReportsNothingWhenTheControlAlsoFails", "DriverBugProbes.ImageLocationBudgetStaysSilentOnAContextWithoutTheGeometryLimit", - "DriverBugProbes.LayeredBlitDestinationIsCleanWhenTheLayerIsHonoured", + "DriverBugProbes.LayeredBlitDestinationIsCleanWhenTheLayerIsHonored", "DriverBugProbes.LayeredBlitDestinationIsDetectedWhenTheCopyLandsOnLayerZero", "DriverBugProbes.LayeredBlitDestinationReportsNothingWhenTheBlitMovesNothing", "DriverBugProbes.LayeredBlitDestinationReportsNothingWhenTheSourceLayerIsIgnoredToo", @@ -16458,7 +16458,7 @@ "FramebufferEmit.TheDefaultFramebuffersRecordNamesNoSurfaceAShareGroupWouldHaveToHold", "FramebufferEmit.TheEmitterIsOneNeverDestroyedProcessSingleton", "FramebufferEmit.TheRecordsElevenSurfacesAreTheWholePointSetTheServerReads", - "FramebufferTest.ApplicationAlphaMaskOffIsStillHonouredOnANativeDrawBuffer", + "FramebufferTest.ApplicationAlphaMaskOffIsStillHonoredOnANativeDrawBuffer", "FramebufferTest.BindRenderbufferZeroUnbindsWithoutError", "FramebufferTest.BlitNamedFramebufferAllowsDefaultFramebufferZero", "FramebufferTest.ClearIntoAWidenedDrawBufferKeepsAlphaWritableAndSubstitutesOne", @@ -16482,7 +16482,7 @@ "FramebufferTest.FramebufferTexture3DAttachesSliceWithLayerTracking", "FramebufferTest.FramebufferTextureBumpsAttachmentVersionOnlyOnce", "FramebufferTest.FramebufferTextureLayerRejectsTheDefaultFramebufferAndBadLevels", - "FramebufferTest.FramebufferTextureRejectsAColourAttachmentPastTheLimit", + "FramebufferTest.FramebufferTextureRejectsAColorAttachmentPastTheLimit", "FramebufferTest.FramebufferTextureRejectsALevelTheTextureDoesNotHave", "FramebufferTest.FramebufferTextureRejectsTheDefaultFramebuffer", "FramebufferTest.FramebufferTextureReportsInvalidValueForANameThatWasNeverGenerated", @@ -16610,7 +16610,7 @@ "JobNodeCancel.CancelAfterCompletionDoesNotUndoTheResult", "JobNodeCancel.CancelBeforeAnyDispatchSettlesTheNodeAndSkipsTheBody", "JobNodeCancel.CancelReleasesContinuationsSoDependentsAreNotStranded", - "JobNodeCancel.CancelWhileTheBodyIsRunningLetsItFinishAndReportsCancelled", + "JobNodeCancel.CancelWhileTheBodyIsRunningLetsItFinishAndReportsCanceled", "JobNodeContinuation.AlreadyTerminalDependenciesStillSettleTheCounterExactlyOnce", "JobNodeContinuation.DependencyCounterReachesZeroExactlyOnceAndOnlyAfterEveryDependency", "JobNodeContinuation.EveryContinuationFiresExactlyOnce", @@ -16737,7 +16737,7 @@ "ParallelShaderCompileTest.ZeroCompilerThreadsJoinsPendingLinksAndTheirSpirvJobs", "PassthroughTessControlEsslTest.BakesTheDefaultTessLevelsIn", "PassthroughTessControlEsslTest.DeclaresThePatchSizeAndWritesEveryTessLevel", - "PassthroughTessControlEsslTest.MirrorsTheNeighboursPerVertexBlocks", + "PassthroughTessControlEsslTest.MirrorsTheNeighborsPerVertexBlocks", "PassthroughTessControlEsslTest.NonFiniteLevelsFollowTheDiscardRule", "PassthroughTessControlEsslTest.RequestsTheExtensionBelowEs32", "PassthroughTessControlEsslTest.SpellsIntegralLevelsAsFloatLiterals", @@ -16763,40 +16763,40 @@ "PersistentBufferOrderingProbeTest.PostCollectorIncludesTheMeasuredFinding", "PersistentBufferOrderingProbeTest.ReadbackErrorAfterAMismatchDoesNotProduceAFinding", "PersistentBufferOrderingProbeTest.RequiresExtensionAndCompleteDispatchBeforeAllocating", - "PipeCatalogue.ApplierAcceptsAWellFormedRecord", - "PipeCatalogue.BufferRangeCarriesNoInlineHostSpan", - "PipeCatalogue.CoverageAccountsForEveryInventoryRow", - "PipeCatalogue.EntryCountMatchesTheDocumentedCount", - "PipeCatalogue.EveryRowCarriesTheWaitClassTheContractGivesIt", - "PipeCatalogue.EveryTextureTargetMapsToItsOwnResourceTarget", - "PipeCatalogue.EveryUnmigratedEmulationIsNamedOnce", - "PipeCatalogue.ExactlyTheRoutedRowsAreInstalledAndTheRestAreStillNull", - "PipeCatalogue.FloatVectorsCompareBitwise", - "PipeCatalogue.FrontendNeverTakesAnApplierAddress", - "PipeCatalogue.GeneratedTablesHoldTheWholeCatalogue", - "PipeCatalogue.HandleIsEightBytes", - "PipeCatalogue.HostSpanResolvesTheMonolithPointer", - "PipeCatalogue.LateArrivalsAreAppendedWithoutRenumbering", - "PipeCatalogue.PipeInputFieldsStartUnfilled", - "PipeCatalogue.PipelineSubsetMembersArePinned", - "PipeCatalogue.ResidualBlockIsExactlyItsTwoValueStructsPlusPatchTail", - "PipeCatalogue.ResidualBlockSizeIsPinned", - "PipeCatalogue.ResourceRespecifyAcksOnlyImmutableStorage", - "PipeCatalogue.ReverseChannelHasTenCallbacks", - "PipeCatalogue.SixValueStructsHaveFieldLists", - "PipeCatalogue.StickyFieldsAreExactlyTheSeven", - "PipeCatalogue.SubDataBufferRangeRidesInTheUnionBox", - "PipeCatalogue.SubDataTargetPacksAResourceTargetAndAnUploadTarget", - "PipeCatalogue.SurfaceNamesItsKindItsTextureTargetAndItsDepthStencilAspect", - "PipeCatalogue.TextureParamsNameTheirBuiltinSamplerAndFramebufferStateNamesItsTarget", - "PipeCatalogue.TheCompositeShaderBandIsCountedApartFromTheOrdinarySpace", - "PipeCatalogue.UninstalledTablesAreAllNull", - "PipeCatalogue.ValueTypeLayoutsArePinned", - "PipeCatalogue.VerbTableIsTheFunctionTable", - "PipeCatalogue.VerifyComparatorNamesTheDifferingField", - "PipeCatalogue.VertexBufferSetCarriesAnExplicitBaseInstance", - "PipeCatalogue.VertexWireViewsAreFlatAndCarryIsLongSeparately", - "PipeCatalogue.WireOpcodesAreThePositionsInTheCatalogue", + "PipeCatalog.ApplierAcceptsAWellFormedRecord", + "PipeCatalog.BufferRangeCarriesNoInlineHostSpan", + "PipeCatalog.CoverageAccountsForEveryInventoryRow", + "PipeCatalog.EntryCountMatchesTheDocumentedCount", + "PipeCatalog.EveryRowCarriesTheWaitClassTheContractGivesIt", + "PipeCatalog.EveryTextureTargetMapsToItsOwnResourceTarget", + "PipeCatalog.EveryUnmigratedEmulationIsNamedOnce", + "PipeCatalog.ExactlyTheRoutedRowsAreInstalledAndTheRestAreStillNull", + "PipeCatalog.FloatVectorsCompareBitwise", + "PipeCatalog.FrontendNeverTakesAnApplierAddress", + "PipeCatalog.GeneratedTablesHoldTheWholeCatalog", + "PipeCatalog.HandleIsEightBytes", + "PipeCatalog.HostSpanResolvesTheMonolithPointer", + "PipeCatalog.LateArrivalsAreAppendedWithoutRenumbering", + "PipeCatalog.PipeInputFieldsStartUnfilled", + "PipeCatalog.PipelineSubsetMembersArePinned", + "PipeCatalog.ResidualBlockIsExactlyItsTwoValueStructsPlusPatchTail", + "PipeCatalog.ResidualBlockSizeIsPinned", + "PipeCatalog.ResourceRespecifyAcksOnlyImmutableStorage", + "PipeCatalog.ReverseChannelHasTenCallbacks", + "PipeCatalog.SixValueStructsHaveFieldLists", + "PipeCatalog.StickyFieldsAreExactlyTheSeven", + "PipeCatalog.SubDataBufferRangeRidesInTheUnionBox", + "PipeCatalog.SubDataTargetPacksAResourceTargetAndAnUploadTarget", + "PipeCatalog.SurfaceNamesItsKindItsTextureTargetAndItsDepthStencilAspect", + "PipeCatalog.TextureParamsNameTheirBuiltinSamplerAndFramebufferStateNamesItsTarget", + "PipeCatalog.TheCompositeShaderBandIsCountedApartFromTheOrdinarySpace", + "PipeCatalog.UninstalledTablesAreAllNull", + "PipeCatalog.ValueTypeLayoutsArePinned", + "PipeCatalog.VerbTableIsTheFunctionTable", + "PipeCatalog.VerifyComparatorNamesTheDifferingField", + "PipeCatalog.VertexBufferSetCarriesAnExplicitBaseInstance", + "PipeCatalog.VertexWireViewsAreFlatAndCarryIsLongSeparately", + "PipeCatalog.WireOpcodesAreThePositionsInTheCatalog", "PipeInputsTest.AFrontendMutationInsideAVerbDoesNotDivergeAtRead", "PipeInputsTest.AFrontendMutationInsideAVerbRefreshesThePushedField", "PipeInputsTest.BadVerifyCorruptKnobIsFatalNamingTheKnob", @@ -16871,7 +16871,7 @@ "PrimitivesGeneratedNoXfbArmingTest.ForceOffNeverReroutes", "PrimitivesGeneratedNoXfbArmingTest.ForceOnBypassesTheVerdictButNeverTheStructuralChecks", "PrimitivesGeneratedNoXfbProbeTeardownTest.AFenceTimeoutLeaksEverythingAndReportsItself", - "PrimitivesGeneratedNoXfbProbeTeardownTest.ASignalledFenceTearsDownNormally", + "PrimitivesGeneratedNoXfbProbeTeardownTest.ASignaledFenceTearsDownNormally", "PrimitivesGeneratedNoXfbVerdictTest.AConformingDriverReadsStreamCounts", "PrimitivesGeneratedNoXfbVerdictTest.ASilentDedicatedQueryFallsThroughToStatistics", "PrimitivesGeneratedNoXfbVerdictTest.ASubstituteWorseThanTheStreamOnAnyShapeIsRefused", @@ -16897,7 +16897,7 @@ "ProgramArtifactsCodec.RoundTripsAFullyPopulatedArchive", "ProgramArtifactsCodec.TheTablesVisitEveryMemberExceptTheLiveProgram", "ProgramEmit.ACreateStoresTheDescriptorAndARelinkCountsUpAndDropsTheBlockKeyedToTheOldLayout", - "ProgramEmit.ACreateWithNoArtefactsAnOversizedBlockOrACorruptSlotIsRefusedNamingTheProgram", + "ProgramEmit.ACreateWithNoArtifactsAnOversizedBlockOrACorruptSlotIsRefusedNamingTheProgram", "ProgramEmit.ADeadProgramsRecordLatchIsRetiredAtItsDeath", "ProgramEmit.ADeleteDropsTheRecordAndClearsEveryBindingThatNamedIt", "ProgramEmit.AFailedRelinkReIssuesWithLinkStatusZeroAndNeverAnObjectDeath", @@ -16993,7 +16993,7 @@ "ProgramTest.DoWhileDeadLoopUniformsKeepBackingStorage", "ProgramTest.ExplicitUniformLocationOverlapAcrossStagesFailsLink", "ProgramTest.ExplicitUniformLocationsHonoredForPlainAndOpaqueUniforms", - "ProgramTest.ExplicitUniformLocationsHonourMaxUniformLocations", + "ProgramTest.ExplicitUniformLocationsHonorMaxUniformLocations", "ProgramTest.FailedCompileIsMemoizedAndStillRecoversOnGoodSource", "ProgramTest.FragmentOutputsMayShareALocationWhenTheirColorIndexDiffers", "ProgramTest.FragmentOutputsSharingAColorNumberAtTheSameIndexStillFailToLink", @@ -17116,7 +17116,7 @@ "ProgramUtilTest.MidLineVersionDetectionSurvivesALongDirectiveFreeBody", "ProgramUtilTest.NoperspectiveInterpolationSurvivesToEssl", "ProgramUtilTest.NumSamplesShimDoesNotDoubleInject", - "ProgramUtilTest.NumSamplesShimHonoursTheVersionAndExtensionGate", + "ProgramUtilTest.NumSamplesShimHonorsTheVersionAndExtensionGate", "ProgramUtilTest.NumSamplesShimIgnoresCommentedAndPartialTokens", "ProgramUtilTest.NumSamplesShimIsFragmentStageOnly", "ProgramUtilTest.OnlyAnExactVersionRepeatIsElided", @@ -17298,7 +17298,7 @@ "ResourceEmit.ADrawTimeIndexBindingPublishesElementArrayEvenWhenTheRespecifyCannotSeeIt", "ResourceEmit.APerLevelRespecifyCoveringItsDeclaredRangeKeepsTheOtherLevelsTexels", "ResourceEmit.APerLevelRespecifyThatDoesNotCoverItsDeclaredRangeIsRefusedByName", - "ResourceEmit.AResourceTargetOrKindTheCatalogueDoesNotNameIsRefusedRatherThanRouted", + "ResourceEmit.AResourceTargetOrKindTheCatalogDoesNotNameIsRefusedRatherThanRouted", "ResourceEmit.ARespecifyPublishesTheCreateAHandleNeverGot", "ResourceEmit.ARespecifyReplacesTheDescriptorAndOnlyAMutationMovesTheSerial", "ResourceEmit.ASlotOutsideTheRecordTablesBoundIsRefusedRatherThanAllocated", @@ -17327,7 +17327,7 @@ "RetargetTextureBufferExtensionTest.ExtDriverKeepsWhatSpirvCrossEmitted", "RetargetTextureBufferExtensionTest.OesOnlyDriverGetsTheOesDirective", "RetargetTextureBufferExtensionTest.OnlyExtensionDirectivesAreRewritten", - "RetargetTextureBufferExtensionTest.SpacedDirectiveIsRewrittenAndNeighboursAreLeftAlone", + "RetargetTextureBufferExtensionTest.SpacedDirectiveIsRewrittenAndNeighborsAreLeftAlone", "SamplerEmit.ABorderColorFormChangeAloneMintsANewCso", "SamplerEmit.ABoundSamplerStateHoldsItsCsoUntilTheUnitMoves", "SamplerEmit.ACreateStoresTheParametersByValueAndAReissueOnALiveIdentityCountsUp", @@ -17367,7 +17367,7 @@ "ShaderBufferEmit.OnlyTheWritableClassesSetAMaskAndItReachesTheLastPoint", "ShaderBufferEmit.TheAppliedWindowIsPerClassAndTheSerialMovesOnEveryRecord", "ShaderBufferEmit.TheEmitterIsOneNeverDestroyedProcessSingleton", - "ShaderCompileAdoptionMapTest.CancelledNodeIsNotAdoptedAndIsPruned", + "ShaderCompileAdoptionMapTest.CanceledNodeIsNotAdoptedAndIsPruned", "ShaderCompileAdoptionMapTest.EnvFingerprintMismatchIsNotAdopted", "ShaderCompileAdoptionMapTest.ExpiredNodeIsNotAdoptedAndIsPruned", "ShaderCompileAdoptionMapTest.RegisteredNodeIsAdoptedOnAnExactMatch", @@ -17748,7 +17748,7 @@ "TextureViewTest.ViewDerivesItsRangeAndInheritsImmutableLevels", "TextureViewTest.ViewOfAViewComposesOntoTheOriginalRatherThanRestarting", "TextureViewTest.ZeroTextureIsInvalidValue", - "Tracker.SubsystemBitsDoNotOverlapTheBehaviourBit", + "Tracker.SubsystemBitsDoNotOverlapTheBehaviorBit", "TrackerAggregates.ABufferRespecifyMovesOnlyTheBufferAggregate", "TrackerAggregates.AFramebufferDefaultSetterMovesOnlyTheFramebufferAggregate", "TrackerAggregates.AFramebufferObjectWriteMovesOnlyTheFramebufferAggregate", @@ -17970,7 +17970,7 @@ "DirectGLES.Verify.GenerateMipmapServerScenario.Rgb16fRenderTargetBaseGeneratesFromTheGpuWrittenLevel", "DirectGLES.Verify.GenerateMipmapServerScenario.Rgb16fUploadedBaseWithARefusedReadbackIsFilteredFromTheStore", "DirectGLES.Verify.GenerateMipmapServerScenario.Rgb32fRenderTargetBaseGeneratesFromTheGpuWrittenLevel", - "DirectGLES.Verify.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Verify.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Verify.HandleRecycleScenario.ABufferAtARecycledAddressDoesNotInheritItsPredecessorsContents", "DirectGLES.Verify.HandleRecycleScenario.AFramebufferAtARecycledAddressDoesNotInheritItsPredecessorsTwin", "DirectGLES.Verify.HandleRecycleScenario.AProgramAtARecycledAddressDoesNotInheritItsPredecessorsShaderCso", @@ -18132,7 +18132,7 @@ "DirectVulkan.Verify.TextureUploadShapeScenario.TheEmittedUploadShapeIsRecordedAndTheTwoSidesAgree", "DirectVulkan.Verify.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.Verify.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.Verify.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.Verify.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.Verify.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", "DirectVulkan.Verify.UnlocatedIoBlockScenario.TheEmulationIsActuallyArmedWhenTheEnvironmentPinsItOn", "DirectVulkan.Verify.ViewportArrayScenario.WithoutTheEmulationEveryIndexCollapsesOntoViewportZero", @@ -18158,14 +18158,14 @@ "DirectGLES.Verify.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectGLES.Verify.AsyncCompileScenario.IrisShapedTwoPhaseBatchRendersCorrectly", "DirectGLES.Verify.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectGLES.Verify.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectGLES.Verify.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectGLES.Verify.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectGLES.Verify.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectGLES.Verify.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectGLES.Verify.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectGLES.Verify.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectGLES.Verify.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectGLES.Verify.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectGLES.Verify.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectGLES.Verify.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectGLES.Verify.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectGLES.Verify.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -18193,11 +18193,11 @@ "DirectGLES.Verify.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectGLES.Verify.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectGLES.Verify.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectGLES.Verify.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectGLES.Verify.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectGLES.Verify.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectGLES.Verify.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectGLES.Verify.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectGLES.Verify.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectGLES.Verify.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectGLES.Verify.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectGLES.Verify.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectGLES.Verify.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -18243,7 +18243,7 @@ "DirectGLES.Verify.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectGLES.Verify.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectGLES.Verify.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectGLES.Verify.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectGLES.Verify.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectGLES.Verify.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectGLES.Verify.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectGLES.Verify.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -18312,7 +18312,7 @@ "DirectGLES.Verify.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectGLES.Verify.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectGLES.Verify.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectGLES.Verify.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectGLES.Verify.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectGLES.Verify.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectGLES.Verify.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectGLES.Verify.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -18410,9 +18410,9 @@ "DirectGLES.Verify.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectGLES.Verify.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectGLES.Verify.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectGLES.Verify.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectGLES.Verify.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectGLES.Verify.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectGLES.Verify.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectGLES.Verify.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectGLES.Verify.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectGLES.Verify.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectGLES.Verify.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectGLES.Verify.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -18448,8 +18448,8 @@ "DirectGLES.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectGLES.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectGLES.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectGLES.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectGLES.Verify.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectGLES.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectGLES.Verify.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectGLES.Verify.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectGLES.Verify.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectGLES.Verify.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -18557,7 +18557,7 @@ "DirectGLES.Verify.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectGLES.Verify.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectGLES.Verify.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectGLES.Verify.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectGLES.Verify.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectGLES.Verify.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectGLES.Verify.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectGLES.Verify.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -18573,7 +18573,7 @@ "DirectGLES.Verify.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectGLES.Verify.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectGLES.Verify.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectGLES.Verify.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectGLES.Verify.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectGLES.Verify.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectGLES.Verify.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectGLES.Verify.PrimitivesGeneratedNoXfbScenario.APausedSpanCountsACpuPricedDrawExactlyOnce", @@ -18614,8 +18614,8 @@ "DirectGLES.Verify.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectGLES.Verify.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectGLES.Verify.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectGLES.Verify.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectGLES.Verify.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectGLES.Verify.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectGLES.Verify.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectGLES.Verify.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectGLES.Verify.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectGLES.Verify.SpirvShaderBinaryScenario.AnUnsupportedBinaryFormatIsRejectedInsteadOfSilentlyAccepted", @@ -18689,7 +18689,7 @@ "DirectGLES.Verify.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectGLES.Verify.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectGLES.Verify.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectGLES.Verify.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectGLES.Verify.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectGLES.Verify.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectGLES.Verify.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectGLES.Verify.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", @@ -18792,14 +18792,14 @@ "DirectVulkan.Verify.AsyncCompileScenario.ExtensionStringMatchesTheConfiguration", "DirectVulkan.Verify.AsyncCompileScenario.IrisShapedTwoPhaseBatchRendersCorrectly", "DirectVulkan.Verify.AsyncCompileScenario.ZeroCompilerThreadsSettlesEverythingImmediately", - "DirectVulkan.Verify.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbour", + "DirectVulkan.Verify.AtomicCounterScenario.APartialSubDataBetweenDispatchesKeepsTheShaderWrittenNeighbor", "DirectVulkan.Verify.AtomicCounterScenario.CountersAccumulateAcrossDispatchesAndFollowAReseed", "DirectVulkan.Verify.AtomicCounterScenario.DispatchIncrementsTheBoundCounterBuffers", "DirectVulkan.Verify.AtomicCounterScenario.SubDataAfterDispatchSurvivesAnImmediateReadback", "DirectVulkan.Verify.BandedReadbackScenario.AReadLargerThanTheWholeReplySegmentIsBanded", "DirectVulkan.Verify.BandedReadbackScenario.BandedDepthAndDepthStencilReads", "DirectVulkan.Verify.BandedReadbackScenario.BandedReadIntoAPixelPackBufferKeepsItsPadding", - "DirectVulkan.Verify.BandedReadbackScenario.BandedReadsHonourPackAlignmentRowLengthAndSkips", + "DirectVulkan.Verify.BandedReadbackScenario.BandedReadsHonorPackAlignmentRowLengthAndSkips", "DirectVulkan.Verify.BandedReadbackScenario.GetTexImageLargerThanAReplySlotIsWindowed", "DirectVulkan.Verify.BandedReadbackScenario.RenderbufferReadOfExactlyTwoMiBIsBandedNotRefused", "DirectVulkan.Verify.BandedReadbackScenario.TwoMiBPlusOneRowIsBanded", @@ -18827,11 +18827,11 @@ "DirectVulkan.Verify.ClipDistanceScenario.EnableIsObservableThroughIsEnabled", "DirectVulkan.Verify.ClipDistanceScenario.TheEnablesAreIndependentPerDistance", "DirectVulkan.Verify.CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice", - "DirectVulkan.Verify.CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets", + "DirectVulkan.Verify.CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets", "DirectVulkan.Verify.CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice", "DirectVulkan.Verify.CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice", "DirectVulkan.Verify.CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel", - "DirectVulkan.Verify.CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ", + "DirectVulkan.Verify.CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ", "DirectVulkan.Verify.CopyImageLevelRangeScenario.AValidLevelZeroCopyStillMovesPixels", "DirectVulkan.Verify.CopyImageLevelRangeScenario.LevelOneOfASingleLevelTextureIsRejected", "DirectVulkan.Verify.CopyImageLevelRangeScenario.LevelOneOfATwoLevelTextureIsAccepted", @@ -18876,7 +18876,7 @@ "DirectVulkan.Verify.DepthStencilReadbackMatrixScenario.ASubRectangleReadsTheRightBandInTheRightOrder", "DirectVulkan.Verify.DepthStencilReadbackMatrixScenario.CopyTexImageFromADepthAttachmentSurvivesAReadBack", "DirectVulkan.Verify.DepthStencilReadbackMatrixScenario.DepthAndStencilConvertIntoEveryClientWidth", - "DirectVulkan.Verify.DepthStencilReadbackMatrixScenario.DepthReadbackHonoursThePackPixelStoreParameters", + "DirectVulkan.Verify.DepthStencilReadbackMatrixScenario.DepthReadbackHonorsThePackPixelStoreParameters", "DirectVulkan.Verify.DepthStencilReadbackMatrixScenario.EverySourceKindReadsItsClearBack", "DirectVulkan.Verify.DepthStencilReadbackMatrixScenario.GetTexImageReadsAPackedDepthStencilTexture", "DirectVulkan.Verify.DepthStencilReadbackMatrixScenario.PackedDepthStencilReadPixelsCarriesBothAspects", @@ -18945,7 +18945,7 @@ "DirectVulkan.Verify.GeometryDrawModeScenario.LinesInGeometryProgramStillAcceptsLineModesOnly", "DirectVulkan.Verify.GeometryDrawModeScenario.PointsInGeometryProgramRejectsEveryOtherMode", "DirectVulkan.Verify.GeometryDrawModeScenario.PointsInGeometryProgramRejectsNonPointModesOnFeedbackDraws", - "DirectVulkan.Verify.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonouredOrDeclinedCleanly", + "DirectVulkan.Verify.Glsl420DeclarationScenario.AnArrayOfSamplerArraysIsHonoredOrDeclinedCleanly", "DirectVulkan.Verify.Glsl420DeclarationScenario.AnAtomicCounterCompilesWithoutTheSsboExtension", "DirectVulkan.Verify.Glsl420DeclarationScenario.AnExplicitDefaultColorIndexStillDraws", "DirectVulkan.Verify.Glsl420DeclarationScenario.InvariantIsAcceptedOnANonVertexStageInput", @@ -19043,9 +19043,9 @@ "DirectVulkan.Verify.IntegerBorderColorScenario.ANegativeBorderOnAnUnsignedFormatClampsToTheFormatsMaximum", "DirectVulkan.Verify.IntegerBorderColorScenario.ASignedIntegerBorderIsClampedToTheFormatsRepresentableRange", "DirectVulkan.Verify.IntegerBorderColorScenario.AnOversizedUnsignedBorderIsClampedToTheFormatsMaximum", - "DirectVulkan.Verify.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColour", - "DirectVulkan.Verify.IntegerBorderColorScenario.SamplerParameterIivBorderColourSurvivesToAnIntegerSampler", - "DirectVulkan.Verify.IntegerBorderColorScenario.TexParameterIivBorderColourSurvivesToAnIntegerSampler", + "DirectVulkan.Verify.IntegerBorderColorScenario.InsideTexelsAreUnaffectedByTheBorderColor", + "DirectVulkan.Verify.IntegerBorderColorScenario.SamplerParameterIivBorderColorSurvivesToAnIntegerSampler", + "DirectVulkan.Verify.IntegerBorderColorScenario.TexParameterIivBorderColorSurvivesToAnIntegerSampler", "DirectVulkan.Verify.InvalidImageUnitScenario.ALayerPastAnArraysLastSliceReadsZero", "DirectVulkan.Verify.InvalidImageUnitScenario.ALevelPastATextureViewsWindowReadsZero", "DirectVulkan.Verify.InvalidImageUnitScenario.ALevelPastAnImmutableTexturesStorageReadsZero", @@ -19081,8 +19081,8 @@ "DirectVulkan.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapArrayColorAttachmentReachesEveryLayerFace", "DirectVulkan.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthAttachmentGatesEveryLayerFace", "DirectVulkan.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapArrayDepthStencilAttachmentGatesEveryLayerFace", - "DirectVulkan.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterialisedBySamplingReachesEveryFace", - "DirectVulkan.Verify.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterialisedBySamplingReachesEveryLayer", + "DirectVulkan.Verify.LayeredAttachmentShapeScenario.LayeredCubeMapClearMaterializedBySamplingReachesEveryFace", + "DirectVulkan.Verify.LayeredAttachmentShapeScenario.LayeredOneDArrayClearMaterializedBySamplingReachesEveryLayer", "DirectVulkan.Verify.LayeredAttachmentShapeScenario.LayeredThreeDColorAttachmentReachesEverySlice", "DirectVulkan.Verify.LayeredAttachmentShapeScenario.NonLayeredThreeDSliceAttachmentWritesOnlyThatSlice", "DirectVulkan.Verify.LayeredTextureReadbackScenario.GetTexImageReturnsEveryLayerFaceOfACubeMapArray", @@ -19190,7 +19190,7 @@ "DirectVulkan.Verify.PipelineFailureScenario.SamplerArrayInAStructDrawsWithoutKillingTheProcess", "DirectVulkan.Verify.PipelineFailureScenario.TheSameDrawRepeatsIdenticallyWithNoPoisonedPipelineCache", "DirectVulkan.Verify.PixelStoreSweepScenario.DefaultStateSurvivesTheFullModeSweep", - "DirectVulkan.Verify.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonoursPackStateAndLeavesTheGapsAlone", + "DirectVulkan.Verify.PixelStoreSweepScenario.ReadPixelsIntoAPackBufferHonorsPackStateAndLeavesTheGapsAlone", "DirectVulkan.Verify.PixelStoreSweepScenario.ReadPixelsSwapsUnsignedShortComponentsAndPreservesPackGaps", "DirectVulkan.Verify.PointSizeDemotionScenario.ACaptureSurvivesAStageThatOnlyReadsThePointSize", "DirectVulkan.Verify.PointSizeDemotionScenario.AGeometryOnlyChainCarriesTheVertexValue", @@ -19206,7 +19206,7 @@ "DirectVulkan.Verify.PrimitiveRestartScenario.ARestartIndexTooLargeForTheIndexTypeRestartsNowhere", "DirectVulkan.Verify.PrimitiveRestartScenario.AnAllOnesVertexIndexSurvivesTheSubstitution", "DirectVulkan.Verify.PrimitiveRestartScenario.AnArbitraryRestartIndexDrawsInsteadOfKillingTheProcess", - "DirectVulkan.Verify.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonoured", + "DirectVulkan.Verify.PrimitiveRestartScenario.ChangingTheRestartIndexBetweenDrawsIsHonored", "DirectVulkan.Verify.PrimitiveRestartScenario.TheFixedIndexValueTakesTheForwardingPath", "DirectVulkan.Verify.PrimitiveRestartScenario.WithoutTheCapTheStripWeldsAcrossTheGap", "DirectVulkan.Verify.PrimitivesGeneratedNoXfbScenario.APausedSpanCountsACpuPricedDrawExactlyOnce", @@ -19247,8 +19247,8 @@ "DirectVulkan.Verify.SampleMaskScopeScenario.TheAdvertisedSampleMaskWordCountMatchesWhatSampleMaskiAccepts", "DirectVulkan.Verify.SampleVariablesScenario.GlNumSamplesFollowsTheDrawFramebuffersSampleCount", "DirectVulkan.Verify.SampleVariablesScenario.SampleShadingStateReachesTheBackendWithoutDisturbingTheDraw", - "DirectVulkan.Verify.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenAFilterChangeCompletesTheTexture", - "DirectVulkan.Verify.SampledSetStalenessScenario.AQueuedClearIsMaterialisedWhenASamplerObjectCompletesTheTexture", + "DirectVulkan.Verify.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenAFilterChangeCompletesTheTexture", + "DirectVulkan.Verify.SampledSetStalenessScenario.AQueuedClearIsMaterializedWhenASamplerObjectCompletesTheTexture", "DirectVulkan.Verify.SnormAttachmentScenario.SignedNormalizedAttachmentsRoundTripTheirChannelValues", "DirectVulkan.Verify.SnormAttachmentScenario.SignedNormalizedColorAttachmentsReportComplete", "DirectVulkan.Verify.SpirvShaderBinaryScenario.AnUnsupportedBinaryFormatIsRejectedInsteadOfSilentlyAccepted", @@ -19322,7 +19322,7 @@ "DirectVulkan.Verify.TextureViewScenario.WritingThroughALayerSlicedViewLandsOnItsOwnLayers", "DirectVulkan.Verify.ThreeChannelAttachmentScenario.DstAlphaBlendingSeesOneInAWidenedAttachment", "DirectVulkan.Verify.ThreeChannelAttachmentScenario.ThreeChannelColorAttachmentsReportComplete", - "DirectVulkan.Verify.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighbourKeepsItsAlpha", + "DirectVulkan.Verify.ThreeChannelAttachmentScenario.WidenedAttachmentReadsBackOpaqueWhileItsNeighborKeepsItsAlpha", "DirectVulkan.Verify.TriangleScenario.AVboBackedTriangleReachesReadPixels", "DirectVulkan.Verify.TriangleScenario.TheSameVboAndVaoRedrawAcrossAFrameBoundary", "DirectVulkan.Verify.TriangleScenario.TheServerStampedAVerbBoundaryOnThisDrawingFrame", diff --git a/scripts/gen_pipe_dirty_surface.py b/scripts/gen_pipe_dirty_surface.py index 336077b3..9d3e5964 100644 --- a/scripts/gen_pipe_dirty_surface.py +++ b/scripts/gen_pipe_dirty_surface.py @@ -669,7 +669,7 @@ def expand_macros(masked, expandable, rounds=4): return text -def unmodelled_sites(body, relative, pasting): +def unmodeled_sites(body, relative, pasting): """The preprocessor constructs in `body` this script does NOT model, as taint reasons: a token paste it could not expand, and a call to a pasting macro it refused.""" sites = set() @@ -954,14 +954,14 @@ def state_bodies(): body = expanded[start:end] bodies.setdefault(fn, []).append(body) signatures.setdefault(fn, []).append(params) - sites = unmodelled_sites(body, relative, pasting) + sites = unmodeled_sites(body, relative, pasting) if sites: taints.setdefault(fn, set()) taints[fn] |= sites return bodies, signatures, taints, paths -def writers_outside(analysed): +def writers_outside(analyzed): """{MEM token: a file OUTSIDE the analyzed roots that writes it}. The absence claim is only as good as the set of writers the analysis reads. Every .h/.cpp @@ -976,7 +976,7 @@ def writers_outside(analysed): This scan is textual and file-wide: it sees a direct member write and a member-rooted one, not a write through a reference or a mutating call. It is the containment check for code the analysis does not read, and that is the limit of what it can say.""" - seen = set(analysed) + seen = set(analyzed) out = {} for path in source_files(MOBILEGL_ROOT): if path in seen: @@ -1541,7 +1541,7 @@ void Fixture::WriteWholeMember(const RenderStateParameters& fresh) { """ -def analyse_snippet(text): +def analyze_snippet(text): """{function name: (tokens, taints)} for a synthetic source text, through the same extractor the real tree goes through (no macros: the text has none).""" masked = mask_comments_and_strings(text) @@ -1710,7 +1710,7 @@ def self_test(scanned, bits, publishers, movers, moved, outside=None, undecided_ # shutter reads", said about a body that writes m_parameters through a range-for # reference; the collapse that followed was every setter "supporting" the patch # bit because the shutter resolved to the whole struct. - snippet = analyse_snippet(SELF_TEST_BODIES) + snippet = analyze_snippet(SELF_TEST_BODIES) patch_shutter = {"MEM:m_parameters", "FIELD:m_parameters.PatchVertices", "FIELD:m_parameters.PatchDefaultOuterLevel", "FIELD:m_parameters.PatchDefaultInnerLevel"} @@ -1912,9 +1912,9 @@ def main(): publishers = render_state_publishers() if not publishers: sys.exit("could not derive any RenderState setter out of %s" % RENDER_STATE_PATH) - bodies, signatures, taints, analysed = state_bodies() + bodies, signatures, taints, analyzed = state_bodies() reach, own_taints = written_tokens(bodies, signatures, taints) - outside = writers_outside(analysed) + outside = writers_outside(analyzed) aggregates = aggregate_tokens(bodies, reach) moved = {name: expand_aggregates(tokens, aggregates) for name, tokens in reach.items()} readers = shutter_readers() @@ -1969,7 +1969,7 @@ def main(): "written outside those roots and any absence claim over one is undecided; a " "mutating call on a member-rooted lvalue and a call resolved by name both only " "WIDEN what a mutator is credited with, and a FIELD token is not scoped to a type" - % (sum(len(v) for v in bodies.values()), len(analysed), + % (sum(len(v) for v in bodies.values()), len(analyzed), " + ".join(os.path.relpath(root, REPO_ROOT).replace(os.sep, "/") for root in STATE_ROOTS), len(own_taints), diff --git a/scripts/p4a_descriptor_negative_control.sh b/scripts/p4a_descriptor_negative_control.sh index 6f05dd4f..765621d6 100644 --- a/scripts/p4a_descriptor_negative_control.sh +++ b/scripts/p4a_descriptor_negative_control.sh @@ -239,7 +239,7 @@ INTERRUPTED="" note_interrupt() { [ -n "$INTERRUPTED" ] || INTERRUPTED=$1; } # 128 + signal number is how a shell reports a child that died on a signal; nothing this script # runs exits above 128 for any other reason (ctest uses 8 for failing tests). -child_was_signalled() { [ "${1:-0}" -ge 128 ]; } +child_was_signaled() { [ "${1:-0}" -ge 128 ]; } trap 'note_interrupt INT; repair; trap - INT; kill -INT $$' INT trap 'note_interrupt TERM; repair; trap - TERM; kill -TERM $$' TERM # The EXIT trap covers the paths that leave through an early `exit` with a header still patched @@ -381,7 +381,7 @@ PY say "[$tag] rebuilding with the dropped field" cmake --build "$BUILD_DIR" -j "$(nproc)" "$LOG_DIR/build-after-$tag.log" 2>&1 buildRc=$? - if child_was_signalled "$buildRc" || [ -n "$INTERRUPTED" ]; then + if child_was_signaled "$buildRc" || [ -n "$INTERRUPTED" ]; then note_interrupt "exit $buildRc" say "[$tag] INTERRUPTED during the rebuild ($INTERRUPTED). Repairing the tree and stopping:" say "a run that carried on here would report a verdict about a control that never ran." @@ -408,7 +408,7 @@ PY ctest --test-dir "$BUILD_DIR" -R "$test" --no-tests=error --output-on-failure "$LOG_DIR/ctest-after-$tag.log" 2>&1 ctestRc=$? - if child_was_signalled "$ctestRc" || [ -n "$INTERRUPTED" ]; then + if child_was_signaled "$ctestRc" || [ -n "$INTERRUPTED" ]; then note_interrupt "exit $ctestRc" say "[$tag] INTERRUPTED while running $test ($INTERRUPTED). A suite that was killed is not a" say "suite that went red: repairing the tree and stopping rather than scoring the control." diff --git a/scripts/symbol_report.py b/scripts/symbol_report.py index 0c2a87a1..3c21e2ed 100644 --- a/scripts/symbol_report.py +++ b/scripts/symbol_report.py @@ -134,7 +134,7 @@ def parent_scope(prefix): return body[:cut + 2] if cut >= 0 else "" -def normalise(name, strip_scopes, rename_map): +def normalize(name, strip_scopes, rename_map): """Textual folding of the demangled name: this is what makes a de-nesting a rename.""" for scope in strip_scopes: name = name.replace(scope, parent_scope(scope)) @@ -158,7 +158,7 @@ def build_side(path, nm_tool, size_tool, cxxfilt, strip_scopes, rename_map, cann demangled = demangle(raw.keys(), cxxfilt) table = {} for mangled, (kind, size) in raw.items(): - key = normalise(demangled.get(mangled, mangled), strip_scopes, rename_map) + key = normalize(demangled.get(mangled, mangled), strip_scopes, rename_map) table.setdefault(key, []).append({"mangled": mangled, "type": kind, "size": size or 0, "demangled": demangled.get(mangled, mangled)}) diff --git a/tools/anland-mobilegl-plasma/SKILL.md b/tools/anland-mobilegl-plasma/SKILL.md index c5e775ae..dc97c3d3 100644 --- a/tools/anland-mobilegl-plasma/SKILL.md +++ b/tools/anland-mobilegl-plasma/SKILL.md @@ -25,7 +25,7 @@ nobody else is mid-test. Use your own `ct.sh` channel names (others use c, c2, 6. `desktop-session.service` (User=swung0x48, **enabled**: the container boots straight into it, as the original image does) has drop-in `/etc/systemd/system/desktop-session.service.d/mobilegl.conf` (anland `producers/kde/Arch_v5/desktop-session-mobilegl.conf`, installed + enabled by `sync-build-kwin.sh`): `ExecStartPre=mobilegl-startup.sh wait` (until `@anland-mobilegl` listens in `/proc/net/unix` and the daemon socket exists), `ExecStartPre=+... sync-backend`, `Restart=always`, then `ExecStart=/opt/mobilegl/bin/mobilegl-startup.sh plasma`, which deletes the sticky software-renderer key, sets `MOBILEGL_IPC_PROBE_TIMEOUT_MS=0` session-wide (MobileGL never declines, so glvnd never falls through to another GL stack), writes a user drop-in for `plasma-kwin_wayland.service` (kwin_wayland_wrapper -> `/opt/mobilegl/kwin/bin/kwin_wayland` + `/opt/mobilegl/kwin/lib/libkwin.so.6.7.4`, `ANLAND_MOBILEGL=1`, `MOBILEGL_IPC_SURFACE=server`) and runs `startplasma-wayland`. 7. KWin 6.7.4 with anland's `anland` backend renders straight into the anland Android Surface through the server. While the window is not on screen (consumer disconnected) the backend powers its output down (DPMS Off + RenderLoop inhibited: no compositing, no frame callbacks) and back up when the window returns. Every other GL process is `MOBILEGL_IPC_SURFACE=offscreen` and presents through KWin. 8. Client = `/opt/mobilegl/lib/libMobileGL.so` (glibc aarch64), the container's **system-wide** GL vendor (section below): glvnd EGL vendor `/usr/share/glvnd/egl_vendor.d/10_mobilegl.json` (sorts before the distribution's `50_*.json`, which serves whenever MobileGL declines), GLX vendor `/usr/lib/libGLX_mobilegl.so.0`, settings from `/etc/mobilegl/client.conf` (`MOBILEGL_TRANSPORT=spawn MOBILEGL_IPC_DATA=shm MOBILEGL_IPC_CONTROL=unix:@anland-mobilegl`) + `/etc/mobilegl/backend`. No per-process environment is needed. -9. Zero-copy windows: client `wl_egl_window` frames are server-allocated AHardwareBuffer "shared images" exported as dma-buf fds over `zwp_linux_dmabuf_v1`; KWin imports them with EGL and the server recognises its own buffer by inode. KWin gets a DRM device via `GBM_BACKEND=mobilegl` -> `/usr/lib/gbm/mobilegl_gbm.so` (node is only an identity, never ioctl'd). Without linux-dmabuf the client falls back to wl_shm readback. +9. Zero-copy windows: client `wl_egl_window` frames are server-allocated AHardwareBuffer "shared images" exported as dma-buf fds over `zwp_linux_dmabuf_v1`; KWin imports them with EGL and the server recognizes its own buffer by inode. KWin gets a DRM device via `GBM_BACKEND=mobilegl` -> `/usr/lib/gbm/mobilegl_gbm.so` (node is only an identity, never ioctl'd). Without linux-dmabuf the client falls back to wl_shm readback. 10. X11 (`reference/plan-x11-gpu.md`): Xwayland draws with **glamor on MobileGL** (an offscreen session; `GBM_BACKEND=mobilegl` on KWin's render node; window pixmaps are shared images handed to KWin as linux-dmabuf buffers; its `glFlush` publishes them through the server, `/tmp/mgl-xwayland.client.log`); `ANLAND_XWAYLAND_GLAMOR=0` in KWin's drop-in brings back the software `-shm` Xwayland. GLX windows present their frames as shared images through **DRI3 + Present** (log `presented through DRI3+Present shared images`), falling back to readback + MIT-SHM / `xcb_put_image` when the X server has no DRI3 (`MOBILEGL_GLX_PRESENT=readback` forces it per app). Chrome runs ANGLE-GLES over MobileGL EGL with the GPU in its own process (`mobilegl-startup.sh chrome`; `MOBILEGL_CHROME_GPU=in-process` opts out), presenting GBM dma-bufs over linux-dmabuf; after a device loss Chrome restarts that process and repaints. ## First-time prerequisites (Windows host) diff --git a/tools/anland-mobilegl-plasma/reference/plan-x11-gpu.md b/tools/anland-mobilegl-plasma/reference/plan-x11-gpu.md index 1fa1eb8a..bd8c57da 100644 --- a/tools/anland-mobilegl-plasma/reference/plan-x11-gpu.md +++ b/tools/anland-mobilegl-plasma/reference/plan-x11-gpu.md @@ -77,7 +77,7 @@ uses the application's). KWin's launcher also drops `DISPLAY` from Xwayland's en `ANLAND_MOBILEGL=1` and `ANLAND_XWAYLAND_GLAMOR != 0`: Xwayland starts **without** `-shm`, with `MOBILEGL_IPC_SURFACE=offscreen`, its own `MOBILEGL_LOG_FILE_PATH=/tmp/mgl-xwayland`, `GBM_BACKEND` kept, no `LIBGL_ALWAYS_SOFTWARE`/`GALLIUM_DRIVER`, no `DISPLAY`. Otherwise the old `-shm` + -software environment. If glamor cannot initialise, Xwayland itself falls back to shm rendering. +software environment. If glamor cannot initialize, Xwayland itself falls back to shm rendering. ## Stage 2 - GLX presentation through DRI3 + Present diff --git a/tools/cts/patches/0001-fbo-color-texture-attachment.patch b/tools/cts/patches/0001-fbo-color-texture-attachment.patch index b98c5ae3..8bc372c4 100644 --- a/tools/cts/patches/0001-fbo-color-texture-attachment.patch +++ b/tools/cts/patches/0001-fbo-color-texture-attachment.patch @@ -22,12 +22,12 @@ index 588cf7d2a..0721ffee7 100644 height = (height == glu::RenderConfig::DONT_CARE) ? maxSize : height; } -+ // MOBILEGL: allow the colour attachment to be a texture instead of a ++ // MOBILEGL: allow the color attachment to be a texture instead of a + // renderbuffer. MobileGL's DirectVulkan backend returns zeros when reading + // back a renderbuffer-attached FBO, which makes every image comparison fail + // for one reason and hides everything else. Setting + // MOBILEGL_CTS_FBO_COLOR_TEXTURE=1 isolates that single defect so the rest -+ // of the suite can be measured. Off by default: stock behaviour. ++ // of the suite can be measured. Off by default: stock behavior. { - pixelFormat = getPixelFormat(colorFormat); + const char *useTexEnv = getenv("MOBILEGL_CTS_FBO_COLOR_TEXTURE"); diff --git a/tools/cts/scripts/cts_matrix_report.py b/tools/cts/scripts/cts_matrix_report.py index 9ea677ca..31d7ec79 100644 --- a/tools/cts/scripts/cts_matrix_report.py +++ b/tools/cts/scripts/cts_matrix_report.py @@ -138,7 +138,7 @@ def _sidecar(paths: Sequence[str], name: str) -> set[str]: def build_version_report( version: str, caselist: str, result_paths: Sequence[str] ) -> dict: - """Build the serialisable report for one GL mustpass version.""" + """Build the serializable report for one GL mustpass version.""" expected_cases, expected_duplicates = read_caselist(caselist) expected = set(expected_cases) diff --git a/tools/cts/scripts/cts_multi_report.py b/tools/cts/scripts/cts_multi_report.py index fc9245aa..214973d4 100644 --- a/tools/cts/scripts/cts_multi_report.py +++ b/tools/cts/scripts/cts_multi_report.py @@ -171,7 +171,7 @@ def _read_provenance( raise MultiReportInputError(f"suite run identity must be a JSON object: {path}") if state.get("backend") != spec.backend: raise MultiReportInputError( - f"suite {spec.suite_id} is labelled {spec.backend}, but run_state.json " + f"suite {spec.suite_id} is labeled {spec.backend}, but run_state.json " f"records {state.get('backend')!r}" ) fingerprint, case_count = _caselist_fingerprint(spec.caselist) @@ -250,7 +250,7 @@ def build_report( require_run_state: bool = True, expected_run_identity: Optional[str] = None, ) -> dict: - """Build suite, per-backend, and overall serialisable reports.""" + """Build suite, per-backend, and overall serializable reports.""" provenance = _validate_specs( specs, require_run_state, expected_run_identity @@ -417,7 +417,7 @@ def _write_json(path: str, report: dict) -> None: _write_text(path, json.dumps(report, indent=2, sort_keys=True) + "\n") -def _normalise_compact_suite_args(argv: Sequence[str]) -> list[str]: +def _normalize_compact_suite_args(argv: Sequence[str]) -> list[str]: """Expand ``--suite=b,l,c,r`` into the four-value argparse form.""" result: list[str] = [] @@ -507,11 +507,11 @@ def _specs_from_args(values: Sequence[Sequence[str]]) -> list[SuiteSpec]: def main(argv: Optional[Iterable[str]] = None) -> int: raw_argv = list(argv) if argv is not None else sys.argv[1:] try: - normalised = _normalise_compact_suite_args(raw_argv) + normalized = _normalize_compact_suite_args(raw_argv) except MultiReportInputError as exc: print(f"cts_multi_report: {exc}", file=sys.stderr) return 2 - args = _parser().parse_args(normalised) + args = _parser().parse_args(normalized) if os.path.normcase(os.path.abspath(args.markdown)) == os.path.normcase( os.path.abspath(args.json_out) diff --git a/tools/device_bench/devices/xiaomi-adreno830.env b/tools/device_bench/devices/xiaomi-adreno830.env index 21cc95b9..79e94f7b 100644 --- a/tools/device_bench/devices/xiaomi-adreno830.env +++ b/tools/device_bench/devices/xiaomi-adreno830.env @@ -25,7 +25,7 @@ # tools/device_bench/bench.sh --device --backend X --no-pin # tools/device_bench/pin_device.sh 35d0befa check # AFTER, exits non-zero on drift # tools/device_bench/pin_device.sh 35d0befa unpin -# `--no-pin` is what keeps bench.sh from writing MediaTek paths into the void and labelling the +# `--no-pin` is what keeps bench.sh from writing MediaTek paths into the void and labeling the # result pinned; pin_device.sh check is what replaces the pin-integrity fields it would have # sampled. (bench.sh's read_temp and its GPU-busy sampling ARE portable - they only read # /sys/class/thermal and $GPU_UTIL_NODE - so those fields stay meaningful.) diff --git a/tools/device_bench/p5f/verify_arm.py b/tools/device_bench/p5f/verify_arm.py index aa50fa12..96f6984b 100644 --- a/tools/device_bench/p5f/verify_arm.py +++ b/tools/device_bench/p5f/verify_arm.py @@ -26,8 +26,8 @@ expected_cases = { 'ClipDistanceScenario.ADisabledClipDistanceRemovesNothing', 'ClipDistanceScenario.TheEnablesAreIndependentPerDistance', 'CopyImageLayeredScenario.ArrayToArrayCopiesEverySlice', - 'CopyImageLayeredScenario.ArrayToArrayHonoursDifferentLayerOffsets', - 'CopyImageLayeredScenario.VolumeToVolumeHonoursNonZeroZ', + 'CopyImageLayeredScenario.ArrayToArrayHonorsDifferentLayerOffsets', + 'CopyImageLayeredScenario.VolumeToVolumeHonorsNonZeroZ', 'CopyImageLayeredScenario.VolumeToVolumeAtNonZeroMipLevel', 'CopyImageLayeredScenario.ArrayToVolumeCopiesEverySlice', 'CopyImageLayeredScenario.VolumeToArrayCopiesEverySlice', diff --git a/tools/spikes/extmem_probe/README.md b/tools/spikes/extmem_probe/README.md index b8a751af..eed60989 100644 --- a/tools/spikes/extmem_probe/README.md +++ b/tools/spikes/extmem_probe/README.md @@ -100,7 +100,7 @@ Each row starts with a per-leg trace, e.g. `rawmmap[i]=no vkimport[D]=rt gpu[D]=rt` — `[D]` decisive, `[i]` informational, `rt` = round-tripped, `read-only`/`write-only`/`no`/`notrun` otherwise. Driver error codes are printed verbatim (`VkResult` names, `errno`, GL enums) — that is -the payload of the spike, so do not summarise them away. +the payload of the spike, so do not summarize them away. Two details worth knowing when reading T1 output: diff --git a/tools/trace_replay/ServerEnvironmentTest.java b/tools/trace_replay/ServerEnvironmentTest.java index ae56548e..bb24e493 100644 --- a/tools/trace_replay/ServerEnvironmentTest.java +++ b/tools/trace_replay/ServerEnvironmentTest.java @@ -105,19 +105,19 @@ public final class ServerEnvironmentTest { // ---- P11 B1: the apply core the supervisor announces and the broker relays --------------------- // The native policy is the one source; the service only reads the supervisor's start-up line. expect("the announcement as the supervisor prints it", - ServerEnvironment.parseReservedApplyCore("MG_Remote server: apply core reserved for dialled-in " + ServerEnvironment.parseReservedApplyCore("MG_Remote server: apply core reserved for dialed-in " + "shared-segment clients: 0x40 (auto: the lowest of the prime cores, the rest left to the " - + "dialled-in shared-segment client)"), 0x40L); + + "dialed-in shared-segment client)"), 0x40L); expect("none reserved is 0, not absent", - ServerEnvironment.parseReservedApplyCore("MG_Remote server: apply core reserved for dialled-in " + ServerEnvironment.parseReservedApplyCore("MG_Remote server: apply core reserved for dialed-in " + "shared-segment clients: 0x0 (auto: unpinned - no asymmetric big/prime topology to split)"), 0L); expect("a 64-bit mask", ServerEnvironment.parseReservedApplyCore( - "MG_Remote server: apply core reserved for dialled-in shared-segment clients: 0x8000000000000000 (x)"), + "MG_Remote server: apply core reserved for dialed-in shared-segment clients: 0x8000000000000000 (x)"), Long.MIN_VALUE); expect("any other supervisor line is not the announcement", ServerEnvironment.parseReservedApplyCore("MG_Remote server: pid=12 listening on @x"), -1L); expect("a truncated announcement is not one", - ServerEnvironment.parseReservedApplyCore("MG_Remote server: apply core reserved for dialled-in " + ServerEnvironment.parseReservedApplyCore("MG_Remote server: apply core reserved for dialed-in " + "shared-segment clients: 0x"), -1L); if (failures != 0) { diff --git a/tools/trace_replay/SpawnServerPathTest.java b/tools/trace_replay/SpawnServerPathTest.java index ef090ae2..d783afe7 100644 --- a/tools/trace_replay/SpawnServerPathTest.java +++ b/tools/trace_replay/SpawnServerPathTest.java @@ -73,7 +73,7 @@ public final class SpawnServerPathTest { // see LaunchServer refuse by name. contains("MOBILEGL_IPC_SERVER_PATH=") did not match // it, so a path was appended after the unset and - last entry wins - undid it. String unset = "MOBILEGL_TRANSPORT=spawn;MOBILEGL_IPC_SERVER_PATH"; - expect("the unset spelling is honoured, not overwritten", + expect("the unset spelling is honored, not overwritten", SpawnServerPath.resolve(unset, DIR), unset); String emptied = "MOBILEGL_TRANSPORT=spawn;MOBILEGL_IPC_SERVER_PATH="; expect("an empty value is a value, and is left alone", diff --git a/tools/trace_replay/compare_actuals.py b/tools/trace_replay/compare_actuals.py index 8f33619a..53c742ec 100755 --- a/tools/trace_replay/compare_actuals.py +++ b/tools/trace_replay/compare_actuals.py @@ -57,7 +57,7 @@ class ImageError(ValueError): # whatever interpreter is at hand, and an unavailable Pillow would turn "the repeats diverged" # into "the tool did not run", which are not the same finding. The accepted subset is what # libpng gives trace_replay_core after its own normalization (ReadPngRgba, :278): 8- and 16-bit -# greyscale/RGB/greyscale+alpha/RGBA and 8-bit palette, non-interlaced. Anything else is +# grayscale/RGB/grayscale+alpha/RGBA and 8-bit palette, non-interlaced. Anything else is # REFUSED BY NAME rather than guessed at. # --------------------------------------------------------------------------------------------- _PNG_MAGIC = b"\x89PNG\r\n\x1a\n" diff --git a/tools/trace_replay/run_trace_case.cmake b/tools/trace_replay/run_trace_case.cmake index 00e3de2b..56b8094b 100644 --- a/tools/trace_replay/run_trace_case.cmake +++ b/tools/trace_replay/run_trace_case.cmake @@ -237,7 +237,7 @@ endif() # * it carries none of the three MGPipe Fatals: Fatal{PipeVerifyDiffer (a push/pull divergence, # the thing the mode exists to find), Fatal{UnmigratedPipeInput (a backend read of a field the # verb's fill table does not list - fixed by adding the row to MG_Pipe/FillPoints.def, never by -# marking the field sticky), and Fatal{PipeVerifyBadKnob (a misspelt MOBILEGL_PIPE_VERIFY_CORRUPT). +# marking the field sticky), and Fatal{PipeVerifyBadKnob (a misspelled MOBILEGL_PIPE_VERIFY_CORRUPT). # The third is in the regex on purpose even though D2 makes it # abort the process: with MOBILEGL_PIPE_VERIFY_FATAL=0 the abort is exactly what does not # happen, and a typo'd knob would otherwise leave the negative-control lane looking healthy. @@ -285,7 +285,7 @@ if(DEFINED ENV{MOBILEGL_PIPE_VERIFY} AND NOT "$ENV{MOBILEGL_PIPE_VERIFY}" STREQU "MOBILEGL_PIPE_VERIFY. Fatal{PipeVerifyDiffer, \"@\"} is a real push/pull " "divergence and is recorded, not silenced; Fatal{UnmigratedPipeInput, \"@\"} " "is a missing row in MG_Pipe/FillPoints.def's class table - add it, regenerate, rerun " - "(never mark the field sticky); Fatal{PipeVerifyBadKnob, ...} is a misspelt " + "(never mark the field sticky); Fatal{PipeVerifyBadKnob, ...} is a misspelled " "MOBILEGL_PIPE_VERIFY_CORRUPT - fix the spelling, the vocabulary is " "kMGPipeInputFieldNames[].") endif() @@ -502,7 +502,7 @@ if(DEFINED ENV{MOBILEGL_TRANSPORT} AND NOT "$ENV{MOBILEGL_TRANSPORT}" STREQUAL " "${split_case}: ${split_floor_count} MGWIRE-FLOOR unsound-serial-complete line(s) under " "MOBILEGL_TRANSPORT=$ENV{MOBILEGL_TRANSPORT}. The completed-frame-serial floor was " "raised to a serial an in-flight submission still carries, so a streamed buffer write " - "can take the unsynchronised host path over bytes that submission is still copying " + "can take the unsynchronized host path over bytes that submission is still copying " "(magma-b3.md §2). The clamp in VulkanRenderer::OnSubmitsCompletedUpTo is what makes " "this unreachable; a line here means it was removed or bypassed.") endif() diff --git a/tools/trace_replay/test_run_tcp_matrix.py b/tools/trace_replay/test_run_tcp_matrix.py index 8f69621c..a0abe644 100644 --- a/tools/trace_replay/test_run_tcp_matrix.py +++ b/tools/trace_replay/test_run_tcp_matrix.py @@ -267,7 +267,7 @@ class MatrixTests(unittest.TestCase): case=matrix.select_cases(self.manifest,None,[backend])[0] return matrix.plan_case(case,backend,catalog,self.plan_args(),{}) - def test_selection_honours_per_case_backends_and_names_an_impossible_pairing(self): + def test_selection_honors_per_case_backends_and_names_an_impossible_pairing(self): self.write_inputs(extra_cases=[dict(self.VULKAN_ONLY,name='VulkanOnly'), dict(self.GLES_ONLY,name='GlesOnly')]) # The default subset is every split case; the per-backend filter happens in main(),