diff options
| author | dan sinclair <dsinclair@google.com> | 2020-11-18 16:33:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 16:33:00 -0500 |
| commit | 758f918f2b49588ba8b1e58f08eaa833e96b2fa4 (patch) | |
| tree | a28ae2fe0f80ca7d3a7194907bf0e0c95bb0c5c1 | |
| parent | 404e43281bed513ab74f054bfdee57accb527ac2 (diff) | |
| download | amber-758f918f2b49588ba8b1e58f08eaa833e96b2fa4.tar.gz | |
Various fixes for size comparisons (#924)
* Various fixes for size comparisons
This CL fixes up various size comparison issues in amber along with
running the formatter.
* Roll Deps
Roll third_party/dxc/ c607bb3c0..f1f60648d (23 commits)
https://github.com/Microsoft/DirectXShaderCompiler/compare/c607bb3c032d...f1f60648df03
$ git log c607bb3c0..f1f60648d --date=short --no-merges --format='%ad %ae %s'
2020-11-12 hekotas Fix hctbuild to enable passing of quoted values and values with parenthesis (#3256)
2020-11-12 marijns95 Linux: Implement prefix-counted BSTR allocation in SysAllocStringLen (#3250)
2020-11-11 hekotas Fix dxilconv crash when initialization fails (#3254)
2020-11-10 grroth Handle scalar args to out vector params (#3246)
2020-11-09 jaebaek [spirv] emit OpLine at the end of entry function (#3244)
2020-11-06 hekotas Support for ARM64EC and custom cmake (#3245)
2020-11-05 hekotas Minor refactoring to reduce size of dxilconv.dll (#3240)
2020-11-04 texr Fix lost debug info on DispatchMesh payload in AS (#3243)
2020-11-04 jaebaek Revert "[spirv] add location for DebugDeclare (#3230)" (#3242)
2020-11-04 grroth Initialize conversion remarks result (#3241)
2020-11-03 31109344+adam-yang Made exit values not have to dominate latch in structurize loop exit (#3220)
2020-11-03 hekotas Fix DIA SDK detection for ARM64 and VS2017 (#3239)
2020-11-02 grroth New approach to avoid skipallocas (#3219)
2020-11-02 jaebaek [spirv] add location for DebugDeclare (#3230)
2020-11-02 jaebaek [spirv] wrap instructions with OpNoLine (#3229)
2020-11-02 hekotas Fix DIA SDK detection (#3231)
2020-11-02 Junda.Liu [spirv] Fix [[vk::push_constant]] on ConstantBuffer part II (#3216)
2020-11-02 Junda.Liu [spirv] globallycoherent should generate SPIR-V decoration Coherent (#3217)
2020-10-30 texr Fix precise propagation through various missing paths (#3224)
2020-10-30 texr Fix regression in lib vector arg case when skipping copy-out (#3232)
2020-10-30 31109344+adam-yang Bitpiece crash when value/addr are null (#3227)
2020-10-29 hekotas Add caps check for optional 16bit ops support to several execution tests. (#3222)
2020-10-28 31109344+adam-yang Make sure bitpiece not generated that covers the entire variable (#3223)
Created with:
roll-dep third_party/dxc
Roll third_party/clspv/ 3a11614ee..e0406e705 (22 commits)
https://github.com/google/clspv/compare/3a11614ee409...e0406e7053d1
$ git log 3a11614ee..e0406e705 --date=short --no-merges --format='%ad %ae %s'
2020-11-10 alanbaker Implement fdim (#675)
2020-11-10 marco.antognini Lower OpenCL vloadN and vstoreN (#670)
2020-11-09 alanbaker Implement isnormal (#674)
2020-11-07 alanbaker Implement islessgreater (#672)
2020-11-06 alanbaker Implement isordered and isunordered (#671)
2020-11-05 alanbaker Implement ctz (#669)
2020-11-05 alanbaker Implement sub_sat (#668)
2020-11-03 alanbaker Implement mad_sat (#667)
2020-11-03 marco.antognini Lower function call and initial support for LLVM intrinsics (#666)
2020-11-02 kpet Fix hadd/rhadd for signed types (#665)
2020-11-02 alanbaker Fix non-32-bit clz (#664)
2020-10-30 marco.antognini Lower UnaryOperator and handle fast math flags (#663)
2020-10-29 alanbaker Implement rotate in terms of llvm.fshl (#662)
2020-10-29 alanbaker Implement hadd and rhadd (#660)
2020-10-29 alanbaker Add support for OpenCL 2.0 atomic functions (#657)
2020-10-29 alanbaker Update deps (#661)
2020-10-29 marco.antognini Recusiverly lower instructions (#655)
2020-10-28 alanbaker Add convergent attribute in more cases (#658)
2020-10-26 alanbaker Implement add_sat (#656)
2020-10-22 alanbaker Prevent duplicate types and decorations (#654)
2020-10-19 kpet Add support for -cl-std=CL3.0 (#653)
2020-10-19 marco.antognini Lower function parameters and return type (#646)
Created with:
roll-dep third_party/clspv
Roll third_party/shaderc/ 813ef3dc0..88f9156d7 (3 commits)
https://github.com/google/shaderc/compare/813ef3dc0d5e...88f9156d7f6a
$ git log 813ef3dc0..88f9156d7 --date=short --no-merges --format='%ad %ae %s'
2020-11-09 dneto Replace C-style cast with static_cast
2020-11-12 dneto Roll back googletest to earlier version
2020-11-02 rharrison Roll 6 dependencies (#1144)
Created with:
roll-dep third_party/shaderc
Roll third_party/spirv-tools/ df4198e50..1f2fcddd3 (21 commits)
https://github.com/KhronosGroup/SPIRV-Tools/compare/df4198e50eaa...1f2fcddd3963
$ git log df4198e50..1f2fcddd3 --date=short --no-merges --format='%ad %ae %s'
2020-11-13 afdx spirv-opt: Set parent when adding basic block (#4021)
2020-11-13 jaebaek spirv-opt: properly preserve DebugValue indexes operand (#4022)
2020-11-11 dneto Use less stack space when validating Vulkan builtins (#4019)
2020-11-05 46493288+sfricke-samsung spirv-val: Fix SPV_KHR_fragment_shading_rate VUID label (#4014)
2020-11-05 46493288+sfricke-samsung spirv-val: Label Layer and ViewportIndex VUIDs (#4013)
2020-11-05 alanbaker Add dead function elimination to -O (#4015)
2020-11-04 jaebaek Add DebugValue for invisible store in single_store_elim (#4002)
2020-11-04 dnovillo Fix SSA re-writing in the presence of variable pointers. (#4010)
2020-11-04 afdx spirv-fuzz: Fixes to pass management (#4011)
2020-11-03 afdx spirv-fuzz: Add support for reining in rogue fuzzer passes (#3987)
2020-11-03 vasniktel spirv-fuzz: Fix assertion failure in FuzzerPassAddCompositeExtract (#3995)
2020-11-03 vasniktel spirv-fuzz: Fix invalid equation facts (#4009)
2020-11-03 vasniktel spirv-fuzz: Fix bugs in TransformationFlattenConditionalBranch (#4006)
2020-11-03 andreperezmaselco.developer spirv-fuzz: Fix bug related to transformation applicability (#3990)
2020-10-30 jaebaek Temporarily add EmptyPass to prevent glslang from failing (#4004)
2020-10-30 Junda.Liu spirv-opt: Add support to prevent functions from being inlined if they have DontInline flag (#3858)
2020-10-29 jaebaek Propagate OpLine to all applied instructions in spirv-opt (#3951)
2020-10-29 bclayton CMake: Add SPIRV_TOOLS_BUILD_STATIC flag (#3910)
2020-10-29 dneto Avoid copying a ref in a loop (#4000)
2020-10-28 justsid spirv-val: Allow the ViewportIndex and Layer built-ins on SPIR-V 1.5 (#3986)
2020-10-28 dnovillo Simplify logic to decide whether CCP modified the IR (#3997)
Created with:
roll-dep third_party/spirv-tools
Roll third_party/glslang/ 740ae9f60..beec2e4a7 (17 commits)
https://github.com/KhronosGroup/glslang/compare/740ae9f60b00...beec2e4a7c4d
$ git log 740ae9f60..beec2e4a7 --date=short --no-merges --format='%ad %ae %s'
2020-11-12 mbechard tweak local_size comparison a bit (#2456)
2020-11-12 dneto Avoid spuriously adding Geometry capability for vert, tesc, tese (#2462)
2020-11-12 greg New nonuniform analysis (#2457)
2020-11-09 jhall1024 Implement GL_EXT_terminate_invocation (#2454)
2020-11-06 rdb Fix token-pasting macros not working in preprocessor directives. (#2453)
2020-11-06 laddoc Fix warning in iomapper. (#2449)
2020-11-04 TobyHector Add GL_EXT_shader_image_int64 support (#2409)
2020-11-04 laddoc 8. io mapping refine & qualifier member check & resolver expand (#2396)
2020-11-02 courtneygo Fix build error with Chromium & ANGLE (#2446)
2020-11-02 dev Add new SpirvToolsDisassemble API interface + Improve Doc on existing API interface (#2442)
2020-11-02 justsid Support for CapabilityShaderViewportIndex and CapabilityShaderLayer (#2432)
2020-11-02 jaebaek Do not use PropagateLineInfoPass and RedundantLineInfoElimPass (#2440)
2020-09-09 greg Add texture sample to nonuniform test
2020-09-08 greg Add buffer store to nonuniform tests
2020-09-03 bas SPV: Add NonUniform decoration for constructors.
2020-09-03 bas SPV: Add NonUniform decoration for OpImages created during lowering.
2020-08-24 bas SPV: Add NonUniform decorations for stores.
Created with:
roll-dep third_party/glslang
Roll third_party/spirv-headers/ 7845730ca..5ab5c9619 (2 commits)
https://github.com/KhronosGroup/SPIRV-Headers/compare/7845730cab6e...5ab5c96198f3
$ git log 7845730ca..5ab5c9619 --date=short --no-merges --format='%ad %ae %s'
2020-11-04 michael.kinsner Reserve additional loop control bit for Intel extension (NoFusionINTEL) (#175)
2020-11-02 4464295+XAMPPRocky Add EmbarkStudios/rust-gpu to vendor list. (#174)
Created with:
roll-dep third_party/spirv-headers
Roll third_party/vulkan-loader/ 2b0892e15..be6ccb9ec (7 commits)
https://github.com/KhronosGroup/Vulkan-Loader/compare/2b0892e15bd8...be6ccb9ecaf7
$ git log 2b0892e15..be6ccb9ec --date=short --no-merges --format='%ad %ae %s'
2020-11-02 shabbyx Reland "Generate libvulkan.so.1 on Linux instead of libvulkan.so"
2020-11-10 shannon build: Update known-good files for 1.2.160 header
2020-11-02 shannon build: Update known-good files for 1.2.159 header
2020-10-30 shabbyx Revert "Generate libvulkan.so.1 on Linux instead of libvulkan.so"
2020-10-22 xantares09 Add an option to disable MASM
2020-10-20 xantares09 Configure vulkan.pc when pkg-config is available
2020-10-22 shabbyx Generate libvulkan.so.1 on Linux instead of libvulkan.so
Created with:
roll-dep third_party/vulkan-loader
Roll third_party/clspv-llvm/ b91a236ee..a6ac2b32f (2881 commits)
https://github.com/llvm/llvm-project/compare/b91a236ee1c3...a6ac2b32fbab
$ git log b91a236ee..a6ac2b32f --date=short --no-merges --format='%ad %ae %s'
2020-11-16 schuett Convert TypeSpecifiersPipe from Specifiers.h to a scoped enum; NFC
2020-11-16 v.g.vassilev Reland "Move the test compiler setup in a common place. NFCI"
2020-11-16 dmitry.preobrazhensky [AMDGPU][MC] Corrected error position for some operands and modifiers
2020-11-16 mkazantsev [Test] More tests on range checks
2020-11-11 caroline.concatto [AArch64] Add check for widening instruction for SVE.
2020-11-12 matthew.malcomson Hwasan reporting check for dladdr failing
2020-11-16 vitalybuka Revert "Move the test compiler setup in a common place. NFCI"
2020-11-16 vitalybuka [NFC][tsan] Simplify call_pthread_cancel_with_cleanup
2020-11-16 mkazantsev [Test] More tests on range check elimination
2020-11-13 mgorny [lldb] [Process/FreeBSDRemote] Optimize regset pointer logic
2020-11-11 mgorny [lldb] [Process/FreeBSDRemote] Modernize and simplify YMM logic
2020-11-11 mgorny [lldb] [Process/FreeBSDRemote] Access debug registers via offsets
2020-11-11 mgorny [lldb] [Process/FreeBSDRemote] Access FPR via RegisterInfo offsets
2020-11-16 dmitry.preobrazhensky [AMDGPU][MC] Corrected error position for swizzle()
2020-11-16 dmitry.preobrazhensky [AMDGPU][MC] Corrected error position for hwreg() and sendmsg()
2020-11-10 mgorny [lldb] [Process/FreeBSDRemote] Access GPR via reginfo offsets
2020-11-16 nicolas.vasilache [mlir][Linalg] Add support for tileAndDistribute on tensors.
2020-11-13 marukawa [VE] Add pfchv intrinsic instructions
2020-11-16 vitalybuka [sanitizer] Fix StackDepotPrint testing
2020-11-16 benny.kra [LoopFlatten] Fold variable into assert. NFC.
2020-11-16 flo [IRGen] Add !annotation metadata for auto-init stores.
2020-11-09 sjoerd.meijer [LoopFlatten] Widen the IV
2020-11-16 david.penry [ARM] Cortex-M7 schedule
2020-11-16 goncharov.mikhail [lld] Use %t file in test
2020-11-02 protze [OpenMP][Tool] Add Archer option to disable data race analysis for sequential part
2020-11-13 fraser [RISCV] Use a macro to simplify getTargetNodeName
2020-11-16 marukawa [VE] Change variable capitalization
2020-11-16 simon.moll [VP][NFC] Rename to HANDLE_VP_TO_OPC
2020-11-13 git [clang][cli] Add support for options with two flags for controlling the same field.
2020-11-16 lhames [MCJIT] Profile the code generated by MCJIT engine using Intel VTune profiler
2020-11-16 simon.moll [VE] LVLGen sets VL before vector insts
2020-11-16 mkazantsev Recommit "[NFC] Move code between functions as a preparation step for further improvement"
2020-11-15 kazu [JumpThreading] Call eraseBlock when folding a conditional branch
2020-11-15 kazu [IR] Use llvm::is_contained in BasicBlock::removePredecessor (NFC)
2020-11-15 kazu [Loop Fusion] Use pred_empty and succ_empty (NFC)
2020-11-15 kazu [ADCE] Use succ_empty (NFC)
2020-11-16 qshanz [NFC][Test] Add test coverage for IEEE Long Double on Power8
2020-11-15 kazu [BranchProbabilityInfo] Use predecessors(BB) and successors(BB) (NFC)
2020-11-15 kazu [TRE] Use successors(BB) (NFC)
2020-11-15 craig.topper [X86] Fix crash with i64 bitreverse on 32-bit targets with XOP.
2020-11-15 kazu [SanitizerCoverage] Use llvm::all_of (NFC)
2020-11-10 serguei.katkov [IRCE] Use the same min runtime iteration threshold for BPI and BFI checks
2020-11-16 pengfei.wang [CodeGen][X86] Remove unused trivial check-prefixes from all CodeGen/X86 directory.
2020-11-15 richard PR48169: Fix crash generating debug info for class non-type template parameters.
2020-11-15 spatel [InstCombine] reduce code for flip of masked bit; NFC
2020-11-15 spatel [InstCombine] add multi-use demanded bits fold for add with low-bit mask
2020-11-15 spatel [InstCombine] add vector tests for multi-use demanded bits; NFC
2020-11-14 martin [OpenMP] Fix building for windows after adding omp_calloc
2020-11-15 nikita.ppv [AA] Add missing AAQI parameter
2020-11-15 flo [MemorySSA] Add pointer decrement loop clobber test case.
(...)
2020-10-19 martin [libcxx] [test] Mark tests that require specific allocation behaviours as libcpp only
2020-10-19 martin [libcxx] [test] Exclude domain socket tests on windows, like bsd/darwin
2020-10-19 martin [libcxx] [test] Add LIBCPP_ONLY() around another test for an implementation detail
2020-10-19 martin [libcxx] [test] Don't require fs::path::operator(string_type&&) to be noexcept
2020-10-19 martin [libcxx] [test] Allow fs::permissions(path, perms, perm_options, error_code) to be noexcept
2020-10-19 martin [libcxx] [test] Do error printfs to stderr in filesystems tests
2020-10-19 martin [clang] Automatically link against oldnames just as linking against libcmt
2020-10-14 dexonsmith clang/{Format,Rewrite}: Stop using SourceManager::getBuffer, NFC
2020-10-15 eugenis Add alloca size threshold for StackTagging initializer merging.
2020-10-19 aeubanks [test][NPM] Fix already-vectorized.ll under NPM
2020-10-19 craig.topper [SelectionDAG][X86] Enable SimplifySetCC CTPOP transforms for vector splats
2020-10-19 craig.topper [X86] Add i32->float and i64->double bitcast pseudo instructions to store folding table.
2020-10-17 Matthew.Arsenault Fix typo
2020-10-19 lhames [ORC] Fix a missing include.
2020-10-19 aeubanks [NPM][test] Fix some LoopVectorize tests under NPM
2020-10-19 nikita.ppv [BatchAA] Add test for incorrect phi cycle result (NFC)
2020-10-19 Tony.Tye [AMDGPU] Correct comment typo in SIMemoryLegaliizer.cpp
2020-10-19 aeubanks [NPM][opt] Run -O# after other passes in legacy PM compatibility mode
2020-10-19 clementval [flang][openacc] Switch to use TODO from D88909
2020-10-19 alexandre.ganea [LLDB][TestSuite] Improve skipIfWindowsAndNonEnglish in decorators.py
2020-10-19 mcinally [SVE] Update vector reduction intrinsics in new tests.
2020-10-13 michaelrj [libc] Add LLVM libc specific functions to llvm_libc_ext.td.
2020-10-19 jay.foad [AMDGPU] Remove MUL_LOHI_U24/MUL_LOHI_I24
2020-10-19 jhuber6 [OpenMP] Fixing OpenMP/driver.c failing on 32-bit hosts
2020-10-19 atmndp [LangRef] Define mustprogress attribute
2020-10-19 mikhail.maltsev [clang] Use SourceLocation as key in std::map, NFCI
2020-10-19 flo [SCEV] Add tests where assumes can be used to improve tripe multiple.
2020-10-16 ldionne [libc++] Add more tests for operator<< on std::complex
2020-10-15 amy.kwan1 [DAGCombiner][PowerPC] Remove isMulhCheaperThanMulShift TLI hook, Use isOperationLegalOrCustom directly instead.
2020-10-19 jonas [llvm] Make obj2yaml and yaml2obj LLVM utilities instead of tools
2020-10-19 Tony.Tye [AMDGPU] Simplify cumode handling in SIMemoryLegalizer
2020-10-17 Tony.Tye [AMDGPU] Extend hip-toolchin-features.hip test
2020-10-17 Tony.Tye [AMDGPU] Correct hsa-diag-v3.s test
2020-10-19 mtrofin [NFC][MC] Type [MC]Register uses in MachineTraceMetrics
2020-10-19 Alexander.Richardson [libc++] Skip tests using constexpr destructors with older clang versions
2020-10-06 sameeranjayant.joshi [Flang][OpenACC] Fix for branching out issue in OpenACC parallel construct.
2020-10-16 ldionne [libc++] Refactor the fuzzing tests
2020-10-19 lhames [ORC] Fix unused variable warning.
2020-10-19 llvm-dev [InstCombine] foldOrOfICmps - only fold (icmp_eq B, 0) | (icmp_ult/gt A, B) for integer types
2020-10-17 mtrofin [ML] Add final reward logging facility.
2020-10-19 nabeel.omer [Dexter][NFC] Add Missing Commands to Commands.md Contents
2019-10-01 ldionne [libc++] Define new/delete in libc++abi only by default
2020-10-19 Casey [libc++][test] Portably silence warnings
2020-10-19 Alexander.Richardson [lit] Avoid calling realpath() for every printed message
2020-10-19 llvm-dev Revert rGa704d8238c86bac: "[InstCombine] Add or((icmp ult/ule (A + C1), C3), (icmp ult/ule (A + C2), C3)) uniform vector support"
2020-10-19 n.james93 [clang-tidy] Add scoped enum constants to identifier naming check
2020-10-16 psteinfeld [flang] Add name match checks for interface procedures
2020-10-19 sam.mccall [clangd] Add test for structured-binding completion. NFC
2020-10-19 georgemitenk0v [MLIR][SPIRVToLLVM] Updated documentation for composite ops
2020-10-19 llvm-dev [InstCombine] Add (icmp ne A, 0) | (icmp ne B, 0) --> (icmp ne (A|B), 0) vector support
Created with:
roll-dep third_party/clspv-llvm
Roll third_party/swiftshader/ df17a7610..e4c1a25cc (56 commits)
https://swiftshader.googlesource.com/SwiftShader.git/+log/df17a76102df..e4c1a25cc679
$ git log df17a7610..e4c1a25cc --date=short --no-merges --format='%ad %ae %s'
2020-11-12 capn Use LLVM JIT for MemorySanitizer GN builds
2020-11-12 srisser Update vulkan headers to 1.2.160
2020-11-12 swiftshader.regress Regres: Update test lists @ 4804ac87
2020-11-11 zzyiwei Disable VK_KHR_external_memory_fd for Android build
2020-10-28 natsu Handle image properties from external device memory
2020-11-12 capn Fix conditionally enabling Reactor MSan instrumentation
2020-11-02 capn Implement MemorySanitizer instrumentation of Reactor routines
2020-08-25 nicolascapens Fix backslash interpreted as part of URL
2020-10-26 srisser Implement VK_KHR_shader_float_controls
2020-11-10 amaiorano Subzero: clang-format crosstest, pnacl-llvm, runtime, and unittest
2020-11-10 amaiorano Subzero: clang-format src
2020-11-02 capn Fix LLVM host triple for ORCv2 JIT
2020-11-11 srisser Add SPIR-V tools dependency to BUILD.gn files
2020-11-10 natsu Fix Android build
2020-11-06 amaiorano Add a unit test for bug fixed by swiftshader-cl/50008
2020-11-09 srisser Track SPIR-V version in VkConfig.hpp
2019-04-24 vhau Modify gralloc0 implementation
2020-11-05 jaebaek SpirvShaderDebugger: Correct member index for DebugValue
2020-11-05 capn Fix Android.bp build after SPIRV-Tools update
2020-11-04 amaiorano Subzero: fix invalid arg access on Windows x86 for split variables
2020-11-03 amaiorano Subzero: fix non-deterministic stack layout and code-gen
2020-11-05 srisser Squashed 'third_party/SPIRV-Tools/' changes from f7da52775..a61d07a72
2020-11-04 capn Fix Vulkan benchmarks build
2020-10-02 capn Fix unaligned access on depth values
2020-11-02 capn Fix LLVM alloca array size type
2020-11-02 capn Resolve MSan symbols dynamically
2020-11-02 capn Switch Chromium/Fuchsia to use the LLVM ORCv2 JIT
2020-11-03 nicolascapens Clarify the ICD/loader compatibility
2020-11-03 swiftshader.regress Regres: Update test lists @ b5bf8269
2020-11-03 capn Set LLVM_ENABLE_ABI_BREAKING_CHECKS for Debug builds only
2020-10-30 jari.komppa Add script to verify proper Memset template use
2020-11-02 capn Set the LLVM module's target triple
2020-10-30 capn Consistently remove double colon from llvm namespace
2020-10-30 capn Emulate gather/scatter for MSan builds
2020-10-30 capn Prevent 'most vexing parse' issue
2020-11-02 sugoi Squashed 'third_party/SPIRV-Tools/' changes from 82b378d671..f7da527757
2020-10-23 amaiorano Subzero: fix Ice::BitVector::grow not copying old to new data
2020-10-30 jari.komppa Ignore third party libraries during presubmit
2020-10-28 jari.komppa Add check for vtable in memset template
2020-10-29 sugoi Squashed 'third_party/SPIRV-Tools/' changes from 8a5500656..82b378d67
2020-10-29 sugoi Squashed 'third_party/SPIRV-Headers/' changes from 979924c8b..7845730ca
2020-10-23 capn Fix LLVM pointer element type
2020-10-29 capn Avoid false-positive MSan error for thread_local
2020-10-29 capn Squashed 'third_party/marl/' changes from f1c446ccd..3285a2dfb
2020-10-28 capn Temporarily support both ORCv1 and ORCv2
2020-10-26 amaiorano Apply google3 upstream fixes for latest LLVM
2020-10-22 amaiorano LLVMJIT: fix asserts in latest LLVM
2020-10-08 capn Support MemorySanitizer builds with CMake
2020-10-15 srisser Implement VK_KHR_shader_subgroup_extended_types
2020-10-19 srisser Update VkStringify to use vulkan.hpp to_string
2020-10-21 bclayton LLVMJIT: Fix memory leak
2020-10-10 natsu Update SwiftShader VK AHB to support generic gralloc
2020-10-21 amaiorano Fix when built against latest LLVM (11)
2020-10-20 amaiorano Fix Android build
2020-10-19 amaiorano Subzero: workaround bad codegen for Windows x86 at Om1 optimization level
2020-10-19 bclayton LLVM: Replace legacy ORC JIT with new API
Created with:
roll-dep third_party/swiftshader
Roll third_party/vulkan-headers/ 320af06cb..11c6670b4 (3 commits)
https://github.com/KhronosGroup/Vulkan-Headers/compare/320af06cbdd2...11c6670b4a4f
$ git log 320af06cb..11c6670b4 --date=short --no-merges --format='%ad %ae %s'
2020-11-15 oddhack Update for Vulkan-Docs 1.2.161
2020-11-08 oddhack Update for Vulkan-Docs 1.2.160
2020-11-01 oddhack Update for Vulkan-Docs 1.2.159
Created with:
roll-dep third_party/vulkan-headers
Roll third_party/vulkan-validationlayers/ 87b0951f8..9d3ef3258 (70 commits)
https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/87b0951f8dba...9d3ef3258715
$ git log 87b0951f8..9d3ef3258 --date=short --no-merges --format='%ad %ae %s'
2020-11-13 pankratz layers: Removed duplicate type declaration
2020-11-13 mark scripts: Suppress warning for empty difflist
2020-11-12 mark scripts: Remove format checking shell scripts
2020-11-11 mark scripts: Add python format-checking script and update travis
2020-11-05 mark tests: Add oldSwapchain-from-different-device test
2020-11-09 mark threading: Make swapchain objects traceable to parent
2020-11-10 mark tests: Added specialuse extension BP tests
2020-11-10 mark practices: Add checking of specialuse extensions
2020-11-09 mark practices: Check for specialuse extensions and warn
2020-11-09 mark practices: Added specialuse extension table
2020-11-10 karl layers: Fix typedef and spelling
2020-11-09 jeremyg syncval: Convert enum SyncStageAccessFlags to a std::bitset
2020-11-09 jeremyg syncval: Change generated lookup tables to be const.
2020-11-06 marshall tests: Test queue retirement over timeline semaphores
2020-11-06 marshall layers: Fix queue retirement via waited-on timeline semaphores
2020-11-06 rgarcia layers: Check nullDescriptor when validating vertex attributes
2020-11-02 shannon build: Update known-good files for 1.2.159 header
2020-11-05 orbea cmake: Install the header files into the vulkan directory
2020-11-04 liyl build: Allow generating layers json file for cross-compiling
2020-11-05 courtneygo Fix missing source reference
2020-10-31 s.fricke layers: Change copy2 VU from int to string
2020-11-04 orbea cmake: Silence warnings
2020-11-03 orbea cmake: Add BUILD_WERROR
2020-11-01 s.fricke layers: Add VUID 01591
2020-11-01 s.fricke tests: Add VUID 04113 and 04114
2020-11-01 s.fricke layers: Add VUID 04113 and 04114
2020-11-01 s.fricke layers: Label 04101 and 04010
2020-11-03 s.fricke layers: Add Android 24 and 25 support
2020-11-03 tony docs: Fix enabling debug printf
2020-10-31 skdkksfadkadkk layers: Fix checks for 01508 and 01509
2020-11-03 neel.bedekar layers: Remove unnecessary FDM tiling check
2020-11-02 mark tests: Add 2718 security VUID tests
2020-10-30 mark stateless: Fix clang-formatting issues
2020-10-30 mark stateless: Comment out unused legacy vuids
2020-10-30 mark stateless: Output correct VUID for validate_string_array
2020-10-30 mark stateless: Remove non-VU pNext chain cycle check
2020-10-30 mark stateless: Remove warnings from viewport validation
2020-10-30 mark stateless: Use correct VUIDs for drawCount check
2020-10-29 jzulauf syncval: Add raster order rules to load op validation
2020-10-23 jzulauf syncval: Add layout transition info w/o prev access
2020-10-22 jzulauf syncval: Remove unsafe/unused code path.
2020-10-21 jzulauf syncval: Support range gen w/ empty subres ranges
2020-10-19 jzulauf syncval: Add dst scope barriers to all ILT
2020-10-06 jzulauf tests: Add multi dependency syncval test
2020-10-06 jzulauf syncval: Multidep subpass layout transition rework
2020-10-02 jzulauf syncval: Simplify input attachment read tracking
2020-09-29 jzulauf syncval: vkCmdPipelineBarrier multidep support
2020-09-23 jzulauf syncval: Cleanup input attachment read tracking
2020-10-29 tony layers: Fix checks for 02502 and 02503
2020-10-27 tony gpu: Report OpLine info even if no source
2020-10-27 tony tests: Add test for variable count descriptors
2020-10-27 tony layers: Add validation for variable descriptor count
2020-10-27 tony layers: Fix error message
2020-10-28 jeremyg syncval: Add override keyword to ValidationObject method overrides.
2020-10-26 s.fricke layers: Relabel vkCmdDrawIndirectByteCountEXT VUs
2020-10-30 nathaniel layers: Fix test error introduced by #2276
2020-10-29 s.fricke layers: Add extra api names to errors
2020-10-28 s.fricke tests: Add SampleMask Array Limit VUID
2020-10-26 s.fricke layers: Add SampleMask Array Limit VUID
2020-10-24 s.fricke layers: Add table for buffer image copy VUs
2020-10-29 s.fricke layers: Add VK_EXT_4444_formats support
2020-10-30 mark contributing: Updated for Travis CI migration
2020-10-30 mark readme: Updated for Travis migration
2020-10-29 s.fricke layers: Add missing 1.2 overload functions
2020-10-21 s.fricke tests: Add input attachment aspectMask/layout
2020-10-20 s.fricke layers: Remove non-input aspectMask check
2020-10-28 shannon build: Reconcile final 158 VUID inconsistencies
2020-10-21 mark tests: Add invalid stride test for GetQueryPoolResults
2020-10-21 mark corechecks: Added 4519 vuid for GetQueryPoolResults stride
2020-10-28 krzysio.kurek stateless: Add a missing "not" to ValidateGreaterThan
Created with:
roll-dep third_party/vulkan-validationlayers
* Roll deps
Roll third_party/dxc/ f1f60648d..489c2e4d3 (6 commits)
https://github.com/Microsoft/DirectXShaderCompiler/compare/f1f60648df03...489c2e4d3241
$ git log f1f60648d..489c2e4d3 --date=short --no-merges --format='%ad %ae %s'
2020-11-17 rkarrenberg Move force-zero-store-lifetimes flag to help-hidden, remove accidental check from test. (#3264)
2020-11-17 marijns95 dxcisense: Allocate "TM" classes using IMalloc instead of new (#3258)
2020-11-17 rkarrenberg Enable generation of llvm.lifetime.start/.end intrinsics (#3034)
2020-11-16 ehsannas [spirv] Fix compound MulAssign with type mismatches. (#3255)
2020-11-16 ehsannas [spirv] Use isResourceType to cover SubpassInput. (#3253)
2020-11-16 ehsannas [spirv] Move descriptor scalar replacement to legalization stage. (#3261)
Created with:
roll-dep third_party/dxc
Roll third_party/glslang/ beec2e4a7..7f6559d28 (1 commit)
https://github.com/KhronosGroup/glslang/compare/beec2e4a7c4d...7f6559d2802d
$ git log beec2e4a7..7f6559d28 --date=short --no-merges --format='%ad %ae %s'
2020-11-16 ShabbyX Compile out code for GL_EXT_shader_image_int64 for ANGLE (#2463)
Created with:
roll-dep third_party/glslang
Roll third_party/clspv-llvm/ a6ac2b32f..7e30989da (134 commits)
https://github.com/llvm/llvm-project/compare/a6ac2b32fbab...7e30989dabce
$ git log a6ac2b32f..7e30989da --date=short --no-merges --format='%ad %ae %s'
2020-11-17 llvm-dev [IR] ShuffleVectorInst::isIdentityWithPadding - bail on non-fixed-type vector shuffles.
2020-11-17 llvm-dev [X86] nontemporal.ll - replace X32 check prefix with X86. NFC.
2020-11-17 llvm-dev [X86] subvector-broadcast.ll - replace X32 check prefix with X86. NFC.
2020-11-17 jonathan.l.peyton [OpenMP] NFC: remove tabs in message catalog file
2020-11-17 wingo [WebAssembly] Fix parsing of linking section for named global imports
2020-11-05 jonathan.l.peyton [OpenMP][stats] reset serial state when re-entering serial region
2020-11-17 Matthew.Arsenault Linker: Fix linking of byref types
2020-11-16 jay.foad [AMDGPU] Precommit more vccz workaround tests
2020-11-17 anton.a.afanasyev [SLPVectorizer] Fix assert
2020-11-17 powerman1st [clang][AVR] Improve avr-ld command line options
2020-11-16 a.bataev [OPENMP]Fix PR48076: mapping of data member pointer.
2020-11-17 flo [Matrix] Add inline assembly test case.
2020-10-30 anton.a.afanasyev [SLP] Make SLPVectorizer to use `llvm.masked.gather` intrinsic
2020-11-17 wingo [WebAssembly][MC] Remove useless overrides in MCWasmStreamer
2020-11-17 joe.ellis [AArch64][SVE] Support implicit lax vector conversions for SVE types
2020-11-14 paul [TableGen] Clean up Target .td include files
2020-11-17 benny.kra [MLIR] Fix up integration tests after b7382ed3fea08da27530a6d6d53f168fc704e4c4
2020-11-17 andrzej.warzynski [flang][nfc] Add missing dependency in CMake
2020-08-05 flo [ConstraintElimination] Add support for And.
2020-11-17 kadircet [clang-tidy] Make clang-format and include-order-check coherent
2020-11-16 erich.keane Update 'note-candiate' functions to skip lambda-conversion-op-overloads
2020-11-12 sander.desmalen Reland [LoopVectorizer] NFCI: Calculate register usage based on TLI.getTypeLegalizationCost.
2020-11-17 marukawa [VE] Implement JumpTable
2020-11-17 herhut [mlir][std] Canonicalize extract_element(tensor_cast).
2020-11-17 herhut [mlir][std] Fold dim(dynamic_tensor_from_elements, %cst)
2020-11-17 herhut [mlir][linalg] Allow tensor_to_memref in dependence analysis
2020-11-17 marukawa [VE] Correct getMnemonic
2020-11-15 zinenko [mlir] Allow for using interface class name in ODS interface definitions
2020-11-17 zinenko [mlir] Fix Python tests after "module_terminator" migrated to ODS
2020-11-17 n.james93 [clang][NFC] Use SmallString instead of SmallVector<char
2020-11-17 llvm-dev [X86] vector-sext.ll - replace X32 check prefix with X86. NFC.
2020-11-17 llvm-dev [X86] insert-into-constant-vector.ll - replace X32 check prefix with X86. NFC.
2020-11-17 llvm-dev [X86] avx-intel-ocl.ll - replace X32 check prefix with X86. NFC.
2020-11-17 llvm-dev [X86] 2011-10-19-widen_vselect.ll - replace X32 check prefix with X86. NFC.
2020-11-17 llvm-dev [clang][driver] Fix definition/declaration argument name mismatches. NFCI.
2020-11-17 omair.javaid [LLDB] Fix SVE reginfo for sequential offset in g packet
2020-11-04 luke.drummond Escape command line arguments in backtraces
2020-11-17 omair.javaid [LLDB] Update SVE Z reg info to remove invalidate regs
2020-11-17 flo [AsmPrinter] Use getMnemonic for instruction-mix remark.
2020-11-17 sven.vanhaastregt [OpenCL] Stop opencl-c-base.h leaking extension enabling
2020-11-17 sguelton [build] Fix dependencies of LLVMExegesis
2020-11-16 zinenko [mlir] Add basic support for attributes in ODS-generated Python bindings
2020-11-17 hokein.wu [clang-tidy] Fix an abseil-redundant-strcat-calls crash on 0-parameter StrCat().
2020-11-15 marukawa [VE] Add vbrd intrinsic instructions
2020-11-17 powerman1st [AVR] Optimize the 16-bit NEGW pseudo instruction
2020-11-17 flo [AsmWriter] Factor out mnemonic generation to accessible getMnemonic.
2020-11-13 sguelton [build] normalize components dependencies
2020-11-17 lkail [PowerPC] Add negated abs test using llvm.abs intrinsic. NFC.
2020-11-17 hokein.wu [clang-tidy] Verify the fixes in abseil-redundant-strcat-calls test, NFC
2020-11-17 riddleriver [mlir][NFC] Remove references to Module.h and Function.h
(...)
2020-11-14 marukawa [VE] Add lvm/svm intrinsic instructions
2020-11-16 jonas [crashlog] Implement parser for JSON encoded crashlogs
2020-11-16 flo [ConstraintElimination] Add support for Or.
2020-11-16 listmail [LoopVec] Introduce an api for detecting uniform memory ops
2020-11-13 ldionne [libc++] Move the GDB pretty printer tests to the DSL
2020-11-09 kostyak [scudo][standalone] Correct min/max region indices
2020-11-05 silvasean [mlir] Add DecomposeCallGraphTypes pass.
2020-11-16 thakis lld/mach-o: Infer darwinnew from filename ld64.lld.darwinnew too
2020-11-16 listmail [SCEV] Factor out part of wrap flag detection logic [NFC](try 2)
2020-11-16 aschwaighofer [coro] Async coroutines: Make sure we can handle control flow in suspend point dispatch function
2020-11-16 flo [ConstraintElimination] Add complex test cases.
2020-11-16 spatel Revert "[InstCombine] add multi-use demanded bits fold for add with low-bit mask"
2020-11-16 aaron Another speculative fix for lldb related to ConstexprSpecKind
2020-11-16 aaron Speculatively fix the lldb build
2020-11-16 schuett Convert ConstexprKind from Specifiers.h to a scoped enum; NFC
2020-11-16 jonas [dsymutil] Generalize handling of aliases external symbols
2020-11-13 amara [AArch64][GlobalISel] Look through a G_ZEXT when trying to match shift-extended register offsets.
2020-11-16 Scott.Linder [YAMLIO] Correctly diagnose empty alias/anchor
2020-11-16 craig.topper [RISCV] Add MC tests for the User Vector CSRs
2020-11-16 ldionne [libc++] Remove transitional #error message
2020-11-16 vtjnash Reland "[AsmPrinter] fix -disable-debug-info option"
2020-11-16 praveen [Flang][OpenMP] Add semantic checks for OpenMP Depend clause.
2020-11-16 craig.topper [RISCV] When matching SROIW, check all 64 bits of the OR mask
2020-11-13 aeubanks [SimplifyCFG] Respect optforfuzzing in NPM pass
2020-11-16 teemperor [lldb] Skip TestCppKeywordsAsCIdentifiers on Windows
2020-11-13 pklausler [flang] Unsplit COMPLEX operations
2020-11-16 metzman [fuzzer] Disable uncaught-exception on non-Win+undo bad fix
2020-11-16 xun [Coroutine] Allocas used by StoreInst does not always escape
2020-11-16 metzman [fuzzer] Add allocator_may_return_null to uncaught-exception.test.
2020-11-10 Matthew.Arsenault AMDGPU: Select global saddr mode from SGPR pointer
2020-11-16 Mirko.Brkusanin [AMDGPU][GlobalISel] Fix lowerShlSat
2020-11-09 Matthew.Arsenault AMDGPU: Split large offsets when selecting global saddr mode
2020-11-16 wei.huang Fix the compilation assertion due to unreachable BB pruning not deleting the associated BB from the jump tables
2020-11-16 jay.foad [AMDGPU] Add comments. NFC.
2020-11-16 csigg [mlir] Require std.alloc() ops to have canonical layout during LLVM lowering.
2020-11-16 andrzej.warzynski [flang][f18] Remove "-fdebug-resolve-names"
2020-11-15 marukawa [VE] Optimize leaf functions
2020-11-16 david.truby [MLIR][OpenMP] Add omp.wsloop operation
2020-11-16 simon.moll [VE] fastcc and vreg-to-vreg copy
2020-11-14 yhs BPF: make __builtin_btf_type_id() return 64bit int
2020-11-16 Xiangling.Liao [AIX][driver] Include crti[_64].o and -bcdtors also for C language link invocations by default
2020-11-16 teemperor [lldb] Add support for using variables with C++ keywords names in non-C++ expressions
2020-11-16 llvmgnsyncbot [gn build] Port 8dbe44cb293
2020-11-16 flo Add pass to add !annotate metadata from @llvm.global.annotations.
2020-11-16 hanchung [mlir][StandardToSPIRV] Extend support for lowering cmpi to SPIRV.
2020-11-16 francesco.petrogalli [clang][SveEmitter] Fix enum declarations. [NFCI]
2020-11-14 marukawa [VE] Add lsv/lvs intrinsic instructions
2020-11-16 aaron Fix bots that are running with assertions enabled; NFC.
2020-11-16 aaron Adding some explicit casts to appease build bots; NFC
2020-11-16 schuett Convert TypeSpecifierSign from Specifiers.h to a scoped enum; NFC
Created with:
roll-dep third_party/clspv-llvm
Roll third_party/swiftshader/ e4c1a25cc..04515da40 (3 commits)
https://swiftshader.googlesource.com/SwiftShader.git/+log/e4c1a25cc679..04515da400d5
$ git log e4c1a25cc..04515da40 --date=short --no-merges --format='%ad %ae %s'
2020-11-12 srisser Don't auto append value of stringified enums
2020-11-13 capn Work around LLVM ORCv2 issue affecting Cuttlefish
2020-11-06 capn Enable Reactor Print() in Debug/RelWithDebInfo builds
Created with:
roll-dep third_party/swiftshader
Roll third_party/vulkan-validationlayers/ 9d3ef3258..0cb8cc8cf (4 commits)
https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/9d3ef3258715...0cb8cc8cfcb2
$ git log 9d3ef3258..0cb8cc8cf --date=short --no-merges --format='%ad %ae %s'
2020-11-11 karl tests: Add test for destroyed buffer during draw validate
2020-11-11 karl layers: Remove duplicate handles from Descriptor subclasses
2020-11-16 mark repo: Update issue templates
2020-11-16 mark repo: Update issue templates
Created with:
roll-dep third_party/vulkan-validationlayers
* suppress on bot
27 files changed, 368 insertions, 359 deletions
@@ -9,22 +9,22 @@ vars = { 'nlohmann_git': 'https://github.com/nlohmann', 'swiftshader_git': 'https://swiftshader.googlesource.com', - 'clspv_llvm_revision': 'b91a236ee1c3e9fa068df058164385732cb46bba', - 'clspv_revision': '3a11614ee40907c6f9edd99bd7d23b123111e947', + 'clspv_llvm_revision': '7e30989dabce9ddbca0cbad7a8f25fb4e756d334', + 'clspv_revision': 'e0406e7053d1bb46b4bbeb57f0f2bbfca32f5612', 'cppdap_revision': '1fd23dda91e01550be1a421de307e6fedb2035a9', 'cpplint_revision': '26470f9ccb354ff2f6d098f831271a1833701b28', - 'dxc_revision': 'a8d9780046cb64a1cea842fa6fc28a250e3e2c09', - 'glslang_revision': '740ae9f60b009196662bad811924788cee56133a', - 'googletest_revision': '3005672db1d05f2378f642b61faa96f85498befe', + 'dxc_revision': '489c2e4d32417cd6693db5673ab071d82e1f5974', + 'glslang_revision': '7f6559d2802d0653541060f0909e33d137b9c8ba', + 'googletest_revision': '0555b0eacbc56df1fd762c6aa87bb84be9e4ce7e', 'json_revision': '350ff4f7ced7c4117eae2fb93df02823c8021fcb', 'lodepng_revision': '7fdcc96a5e5864eee72911c3ca79b1d9f0d12292', - 'shaderc_revision': '813ef3dc0d5e10bfdf836c651099fcb2203c24ae', - 'spirv_headers_revision': '7845730cab6ebbdeb621e7349b7dc1a59c3377be', - 'spirv_tools_revision': 'a61d07a72763c1eb200de0a2c316703643a0d1d9', - 'swiftshader_revision': 'e1012cfc791ddbc6ce11e319831da7973b9a5b32', - 'vulkan_headers_revision': '320af06cbdd29848e1d7100d9b8e4e517db1dfd5', - 'vulkan_loader_revision': '2b0892e15bd83886476141c1f19801d2968efadf', - 'vulkan_validationlayers_revision': '87b0951f8dbaf3d0562a073bc5dd580c4468a1a1', + 'shaderc_revision': '88f9156d7f6a2a30baed1ace196faa3bc5eccc05', + 'spirv_headers_revision': '5ab5c96198f30804a6a29961b8905f292a8ae600', + 'spirv_tools_revision': '1f2fcddd3963b9c29bf360daf7656c5977c2aadd', + 'swiftshader_revision': '04515da400d5fbc22d852af1369c4d46bd54991e', + 'vulkan_headers_revision': '11c6670b4a4f766ed4f1e777d1b3c3dc082dfa5f', + 'vulkan_loader_revision': 'be6ccb9ecaf77dfef59246a1e8502e99c8e1a511', + 'vulkan_validationlayers_revision': '0cb8cc8cfcb2b86a767c9516ac2d62edb4e38ebe', } deps = { diff --git a/samples/amber.cc b/samples/amber.cc index 0ea0e00..d037ba4 100644 --- a/samples/amber.cc +++ b/samples/amber.cc @@ -15,6 +15,7 @@ #include "amber/amber.h" #include <stdio.h> + #include <algorithm> #include <cassert> #include <cstdio> diff --git a/src/amberscript/parser_attach_test.cc b/src/amberscript/parser_attach_test.cc index 1f515a2..6ab92be 100644 --- a/src/amberscript/parser_attach_test.cc +++ b/src/amberscript/parser_attach_test.cc @@ -329,8 +329,8 @@ END)"; const auto& shaders = pipeline->GetShaders(); ASSERT_EQ(1U, shaders.size()); - EXPECT_EQ(1, shaders[0].GetSpecialization().size()); - EXPECT_EQ(4, shaders[0].GetSpecialization().at(1)); + EXPECT_EQ(1u, shaders[0].GetSpecialization().size()); + EXPECT_EQ(4u, shaders[0].GetSpecialization().at(1)); } TEST_F(AmberScriptParserTest, PipelineSpecializationInt32) { @@ -354,8 +354,8 @@ END)"; const auto& shaders = pipeline->GetShaders(); ASSERT_EQ(1U, shaders.size()); - EXPECT_EQ(1, shaders[0].GetSpecialization().size()); - EXPECT_EQ(0xffffffff, shaders[0].GetSpecialization().at(2)); + EXPECT_EQ(1u, shaders[0].GetSpecialization().size()); + EXPECT_EQ(0xffffffffu, shaders[0].GetSpecialization().at(2)); } TEST_F(AmberScriptParserTest, PipelineSpecializationFloat) { @@ -379,8 +379,8 @@ END)"; const auto& shaders = pipeline->GetShaders(); ASSERT_EQ(1U, shaders.size()); - EXPECT_EQ(1, shaders[0].GetSpecialization().size()); - EXPECT_EQ(0x3f8ccccd, shaders[0].GetSpecialization().at(3)); + EXPECT_EQ(1u, shaders[0].GetSpecialization().size()); + EXPECT_EQ(0x3f8ccccdu, shaders[0].GetSpecialization().at(3)); } TEST_F(AmberScriptParserTest, PipelineSpecializationIDIsString) { @@ -469,10 +469,10 @@ END)"; const auto& shaders = pipeline->GetShaders(); ASSERT_EQ(1U, shaders.size()); - EXPECT_EQ(3, shaders[0].GetSpecialization().size()); - EXPECT_EQ(4, shaders[0].GetSpecialization().at(1)); - EXPECT_EQ(5, shaders[0].GetSpecialization().at(2)); - EXPECT_EQ(1, shaders[0].GetSpecialization().at(5)); + EXPECT_EQ(3u, shaders[0].GetSpecialization().size()); + EXPECT_EQ(4u, shaders[0].GetSpecialization().at(1)); + EXPECT_EQ(5u, shaders[0].GetSpecialization().at(2)); + EXPECT_EQ(1u, shaders[0].GetSpecialization().at(5)); } TEST_F(AmberScriptParserTest, PipelineSpecializationNoType) { @@ -496,8 +496,8 @@ END)"; const auto& shaders = pipeline->GetShaders(); ASSERT_EQ(1U, shaders.size()); - EXPECT_EQ(1, shaders[0].GetSpecialization().size()); - EXPECT_EQ(4, shaders[0].GetSpecialization().at(1)); + EXPECT_EQ(1u, shaders[0].GetSpecialization().size()); + EXPECT_EQ(4u, shaders[0].GetSpecialization().at(1)); } } // namespace amberscript diff --git a/src/amberscript/parser_bind_test.cc b/src/amberscript/parser_bind_test.cc index 62c0fc7..7f07980 100644 --- a/src/amberscript/parser_bind_test.cc +++ b/src/amberscript/parser_bind_test.cc @@ -49,10 +49,11 @@ END)"; const auto& buf_info = color_buffers[0]; ASSERT_TRUE(buf_info.buffer != nullptr); - EXPECT_EQ(0, buf_info.location); - EXPECT_EQ(250 * 250, buf_info.buffer->ElementCount()); - EXPECT_EQ(250 * 250 * 4, buf_info.buffer->ValueCount()); - EXPECT_EQ(250 * 250 * 4 * sizeof(float), buf_info.buffer->GetSizeInBytes()); + EXPECT_EQ(0u, buf_info.location); + EXPECT_EQ(250u * 250u, buf_info.buffer->ElementCount()); + EXPECT_EQ(250u * 250u * 4u, buf_info.buffer->ValueCount()); + EXPECT_EQ(250u * 250u * 4u * sizeof(float), + buf_info.buffer->GetSizeInBytes()); } TEST_F(AmberScriptParserTest, BindColorBufferTwice) { @@ -297,19 +298,19 @@ END)"; const auto& buf1 = color_buffers1[0]; ASSERT_TRUE(buf1.buffer != nullptr); - EXPECT_EQ(0, buf1.location); - EXPECT_EQ(90 * 180, buf1.buffer->ElementCount()); - EXPECT_EQ(90 * 180 * 4, buf1.buffer->ValueCount()); - EXPECT_EQ(90 * 180 * 4 * sizeof(float), buf1.buffer->GetSizeInBytes()); + EXPECT_EQ(0u, buf1.location); + EXPECT_EQ(90u * 180u, buf1.buffer->ElementCount()); + EXPECT_EQ(90u * 180u * 4u, buf1.buffer->ValueCount()); + EXPECT_EQ(90u * 180u * 4u * sizeof(float), buf1.buffer->GetSizeInBytes()); pipeline = pipelines[1].get(); const auto& color_buffers2 = pipeline->GetColorAttachments(); const auto& buf2 = color_buffers2[0]; ASSERT_TRUE(buf2.buffer != nullptr); - EXPECT_EQ(9, buf2.location); - EXPECT_EQ(256 * 300, buf2.buffer->ElementCount()); - EXPECT_EQ(256 * 300 * 4, buf2.buffer->ValueCount()); - EXPECT_EQ(256 * 300 * 4 * sizeof(uint8_t), buf2.buffer->GetSizeInBytes()); + EXPECT_EQ(9u, buf2.location); + EXPECT_EQ(256u * 300u, buf2.buffer->ElementCount()); + EXPECT_EQ(256u * 300u * 4u, buf2.buffer->ValueCount()); + EXPECT_EQ(256u * 300u * 4u * sizeof(uint8_t), buf2.buffer->GetSizeInBytes()); } TEST_F(AmberScriptParserTest, BindColorFBSizeSetBeforeBuffer) { @@ -342,10 +343,10 @@ END)"; const auto& buf1 = color_buffers1[0]; ASSERT_TRUE(buf1.buffer != nullptr); - EXPECT_EQ(0, buf1.location); - EXPECT_EQ(90 * 180, buf1.buffer->ElementCount()); - EXPECT_EQ(90 * 180 * 4, buf1.buffer->ValueCount()); - EXPECT_EQ(90 * 180 * 4 * sizeof(float), buf1.buffer->GetSizeInBytes()); + EXPECT_EQ(0u, buf1.location); + EXPECT_EQ(90u * 180u, buf1.buffer->ElementCount()); + EXPECT_EQ(90u * 180u * 4u, buf1.buffer->ValueCount()); + EXPECT_EQ(90u * 180u * 4u * sizeof(float), buf1.buffer->GetSizeInBytes()); } TEST_F(AmberScriptParserTest, BindColorFBSizeSetAfterBuffer) { @@ -378,10 +379,10 @@ END)"; const auto& buf1 = color_buffers1[0]; ASSERT_TRUE(buf1.buffer != nullptr); - EXPECT_EQ(0, buf1.location); - EXPECT_EQ(90 * 180, buf1.buffer->ElementCount()); - EXPECT_EQ(90 * 180 * 4, buf1.buffer->ValueCount()); - EXPECT_EQ(90 * 180 * 4 * sizeof(float), buf1.buffer->GetSizeInBytes()); + EXPECT_EQ(0u, buf1.location); + EXPECT_EQ(90u * 180u, buf1.buffer->ElementCount()); + EXPECT_EQ(90u * 180u * 4u, buf1.buffer->ValueCount()); + EXPECT_EQ(90u * 180u * 4u * sizeof(float), buf1.buffer->GetSizeInBytes()); } TEST_F(AmberScriptParserTest, BindColorBaseMipLevel) { @@ -414,7 +415,7 @@ END)"; const auto& buf1 = color_buffers1[0]; ASSERT_TRUE(buf1.buffer != nullptr); - EXPECT_EQ(1, buf1.base_mip_level); + EXPECT_EQ(1u, buf1.base_mip_level); } TEST_F(AmberScriptParserTest, BindColorMissingBaseMipLevel) { @@ -515,9 +516,9 @@ END)"; const auto* pipeline = pipelines[0].get(); const auto& buf = pipeline->GetDepthStencilBuffer(); ASSERT_TRUE(buf.buffer != nullptr); - EXPECT_EQ(90 * 180, buf.buffer->ElementCount()); - EXPECT_EQ(90 * 180 * 4, buf.buffer->ValueCount()); - EXPECT_EQ(90 * 180 * 4 * sizeof(float), buf.buffer->GetSizeInBytes()); + EXPECT_EQ(90u * 180u, buf.buffer->ElementCount()); + EXPECT_EQ(90u * 180u * 4u, buf.buffer->ValueCount()); + EXPECT_EQ(90u * 180u * 4u * sizeof(float), buf.buffer->GetSizeInBytes()); } TEST_F(AmberScriptParserTest, BindDepthBufferExtraParams) { @@ -680,16 +681,16 @@ END)"; const auto* pipeline = pipelines[0].get(); const auto& vertex_buffers = pipeline->GetVertexBuffers(); - ASSERT_EQ(2, vertex_buffers.size()); + ASSERT_EQ(2u, vertex_buffers.size()); const auto& info1 = vertex_buffers[0]; ASSERT_TRUE(info1.buffer != nullptr); - EXPECT_EQ(0, info1.location); + EXPECT_EQ(0u, info1.location); EXPECT_EQ(InputRate::kVertex, info1.input_rate); const auto& info2 = vertex_buffers[1]; ASSERT_TRUE(info2.buffer != nullptr); - EXPECT_EQ(1, info2.location); + EXPECT_EQ(1u, info2.location); EXPECT_EQ(InputRate::kVertex, info2.input_rate); } @@ -871,16 +872,16 @@ END)"; const auto* pipeline = pipelines[0].get(); const auto& vertex_buffers = pipeline->GetVertexBuffers(); - ASSERT_EQ(2, vertex_buffers.size()); + ASSERT_EQ(2u, vertex_buffers.size()); const auto& info1 = vertex_buffers[0]; ASSERT_TRUE(info1.buffer != nullptr); - EXPECT_EQ(0, info1.location); + EXPECT_EQ(0u, info1.location); EXPECT_EQ(InputRate::kVertex, info1.input_rate); const auto& info2 = vertex_buffers[1]; ASSERT_TRUE(info2.buffer != nullptr); - EXPECT_EQ(1, info2.location); + EXPECT_EQ(1u, info2.location); EXPECT_EQ(InputRate::kInstance, info2.input_rate); } @@ -1312,9 +1313,9 @@ END)"; const auto* pipeline = pipelines[0].get(); const auto& buf = pipeline->GetPushConstantBuffer(); ASSERT_TRUE(buf.buffer != nullptr); - EXPECT_EQ(20, buf.buffer->ElementCount()); - EXPECT_EQ(20, buf.buffer->ValueCount()); - EXPECT_EQ(20 * sizeof(float), buf.buffer->GetSizeInBytes()); + EXPECT_EQ(20u, buf.buffer->ElementCount()); + EXPECT_EQ(20u, buf.buffer->ValueCount()); + EXPECT_EQ(20u * sizeof(float), buf.buffer->GetSizeInBytes()); } TEST_F(AmberScriptParserTest, BindPushConstantsExtraParams) { diff --git a/src/amberscript/parser_buffer_test.cc b/src/amberscript/parser_buffer_test.cc index b6cbf43..aeac2cb 100644 --- a/src/amberscript/parser_buffer_test.cc +++ b/src/amberscript/parser_buffer_test.cc @@ -662,7 +662,7 @@ TEST_F(AmberScriptParserTest, BufferFormat) { ASSERT_EQ(4U, segs.size()); for (size_t i = 0; i < 4; ++i) { - EXPECT_EQ(segs[i].GetNumBits(), 32); + EXPECT_EQ(segs[i].GetNumBits(), 32u); EXPECT_EQ(segs[i].GetFormatMode(), FormatMode::kSInt); EXPECT_EQ(segs[i].GetName(), static_cast<FormatComponentType>(i)); } @@ -950,12 +950,12 @@ END)"; const auto* data = buffer->GetValues<uint8_t>(); EXPECT_FLOAT_EQ(1.f, *reinterpret_cast<const float*>(data + 0)); - EXPECT_EQ(64, + EXPECT_EQ(64u, *reinterpret_cast<const uint32_t*>(data + 4 /* sizeof(float) */)); - EXPECT_EQ(128, + EXPECT_EQ(128u, *reinterpret_cast<const uint32_t*>(data + 16 /* 8 round -> 16 */)); - EXPECT_EQ(220, *reinterpret_cast<const uint32_t*>( - data + 20 /* 8 round -> 16 + 4 */)); + EXPECT_EQ(220u, *reinterpret_cast<const uint32_t*>( + data + 20 /* 8 round -> 16 + 4 */)); } TEST_F(AmberScriptParserTest, BufferWithStructStd430) { @@ -998,9 +998,9 @@ END)"; const auto* data = buffer->GetValues<uint8_t>(); EXPECT_FLOAT_EQ(1.f, *reinterpret_cast<const float*>(data + 0)); - EXPECT_EQ(64, *reinterpret_cast<const uint32_t*>(data + 4)); - EXPECT_EQ(128, *reinterpret_cast<const uint32_t*>(data + 8)); - EXPECT_EQ(220, *reinterpret_cast<const uint32_t*>(data + 12)); + EXPECT_EQ(64u, *reinterpret_cast<const uint32_t*>(data + 4)); + EXPECT_EQ(128u, *reinterpret_cast<const uint32_t*>(data + 8)); + EXPECT_EQ(220u, *reinterpret_cast<const uint32_t*>(data + 12)); } TEST_F(AmberScriptParserTest, BufferWithStructAndPaddingStd430) { @@ -1043,9 +1043,9 @@ END)"; const auto* data = buffer->GetValues<uint8_t>(); EXPECT_FLOAT_EQ(1.f, *reinterpret_cast<const float*>(data + 8)); - EXPECT_EQ(64, *reinterpret_cast<const uint32_t*>(data + 16)); - EXPECT_EQ(128, *reinterpret_cast<const uint32_t*>(data + 28)); - EXPECT_EQ(220, *reinterpret_cast<const uint32_t*>(data + 36)); + EXPECT_EQ(64u, *reinterpret_cast<const uint32_t*>(data + 16)); + EXPECT_EQ(128u, *reinterpret_cast<const uint32_t*>(data + 28)); + EXPECT_EQ(220u, *reinterpret_cast<const uint32_t*>(data + 36)); } TEST_F(AmberScriptParserTest, BufferWithStructPartialInitialization) { @@ -1101,9 +1101,9 @@ END)"; const auto* data = buffer->GetValues<uint8_t>(); EXPECT_FLOAT_EQ(1.f, *reinterpret_cast<const float*>(data + 0)); - EXPECT_FLOAT_EQ(64, *reinterpret_cast<const float*>(data + 16)); - EXPECT_FLOAT_EQ(128, *reinterpret_cast<const float*>(data + 20)); - EXPECT_FLOAT_EQ(220, *reinterpret_cast<const float*>(data + 24)); + EXPECT_FLOAT_EQ(64u, *reinterpret_cast<const float*>(data + 16)); + EXPECT_FLOAT_EQ(128u, *reinterpret_cast<const float*>(data + 20)); + EXPECT_FLOAT_EQ(220u, *reinterpret_cast<const float*>(data + 24)); } TEST_F(AmberScriptParserTest, InvalidBufferWidth) { @@ -1178,9 +1178,9 @@ BUFFER buf DATA_TYPE vec4<float> WIDTH 2 HEIGHT 3 EXPECT_EQ("buf", buffers[0]->GetName()); auto* buffer = buffers[0].get(); - EXPECT_EQ(2, buffer->GetWidth()); - EXPECT_EQ(3, buffer->GetHeight()); - EXPECT_EQ(6, buffer->ElementCount()); + EXPECT_EQ(2u, buffer->GetWidth()); + EXPECT_EQ(3u, buffer->GetHeight()); + EXPECT_EQ(6u, buffer->ElementCount()); } TEST_F(AmberScriptParserTest, BufferMipLevels) { diff --git a/src/amberscript/parser_clear_stencil_test.cc b/src/amberscript/parser_clear_stencil_test.cc index 2e8cbb2..eed7f14 100644 --- a/src/amberscript/parser_clear_stencil_test.cc +++ b/src/amberscript/parser_clear_stencil_test.cc @@ -47,7 +47,7 @@ CLEAR_STENCIL my_pipeline 15)"; ASSERT_TRUE(cmd->IsClearStencil()); auto* clr = cmd->AsClearStencil(); - EXPECT_EQ(15, clr->GetValue()); + EXPECT_EQ(15u, clr->GetValue()); } TEST_F(AmberScriptParserTest, ClearStencilWithComputePipeline) { diff --git a/src/amberscript/parser_expect_test.cc b/src/amberscript/parser_expect_test.cc index fccd491..125e38b 100644 --- a/src/amberscript/parser_expect_test.cc +++ b/src/amberscript/parser_expect_test.cc @@ -656,7 +656,7 @@ EXPECT orig_buf IDX 5 EQ 11)"; EXPECT_EQ(5U, probe->GetOffset()); EXPECT_TRUE(probe->GetFormat()->IsInt32()); ASSERT_EQ(1U, probe->GetValues().size()); - EXPECT_EQ(11U, probe->GetValues()[0].AsInt32()); + EXPECT_EQ(11, probe->GetValues()[0].AsInt32()); } TEST_F(AmberScriptParserTest, ExpectEQStruct) { @@ -874,7 +874,7 @@ EXPECT orig_buf IDX 5 TOLERANCE 1 EQ 11)"; EXPECT_EQ(5U, probe->GetOffset()); EXPECT_TRUE(probe->GetFormat()->IsInt32()); ASSERT_EQ(1U, probe->GetValues().size()); - EXPECT_EQ(11U, probe->GetValues()[0].AsInt32()); + EXPECT_EQ(11, probe->GetValues()[0].AsInt32()); EXPECT_TRUE(probe->HasTolerances()); auto& tolerances = probe->GetTolerances(); @@ -904,7 +904,7 @@ EXPECT orig_buf IDX 5 TOLERANCE 1% EQ 11)"; EXPECT_EQ(5U, probe->GetOffset()); EXPECT_TRUE(probe->GetFormat()->IsInt32()); ASSERT_EQ(1U, probe->GetValues().size()); - EXPECT_EQ(11U, probe->GetValues()[0].AsInt32()); + EXPECT_EQ(11, probe->GetValues()[0].AsInt32()); EXPECT_TRUE(probe->HasTolerances()); auto& tolerances = probe->GetTolerances(); @@ -934,7 +934,7 @@ EXPECT orig_buf IDX 5 TOLERANCE 1% .2 3.7% 4 EQ 11)"; EXPECT_EQ(5U, probe->GetOffset()); EXPECT_TRUE(probe->GetFormat()->IsInt32()); ASSERT_EQ(1U, probe->GetValues().size()); - EXPECT_EQ(11U, probe->GetValues()[0].AsInt32()); + EXPECT_EQ(11, probe->GetValues()[0].AsInt32()); EXPECT_TRUE(probe->HasTolerances()); auto& tolerances = probe->GetTolerances(); diff --git a/src/amberscript/parser_framebuffer_test.cc b/src/amberscript/parser_framebuffer_test.cc index 27dc0ce..f0cf96f 100644 --- a/src/amberscript/parser_framebuffer_test.cc +++ b/src/amberscript/parser_framebuffer_test.cc @@ -41,8 +41,8 @@ END ASSERT_EQ(1U, pipelines.size()); const auto* pipeline = pipelines[0].get(); - EXPECT_EQ(250, pipeline->GetFramebufferWidth()); - EXPECT_EQ(250, pipeline->GetFramebufferHeight()); + EXPECT_EQ(250u, pipeline->GetFramebufferWidth()); + EXPECT_EQ(250u, pipeline->GetFramebufferHeight()); } TEST_F(AmberScriptParserTest, FramebufferSize) { @@ -67,8 +67,8 @@ END ASSERT_EQ(1U, pipelines.size()); const auto* pipeline = pipelines[0].get(); - EXPECT_EQ(256, pipeline->GetFramebufferWidth()); - EXPECT_EQ(246, pipeline->GetFramebufferHeight()); + EXPECT_EQ(256u, pipeline->GetFramebufferWidth()); + EXPECT_EQ(246u, pipeline->GetFramebufferHeight()); } TEST_F(AmberScriptParserTest, FramebufferSizeMissingSize) { diff --git a/src/amberscript/parser_image_test.cc b/src/amberscript/parser_image_test.cc index bbd98fb..bfa3fb6 100644 --- a/src/amberscript/parser_image_test.cc +++ b/src/amberscript/parser_image_test.cc @@ -214,10 +214,10 @@ IMAGE image DATA_TYPE uint32 DIM_1D WIDTH 4 auto* buffer = buffers[0].get(); EXPECT_TRUE(buffer->GetFormat()->IsUint32()); EXPECT_EQ(ImageDimension::k1D, buffer->GetImageDimension()); - EXPECT_EQ(4, buffer->GetWidth()); - EXPECT_EQ(1, buffer->GetHeight()); - EXPECT_EQ(1, buffer->GetDepth()); - EXPECT_EQ(4, buffer->ElementCount()); + EXPECT_EQ(4u, buffer->GetWidth()); + EXPECT_EQ(1u, buffer->GetHeight()); + EXPECT_EQ(1u, buffer->GetDepth()); + EXPECT_EQ(4u, buffer->ElementCount()); } TEST_F(AmberScriptParserTest, Image2D) { @@ -238,10 +238,10 @@ IMAGE image DATA_TYPE uint32 DIM_2D WIDTH 3 HEIGHT 4 auto* buffer = buffers[0].get(); EXPECT_TRUE(buffer->GetFormat()->IsUint32()); EXPECT_EQ(ImageDimension::k2D, buffer->GetImageDimension()); - EXPECT_EQ(3, buffer->GetWidth()); - EXPECT_EQ(4, buffer->GetHeight()); - EXPECT_EQ(1, buffer->GetDepth()); - EXPECT_EQ(12, buffer->ElementCount()); + EXPECT_EQ(3u, buffer->GetWidth()); + EXPECT_EQ(4u, buffer->GetHeight()); + EXPECT_EQ(1u, buffer->GetDepth()); + EXPECT_EQ(12u, buffer->ElementCount()); } TEST_F(AmberScriptParserTest, Image2DMultiSample) { @@ -260,7 +260,7 @@ IMAGE image DATA_TYPE uint32 DIM_2D WIDTH 3 HEIGHT 4 SAMPLES 4 EXPECT_EQ("image", buffers[0]->GetName()); auto* buffer = buffers[0].get(); - EXPECT_EQ(4, buffer->GetSamples()); + EXPECT_EQ(4u, buffer->GetSamples()); } TEST_F(AmberScriptParserTest, Image2DInvalidSampleValue) { @@ -303,10 +303,10 @@ IMAGE image DATA_TYPE uint32 DIM_3D WIDTH 3 HEIGHT 4 DEPTH 5 auto* buffer = buffers[0].get(); EXPECT_TRUE(buffer->GetFormat()->IsUint32()); EXPECT_EQ(ImageDimension::k3D, buffer->GetImageDimension()); - EXPECT_EQ(3, buffer->GetWidth()); - EXPECT_EQ(4, buffer->GetHeight()); - EXPECT_EQ(5, buffer->GetDepth()); - EXPECT_EQ(60, buffer->ElementCount()); + EXPECT_EQ(3u, buffer->GetWidth()); + EXPECT_EQ(4u, buffer->GetHeight()); + EXPECT_EQ(5u, buffer->GetDepth()); + EXPECT_EQ(60u, buffer->ElementCount()); } } // namespace amberscript diff --git a/src/amberscript/parser_pipeline_test.cc b/src/amberscript/parser_pipeline_test.cc index 197f1a1..2b56e2e 100644 --- a/src/amberscript/parser_pipeline_test.cc +++ b/src/amberscript/parser_pipeline_test.cc @@ -198,21 +198,21 @@ END)"; Buffer* buffer1 = buf1.buffer; EXPECT_EQ(FormatType::kB8G8R8A8_UNORM, buffer1->GetFormat()->GetFormatType()); - EXPECT_EQ(0, buf1.location); - EXPECT_EQ(250 * 250, buffer1->ElementCount()); - EXPECT_EQ(250 * 250 * 4, buffer1->ValueCount()); - EXPECT_EQ(250 * 250 * 4 * sizeof(uint8_t), buffer1->GetSizeInBytes()); + EXPECT_EQ(0u, buf1.location); + EXPECT_EQ(250u * 250u, buffer1->ElementCount()); + EXPECT_EQ(250u * 250u * 4u, buffer1->ValueCount()); + EXPECT_EQ(250u * 250u * 4u * sizeof(uint8_t), buffer1->GetSizeInBytes()); ASSERT_EQ(1U, pipelines[1]->GetColorAttachments().size()); const auto& buf2 = pipelines[1]->GetColorAttachments()[0]; ASSERT_TRUE(buf2.buffer != nullptr); ASSERT_EQ(buffer1, buf2.buffer); - EXPECT_EQ(0, buf2.location); + EXPECT_EQ(0u, buf2.location); EXPECT_EQ(FormatType::kB8G8R8A8_UNORM, buf2.buffer->GetFormat()->GetFormatType()); - EXPECT_EQ(250 * 250, buf2.buffer->ElementCount()); - EXPECT_EQ(250 * 250 * 4, buf2.buffer->ValueCount()); - EXPECT_EQ(250 * 250 * 4 * sizeof(uint8_t), buf2.buffer->GetSizeInBytes()); + EXPECT_EQ(250u * 250u, buf2.buffer->ElementCount()); + EXPECT_EQ(250u * 250u * 4u, buf2.buffer->ValueCount()); + EXPECT_EQ(250u * 250u * 4u * sizeof(uint8_t), buf2.buffer->GetSizeInBytes()); } TEST_F(AmberScriptParserTest, PipelineDefaultColorBufferMismatchSize) { @@ -367,8 +367,8 @@ END auto buffers1 = pipeline1->GetBuffers(); ASSERT_EQ(1U, buffers1.size()); EXPECT_EQ("buf1", buffers1[0].buffer->GetName()); - EXPECT_EQ(1, buffers1[0].descriptor_set); - EXPECT_EQ(3, buffers1[0].binding); + EXPECT_EQ(1u, buffers1[0].descriptor_set); + EXPECT_EQ(3u, buffers1[0].binding); auto shaders1 = pipeline1->GetShaders(); ASSERT_EQ(2U, shaders1.size()); @@ -381,8 +381,8 @@ END auto buffers2 = pipeline2->GetBuffers(); ASSERT_EQ(1U, buffers2.size()); EXPECT_EQ("buf2", buffers2[0].buffer->GetName()); - EXPECT_EQ(1, buffers2[0].descriptor_set); - EXPECT_EQ(3, buffers2[0].binding); + EXPECT_EQ(1u, buffers2[0].descriptor_set); + EXPECT_EQ(3u, buffers2[0].binding); auto shaders2 = pipeline2->GetShaders(); ASSERT_EQ(2U, shaders2.size()); @@ -530,15 +530,15 @@ END const auto& s1 = p1->GetShaders(); ASSERT_EQ(1U, s1.size()); - EXPECT_EQ(1, s1[0].GetSpecialization().size()); - EXPECT_EQ(4, s1[0].GetSpecialization().at(3)); + EXPECT_EQ(1u, s1[0].GetSpecialization().size()); + EXPECT_EQ(4u, s1[0].GetSpecialization().at(3)); const auto* p2 = pipelines[1].get(); const auto& s2 = p2->GetShaders(); ASSERT_EQ(1U, s2.size()); - EXPECT_EQ(1, s2[0].GetSpecialization().size()); - EXPECT_EQ(4, s2[0].GetSpecialization().at(3)); + EXPECT_EQ(1u, s2[0].GetSpecialization().size()); + EXPECT_EQ(4u, s2[0].GetSpecialization().at(3)); } } // namespace amberscript diff --git a/src/amberscript/parser_run_test.cc b/src/amberscript/parser_run_test.cc index 2060c5f..0f6b23f 100644 --- a/src/amberscript/parser_run_test.cc +++ b/src/amberscript/parser_run_test.cc @@ -517,8 +517,8 @@ RUN my_pipeline DRAW_GRID POS 2 4 SIZE 10 20 CELLS 4 5)"; EXPECT_FLOAT_EQ(4.f, cmd->AsDrawGrid()->GetY()); EXPECT_FLOAT_EQ(10.f, cmd->AsDrawGrid()->GetWidth()); EXPECT_FLOAT_EQ(20.f, cmd->AsDrawGrid()->GetHeight()); - EXPECT_EQ(4, cmd->AsDrawGrid()->GetColumns()); - EXPECT_EQ(5, cmd->AsDrawGrid()->GetRows()); + EXPECT_EQ(4u, cmd->AsDrawGrid()->GetColumns()); + EXPECT_EQ(5u, cmd->AsDrawGrid()->GetRows()); } TEST_F(AmberScriptParserTest, RunDrawGridWithComputePipelineInvalid) { diff --git a/src/amberscript/parser_stencil_test.cc b/src/amberscript/parser_stencil_test.cc index f4492da..194761f 100644 --- a/src/amberscript/parser_stencil_test.cc +++ b/src/amberscript/parser_stencil_test.cc @@ -84,12 +84,12 @@ END)"; ASSERT_EQ(CompareOp::kGreater, pipeline->GetPipelineData()->GetBackCompareOp()); - ASSERT_EQ(1, pipeline->GetPipelineData()->GetFrontCompareMask()); - ASSERT_EQ(4, pipeline->GetPipelineData()->GetBackCompareMask()); - ASSERT_EQ(2, pipeline->GetPipelineData()->GetFrontWriteMask()); - ASSERT_EQ(5, pipeline->GetPipelineData()->GetBackWriteMask()); - ASSERT_EQ(3, pipeline->GetPipelineData()->GetFrontReference()); - ASSERT_EQ(6, pipeline->GetPipelineData()->GetBackReference()); + ASSERT_EQ(1u, pipeline->GetPipelineData()->GetFrontCompareMask()); + ASSERT_EQ(4u, pipeline->GetPipelineData()->GetBackCompareMask()); + ASSERT_EQ(2u, pipeline->GetPipelineData()->GetFrontWriteMask()); + ASSERT_EQ(5u, pipeline->GetPipelineData()->GetBackWriteMask()); + ASSERT_EQ(3u, pipeline->GetPipelineData()->GetFrontReference()); + ASSERT_EQ(6u, pipeline->GetPipelineData()->GetBackReference()); } TEST_F(AmberScriptParserTest, StencilMissingFace) { diff --git a/src/buffer_test.cc b/src/buffer_test.cc index 6e1c121..1868b95 100644 --- a/src/buffer_test.cc +++ b/src/buffer_test.cc @@ -14,9 +14,9 @@ #include "src/buffer.h" +#include <limits> #include <utility> -#include <limits> #include "gtest/gtest.h" #include "src/float16_helper.h" #include "src/type_parser.h" @@ -40,9 +40,9 @@ TEST_F(BufferTest, Size) { Buffer b; b.SetFormat(&fmt); b.SetElementCount(10); - EXPECT_EQ(10, b.ElementCount()); - EXPECT_EQ(10, b.ValueCount()); - EXPECT_EQ(10 * sizeof(int16_t), b.GetSizeInBytes()); + EXPECT_EQ(10u, b.ElementCount()); + EXPECT_EQ(10u, b.ValueCount()); + EXPECT_EQ(10u * sizeof(int16_t), b.GetSizeInBytes()); } TEST_F(BufferTest, SizeFromData) { @@ -57,9 +57,9 @@ TEST_F(BufferTest, SizeFromData) { b.SetFormat(&fmt); b.SetData(std::move(values)); - EXPECT_EQ(5, b.ElementCount()); - EXPECT_EQ(5, b.ValueCount()); - EXPECT_EQ(5 * sizeof(float), b.GetSizeInBytes()); + EXPECT_EQ(5u, b.ElementCount()); + EXPECT_EQ(5u, b.ValueCount()); + EXPECT_EQ(5u * sizeof(float), b.GetSizeInBytes()); } TEST_F(BufferTest, SizeFromDataDoesNotOverrideSize) { @@ -75,9 +75,9 @@ TEST_F(BufferTest, SizeFromDataDoesNotOverrideSize) { b.SetElementCount(20); b.SetData(std::move(values)); - EXPECT_EQ(20, b.ElementCount()); - EXPECT_EQ(20, b.ValueCount()); - EXPECT_EQ(20 * sizeof(float), b.GetSizeInBytes()); + EXPECT_EQ(20u, b.ElementCount()); + EXPECT_EQ(20u, b.ValueCount()); + EXPECT_EQ(20u * sizeof(float), b.GetSizeInBytes()); } TEST_F(BufferTest, SizeMatrixStd430) { @@ -90,9 +90,9 @@ TEST_F(BufferTest, SizeMatrixStd430) { b.SetFormat(&fmt); b.SetElementCount(10); - EXPECT_EQ(10, b.ElementCount()); - EXPECT_EQ(60, b.ValueCount()); - EXPECT_EQ(60 * sizeof(int16_t), b.GetSizeInBytes()); + EXPECT_EQ(10u, b.ElementCount()); + EXPECT_EQ(60u, b.ValueCount()); + EXPECT_EQ(60u * sizeof(int16_t), b.GetSizeInBytes()); } TEST_F(BufferTest, SizeMatrixStd140) { @@ -106,9 +106,9 @@ TEST_F(BufferTest, SizeMatrixStd140) { b.SetFormat(&fmt); b.SetElementCount(10); - EXPECT_EQ(10, b.ElementCount()); - EXPECT_EQ(10 * 2 * 3, b.ValueCount()); - EXPECT_EQ(120 * sizeof(int16_t), b.GetSizeInBytes()); + EXPECT_EQ(10u, b.ElementCount()); + EXPECT_EQ(10u * 2u * 3u, b.ValueCount()); + EXPECT_EQ(120u * sizeof(int16_t), b.GetSizeInBytes()); } TEST_F(BufferTest, SizeMatrixPaddedStd430) { @@ -145,7 +145,7 @@ TEST_F(BufferTest, GetHistogramForChannelGradient) { std::vector<uint64_t> bins = b.GetHistogramForChannel(2, 256); for (uint32_t i = 0; i < values.size(); i += 4) - EXPECT_EQ(1, bins[i / 4 * 25]); + EXPECT_EQ(1u, bins[i / 4 * 25]); } // Creates 10 RGBA pixel values, with all channels being 0, and checks that all @@ -166,7 +166,7 @@ TEST_F(BufferTest, GetHistogramForChannelAllBlack) { for (uint8_t i = 0; i < 4; i++) { std::vector<uint64_t> bins = b.GetHistogramForChannel(i, 256); for (uint32_t y = 0; y < values.size(); y++) - EXPECT_EQ(10, bins[0]); + EXPECT_EQ(10u, bins[0]); } } @@ -189,7 +189,7 @@ TEST_F(BufferTest, GetHistogramForChannelAllWhite) { for (uint8_t i = 0; i < 4; i++) { std::vector<uint64_t> bins = b.GetHistogramForChannel(i, 256); for (uint32_t y = 0; y < values.size(); y++) - EXPECT_EQ(10, bins[255]); + EXPECT_EQ(10u, bins[255]); } } @@ -309,9 +309,9 @@ TEST_F(BufferTest, SetFloat16) { b.SetFormat(&fmt); b.SetData(std::move(values)); - EXPECT_EQ(2, b.ElementCount()); - EXPECT_EQ(2, b.ValueCount()); - EXPECT_EQ(4, b.GetSizeInBytes()); + EXPECT_EQ(2u, b.ElementCount()); + EXPECT_EQ(2u, b.ValueCount()); + EXPECT_EQ(4u, b.GetSizeInBytes()); auto v = b.GetValues<uint16_t>(); EXPECT_EQ(float16::FloatToHexFloat16(2.8f), v[0]); diff --git a/src/descriptor_set_and_binding_parser_test.cc b/src/descriptor_set_and_binding_parser_test.cc index ce13f10..b5b9c54 100644 --- a/src/descriptor_set_and_binding_parser_test.cc +++ b/src/descriptor_set_and_binding_parser_test.cc @@ -26,8 +26,8 @@ TEST_F(DescriptorSetAndBindingParserTest, CommaAndBinding) { ASSERT_TRUE(r.IsSuccess()) << r.Error(); EXPECT_FALSE(parser.HasPipelineName()); - EXPECT_EQ(0, parser.GetDescriptorSet()); - EXPECT_EQ(1234, parser.GetBinding()); + EXPECT_EQ(0u, parser.GetDescriptorSet()); + EXPECT_EQ(1234u, parser.GetBinding()); } TEST_F(DescriptorSetAndBindingParserTest, Binding) { @@ -35,8 +35,8 @@ TEST_F(DescriptorSetAndBindingParserTest, Binding) { Result r = parser.Parse("1234"); ASSERT_TRUE(r.IsSuccess()) << r.Error(); - EXPECT_EQ(0, parser.GetDescriptorSet()); - EXPECT_EQ(1234, parser.GetBinding()); + EXPECT_EQ(0u, parser.GetDescriptorSet()); + EXPECT_EQ(1234u, parser.GetBinding()); } TEST_F(DescriptorSetAndBindingParserTest, DescSetAndBinding) { @@ -44,8 +44,8 @@ TEST_F(DescriptorSetAndBindingParserTest, DescSetAndBinding) { Result r = parser.Parse("1234:5678"); ASSERT_TRUE(r.IsSuccess()) << r.Error(); - EXPECT_EQ(1234, parser.GetDescriptorSet()); - EXPECT_EQ(5678, parser.GetBinding()); + EXPECT_EQ(1234u, parser.GetDescriptorSet()); + EXPECT_EQ(5678u, parser.GetBinding()); } TEST_F(DescriptorSetAndBindingParserTest, EmptyBufferId) { @@ -115,8 +115,8 @@ TEST_F(DescriptorSetAndBindingParserTest, WithPipelineName) { EXPECT_TRUE(parser.HasPipelineName()); EXPECT_EQ("pipeline1", parser.PipelineName()); - EXPECT_EQ(123, parser.GetDescriptorSet()); - EXPECT_EQ(234, parser.GetBinding()); + EXPECT_EQ(123u, parser.GetDescriptorSet()); + EXPECT_EQ(234u, parser.GetBinding()); } } // namespace amber diff --git a/src/float16_helper_test.cc b/src/float16_helper_test.cc index 5fa8c33..99ea295 100644 --- a/src/float16_helper_test.cc +++ b/src/float16_helper_test.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/float16_helper.h" + #include "gtest/gtest.h" namespace amber { diff --git a/src/format_test.cc b/src/format_test.cc index 341faac..f454297 100644 --- a/src/format_test.cc +++ b/src/format_test.cc @@ -263,13 +263,13 @@ TEST_F(FormatTest, SegmentPackedList_Std430) { auto type = parser.Parse("A8B8G8R8_SINT_PACK32"); Format fmt(type.get()); - EXPECT_EQ(4, fmt.SizeInBytes()); + EXPECT_EQ(4u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(1U, segs.size()); // Always packs into a unsigned ... EXPECT_EQ(FormatMode::kUInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); } TEST_F(FormatTest, SegmentListR32G32_Std140) { @@ -278,14 +278,14 @@ TEST_F(FormatTest, SegmentListR32G32_Std140) { Format fmt(type.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(8, fmt.SizeInBytes()); + EXPECT_EQ(8u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(2U, segs.size()); EXPECT_EQ(FormatMode::kUInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); } TEST_F(FormatTest, SegmentListR32G32B32_Std140) { @@ -294,18 +294,18 @@ TEST_F(FormatTest, SegmentListR32G32B32_Std140) { Format fmt(type.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(16, fmt.SizeInBytes()); + EXPECT_EQ(16u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(4U, segs.size()); EXPECT_EQ(FormatMode::kUInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_TRUE(segs[3].IsPadding()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); } TEST_F(FormatTest, SegmentListR32G32B32_Std430) { @@ -314,18 +314,18 @@ TEST_F(FormatTest, SegmentListR32G32B32_Std430) { Format fmt(type.get()); fmt.SetLayout(Format::Format::Layout::kStd430); - EXPECT_EQ(16, fmt.SizeInBytes()); + EXPECT_EQ(16u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(4U, segs.size()); EXPECT_EQ(FormatMode::kUInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_TRUE(segs[3].IsPadding()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); } TEST_F(FormatTest, SegmentMat2x2_Std140) { @@ -335,23 +335,23 @@ TEST_F(FormatTest, SegmentMat2x2_Std140) { Format fmt(type.get()); fmt.SetLayout(Format::Format::Layout::kStd140); - EXPECT_EQ(32, fmt.SizeInBytes()); + EXPECT_EQ(32u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(6U, segs.size()); EXPECT_EQ(FormatMode::kSFloat, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_TRUE(segs[2].IsPadding()); - EXPECT_EQ(8, segs[2].SizeInBytes()); + EXPECT_EQ(8u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); EXPECT_TRUE(segs[5].IsPadding()); - EXPECT_EQ(8, segs[5].SizeInBytes()); + EXPECT_EQ(8u, segs[5].SizeInBytes()); } TEST_F(FormatTest, SegmentMat2x2_Std430) { @@ -361,19 +361,19 @@ TEST_F(FormatTest, SegmentMat2x2_Std430) { Format fmt(type.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(16, fmt.SizeInBytes()); + EXPECT_EQ(16u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(4U, segs.size()); EXPECT_EQ(FormatMode::kSFloat, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); } TEST_F(FormatTest, SegmentMat2x3_Std430) { @@ -383,27 +383,27 @@ TEST_F(FormatTest, SegmentMat2x3_Std430) { Format fmt(type.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(32, fmt.SizeInBytes()); + EXPECT_EQ(32u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(8U, segs.size()); EXPECT_EQ(FormatMode::kSFloat, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_TRUE(segs[3].IsPadding()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[5].GetFormatMode()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[6].GetFormatMode()); - EXPECT_EQ(4, segs[6].SizeInBytes()); + EXPECT_EQ(4u, segs[6].SizeInBytes()); EXPECT_TRUE(segs[7].IsPadding()); - EXPECT_EQ(4, segs[7].SizeInBytes()); + EXPECT_EQ(4u, segs[7].SizeInBytes()); } TEST_F(FormatTest, SegmentRuntimeArray_Std140) { @@ -413,14 +413,14 @@ TEST_F(FormatTest, SegmentRuntimeArray_Std140) { Format fmt(type.get()); fmt.SetLayout(Format::Format::Layout::kStd140); - EXPECT_EQ(16, fmt.SizeInBytes()); + EXPECT_EQ(16u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(2U, segs.size()); EXPECT_EQ(FormatMode::kSFloat, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(12, segs[1].SizeInBytes()); + EXPECT_EQ(12u, segs[1].SizeInBytes()); } TEST_F(FormatTest, SegmentRuntimeArray_Std430) { @@ -430,12 +430,12 @@ TEST_F(FormatTest, SegmentRuntimeArray_Std430) { Format fmt(type.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(4, fmt.SizeInBytes()); + EXPECT_EQ(4u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(1U, segs.size()); EXPECT_EQ(FormatMode::kSFloat, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); } // struct { @@ -451,16 +451,16 @@ TEST_F(FormatTest, SegmentStruct_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(16, fmt.SizeInBytes()); + EXPECT_EQ(16u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); - ASSERT_EQ(3, segs.size()); + ASSERT_EQ(3u, segs.size()); EXPECT_EQ(FormatMode::kSFloat, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_TRUE(segs[2].IsPadding()); - EXPECT_EQ(8, segs[2].SizeInBytes()); + EXPECT_EQ(8u, segs[2].SizeInBytes()); } TEST_F(FormatTest, SegmentStruct_Std430) { auto s = MakeUnique<type::Struct>(); @@ -471,14 +471,14 @@ TEST_F(FormatTest, SegmentStruct_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(8, fmt.SizeInBytes()); + EXPECT_EQ(8u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(2U, segs.size()); EXPECT_EQ(FormatMode::kSFloat, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); } // struct STRIDE 20 { @@ -496,16 +496,16 @@ TEST_F(FormatTest, SegmentStructWithStride_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(20, fmt.SizeInBytes()); + EXPECT_EQ(20u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(3U, segs.size()); EXPECT_EQ(FormatMode::kSFloat, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_TRUE(segs[2].IsPadding()); - EXPECT_EQ((20 - sizeof(float) - sizeof(uint32_t)), segs[2].SizeInBytes()); + EXPECT_EQ((20u - sizeof(float) - sizeof(uint32_t)), segs[2].SizeInBytes()); } TEST_F(FormatTest, SegmentStructWithStride_Std430) { auto s = MakeUnique<type::Struct>(); @@ -517,7 +517,7 @@ TEST_F(FormatTest, SegmentStructWithStride_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(20, fmt.SizeInBytes()); + EXPECT_EQ(20u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(3U, segs.size()); @@ -526,7 +526,7 @@ TEST_F(FormatTest, SegmentStructWithStride_Std430) { EXPECT_EQ(FormatMode::kUInt, segs[1].GetFormatMode()); EXPECT_EQ(32U, segs[1].GetNumBits()); EXPECT_TRUE(segs[2].IsPadding()); - EXPECT_EQ((20 - sizeof(float) - sizeof(uint32_t)) * 8, segs[2].GetNumBits()); + EXPECT_EQ((20u - sizeof(float) - sizeof(uint32_t)) * 8, segs[2].GetNumBits()); } // struct { @@ -545,18 +545,18 @@ TEST_F(FormatTest, SegmentStructWithMemberOffset_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(16, fmt.SizeInBytes()); + EXPECT_EQ(16u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(4U, segs.size()); EXPECT_TRUE(segs[0].IsPadding()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_TRUE(segs[3].IsPadding()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); } TEST_F(FormatTest, SegmentStructWithMemberOffset_Std430) { auto s = MakeUnique<type::Struct>(); @@ -575,11 +575,11 @@ TEST_F(FormatTest, SegmentStructWithMemberOffset_Std430) { const auto& segs = fmt.GetSegments(); ASSERT_EQ(3U, segs.size()); EXPECT_TRUE(segs[0].IsPadding()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_EQ(FormatMode::kUInt, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); } // struct { @@ -602,20 +602,20 @@ TEST_F(FormatTest, SegmentStructWithStruct_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(32, fmt.SizeInBytes()); + EXPECT_EQ(32u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(5U, segs.size()); EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_TRUE(segs[2].IsPadding()); - EXPECT_EQ(8, segs[2].SizeInBytes()); + EXPECT_EQ(8u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); EXPECT_TRUE(segs[4].IsPadding()); - EXPECT_EQ(12, segs[4].SizeInBytes()); + EXPECT_EQ(12u, segs[4].SizeInBytes()); } TEST_F(FormatTest, SegmentStructWithStruct_Std430) { auto x = MakeUnique<type::Struct>(); @@ -630,16 +630,16 @@ TEST_F(FormatTest, SegmentStructWithStruct_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(12, fmt.SizeInBytes()); + EXPECT_EQ(12u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(3U, segs.size()); EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); } // struct { @@ -660,27 +660,27 @@ TEST_F(FormatTest, SegmentStructWithVec2_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(32, fmt.SizeInBytes()); + EXPECT_EQ(32u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(6U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); /* vec2 */ EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[5].IsPadding()); - EXPECT_EQ(12, segs[5].SizeInBytes()); + EXPECT_EQ(12u, segs[5].SizeInBytes()); } TEST_F(FormatTest, SegmentStructWithVec2_Std430) { auto s = MakeUnique<type::Struct>(); @@ -695,27 +695,27 @@ TEST_F(FormatTest, SegmentStructWithVec2_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(24, fmt.SizeInBytes()); + EXPECT_EQ(24u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(6U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); /* vec2 */ EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[5].IsPadding()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); } // struct { @@ -736,26 +736,26 @@ TEST_F(FormatTest, SegmentStructWithFloatPackedToVec_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(32, fmt.SizeInBytes()); + EXPECT_EQ(32u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(6U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(12, segs[1].SizeInBytes()); + EXPECT_EQ(12u, segs[1].SizeInBytes()); /* vec2 */ EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[5].GetFormatMode()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); } TEST_F(FormatTest, SegmentStructWithFloatPackedToVec_Std430) { auto s = MakeUnique<type::Struct>(); @@ -770,26 +770,26 @@ TEST_F(FormatTest, SegmentStructWithFloatPackedToVec_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(32, fmt.SizeInBytes()); + EXPECT_EQ(32u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(6U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(12, segs[1].SizeInBytes()); + EXPECT_EQ(12u, segs[1].SizeInBytes()); /* vec2 */ EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[5].GetFormatMode()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); } // struct { @@ -811,34 +811,34 @@ TEST_F(FormatTest, SegmentStructVec3Vec2_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(48, fmt.SizeInBytes()); + EXPECT_EQ(48u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(9U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(12, segs[1].SizeInBytes()); + EXPECT_EQ(12u, segs[1].SizeInBytes()); /* vec3 */ EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[5].IsPadding()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); /* vec2 */ EXPECT_EQ(FormatMode::kSFloat, segs[6].GetFormatMode()); - EXPECT_EQ(4, segs[6].SizeInBytes()); + EXPECT_EQ(4u, segs[6].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[7].GetFormatMode()); - EXPECT_EQ(4, segs[7].SizeInBytes()); + EXPECT_EQ(4u, segs[7].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[8].IsPadding()); - EXPECT_EQ(8, segs[8].SizeInBytes()); + EXPECT_EQ(8u, segs[8].SizeInBytes()); } TEST_F(FormatTest, SegmentStructVec3Vec2_Std430) { auto s = MakeUnique<type::Struct>(); @@ -854,34 +854,34 @@ TEST_F(FormatTest, SegmentStructVec3Vec2_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(48, fmt.SizeInBytes()); + EXPECT_EQ(48u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(9U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(12, segs[1].SizeInBytes()); + EXPECT_EQ(12u, segs[1].SizeInBytes()); /* vec3 */ EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[5].IsPadding()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); /* vec2 */ EXPECT_EQ(FormatMode::kSFloat, segs[6].GetFormatMode()); - EXPECT_EQ(4, segs[6].SizeInBytes()); + EXPECT_EQ(4u, segs[6].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[7].GetFormatMode()); - EXPECT_EQ(4, segs[7].SizeInBytes()); + EXPECT_EQ(4u, segs[7].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[8].IsPadding()); - EXPECT_EQ(8, segs[8].SizeInBytes()); + EXPECT_EQ(8u, segs[8].SizeInBytes()); } // struct { @@ -903,36 +903,36 @@ TEST_F(FormatTest, SegmentStructMat2x2_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(64, fmt.SizeInBytes()); + EXPECT_EQ(64u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(10U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(12, segs[1].SizeInBytes()); + EXPECT_EQ(12u, segs[1].SizeInBytes()); /* column 1 */ EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); EXPECT_TRUE(segs[4].IsPadding()); - EXPECT_EQ(8, segs[4].SizeInBytes()); + EXPECT_EQ(8u, segs[4].SizeInBytes()); /* column 2 */ EXPECT_EQ(FormatMode::kSFloat, segs[5].GetFormatMode()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[6].GetFormatMode()); - EXPECT_EQ(4, segs[6].SizeInBytes()); + EXPECT_EQ(4u, segs[6].SizeInBytes()); EXPECT_TRUE(segs[7].IsPadding()); - EXPECT_EQ(8, segs[7].SizeInBytes()); + EXPECT_EQ(8u, segs[7].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[8].GetFormatMode()); - EXPECT_EQ(4, segs[8].SizeInBytes()); + EXPECT_EQ(4u, segs[8].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[9].IsPadding()); - EXPECT_EQ(12, segs[9].SizeInBytes()); + EXPECT_EQ(12u, segs[9].SizeInBytes()); } TEST_F(FormatTest, SegmentStructMat2x2_Std430) { auto s = MakeUnique<type::Struct>(); @@ -948,32 +948,32 @@ TEST_F(FormatTest, SegmentStructMat2x2_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(32, fmt.SizeInBytes()); + EXPECT_EQ(32u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(8U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); /* column 1 */ EXPECT_EQ(FormatMode::kSFloat, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); /* column 2 */ EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); EXPECT_EQ(FormatMode::kSFloat, segs[5].GetFormatMode()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[6].GetFormatMode()); - EXPECT_EQ(4, segs[6].SizeInBytes()); + EXPECT_EQ(4u, segs[6].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[7].IsPadding()); - EXPECT_EQ(4, segs[7].SizeInBytes()); + EXPECT_EQ(4u, segs[7].SizeInBytes()); } // struct { @@ -1000,34 +1000,34 @@ TEST_F(FormatTest, SegmentStructWithStructNoPack_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(48, fmt.SizeInBytes()); + EXPECT_EQ(48u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(8U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(12, segs[1].SizeInBytes()); + EXPECT_EQ(12u, segs[1].SizeInBytes()); /* a */ EXPECT_EQ(FormatMode::kSInt, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); /* b */ EXPECT_EQ(FormatMode::kSInt, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); /* c */ EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[5].IsPadding()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[6].GetFormatMode()); - EXPECT_EQ(4, segs[6].SizeInBytes()); + EXPECT_EQ(4u, segs[6].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[7].IsPadding()); - EXPECT_EQ(12, segs[7].SizeInBytes()); + EXPECT_EQ(12u, segs[7].SizeInBytes()); } TEST_F(FormatTest, SegmentStructWithStructNoPack_Std430) { auto s = MakeUnique<type::Struct>(); @@ -1044,25 +1044,25 @@ TEST_F(FormatTest, SegmentStructWithStructNoPack_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(20, fmt.SizeInBytes()); + EXPECT_EQ(20u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(5U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* a */ EXPECT_EQ(FormatMode::kSInt, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); /* b */ EXPECT_EQ(FormatMode::kSInt, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); /* c */ EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); } // struct { @@ -1092,49 +1092,49 @@ TEST_F(FormatTest, SegmentStructWithStructArray_Std140) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd140); - EXPECT_EQ(96, fmt.SizeInBytes()); + EXPECT_EQ(96u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(13U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[1].IsPadding()); - EXPECT_EQ(12, segs[1].SizeInBytes()); + EXPECT_EQ(12u, segs[1].SizeInBytes()); /* a */ EXPECT_EQ(FormatMode::kSInt, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); /* b */ EXPECT_EQ(FormatMode::kSInt, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[4].IsPadding()); - EXPECT_EQ(8, segs[4].SizeInBytes()); + EXPECT_EQ(8u, segs[4].SizeInBytes()); /* c[0] */ EXPECT_EQ(FormatMode::kSFloat, segs[5].GetFormatMode()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[6].IsPadding()); - EXPECT_EQ(12, segs[6].SizeInBytes()); + EXPECT_EQ(12u, segs[6].SizeInBytes()); /* c[1] */ EXPECT_EQ(FormatMode::kSFloat, segs[7].GetFormatMode()); - EXPECT_EQ(4, segs[7].SizeInBytes()); + EXPECT_EQ(4u, segs[7].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[8].IsPadding()); - EXPECT_EQ(12, segs[8].SizeInBytes()); + EXPECT_EQ(12u, segs[8].SizeInBytes()); /* c[2] */ EXPECT_EQ(FormatMode::kSFloat, segs[9].GetFormatMode()); - EXPECT_EQ(4, segs[9].SizeInBytes()); + EXPECT_EQ(4u, segs[9].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[10].IsPadding()); - EXPECT_EQ(12, segs[10].SizeInBytes()); + EXPECT_EQ(12u, segs[10].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[11].GetFormatMode()); - EXPECT_EQ(4, segs[11].SizeInBytes()); + EXPECT_EQ(4u, segs[11].SizeInBytes()); /* pad */ EXPECT_TRUE(segs[12].IsPadding()); - EXPECT_EQ(12, segs[12].SizeInBytes()); + EXPECT_EQ(12u, segs[12].SizeInBytes()); } TEST_F(FormatTest, SegmentStructWithStructArray_Std430) { auto s = MakeUnique<type::Struct>(); @@ -1153,31 +1153,31 @@ TEST_F(FormatTest, SegmentStructWithStructArray_Std430) { Format fmt(s.get()); fmt.SetLayout(Format::Layout::kStd430); - EXPECT_EQ(28, fmt.SizeInBytes()); + EXPECT_EQ(28u, fmt.SizeInBytes()); const auto& segs = fmt.GetSegments(); ASSERT_EQ(7U, segs.size()); /* w */ EXPECT_EQ(FormatMode::kSInt, segs[0].GetFormatMode()); - EXPECT_EQ(4, segs[0].SizeInBytes()); + EXPECT_EQ(4u, segs[0].SizeInBytes()); /* a */ EXPECT_EQ(FormatMode::kSInt, segs[1].GetFormatMode()); - EXPECT_EQ(4, segs[1].SizeInBytes()); + EXPECT_EQ(4u, segs[1].SizeInBytes()); /* b */ EXPECT_EQ(FormatMode::kSInt, segs[2].GetFormatMode()); - EXPECT_EQ(4, segs[2].SizeInBytes()); + EXPECT_EQ(4u, segs[2].SizeInBytes()); /* c[0] */ EXPECT_EQ(FormatMode::kSFloat, segs[3].GetFormatMode()); - EXPECT_EQ(4, segs[3].SizeInBytes()); + EXPECT_EQ(4u, segs[3].SizeInBytes()); /* c[1] */ EXPECT_EQ(FormatMode::kSFloat, segs[4].GetFormatMode()); - EXPECT_EQ(4, segs[4].SizeInBytes()); + EXPECT_EQ(4u, segs[4].SizeInBytes()); /* c[2] */ EXPECT_EQ(FormatMode::kSFloat, segs[5].GetFormatMode()); - EXPECT_EQ(4, segs[5].SizeInBytes()); + EXPECT_EQ(4u, segs[5].SizeInBytes()); /* y */ EXPECT_EQ(FormatMode::kSFloat, segs[6].GetFormatMode()); - EXPECT_EQ(4, segs[6].SizeInBytes()); + EXPECT_EQ(4u, segs[6].SizeInBytes()); } } // namespace amber diff --git a/src/script_test.cc b/src/script_test.cc index 26fe3f9..c3d602e 100644 --- a/src/script_test.cc +++ b/src/script_test.cc @@ -58,7 +58,7 @@ TEST_F(ScriptTest, GetShaderInfo) { EXPECT_EQ(kShaderFormatGlsl, info[0].format); EXPECT_EQ(kShaderTypeVertex, info[0].type); EXPECT_EQ("This is my shader data", info[0].shader_source); - ASSERT_EQ(2, info[0].optimizations.size()); + ASSERT_EQ(2u, info[0].optimizations.size()); EXPECT_EQ("opt1", info[0].optimizations[0]); EXPECT_EQ("opt2", info[0].optimizations[1]); diff --git a/src/shader_compiler_test.cc b/src/shader_compiler_test.cc index 9bdf5de..db8f43e 100644 --- a/src/shader_compiler_test.cc +++ b/src/shader_compiler_test.cc @@ -22,7 +22,7 @@ #include "src/sampler.h" #include "src/shader_data.h" #if AMBER_ENABLE_SHADERC -#include "shaderc/env.h" +#include "shaderc/shaderc.hpp" #endif namespace amber { @@ -112,7 +112,7 @@ void main() { std::tie(r, binary) = sc.Compile(&pipeline, &shader_info, ShaderMap()); ASSERT_TRUE(r.IsSuccess()) << r.Error(); EXPECT_FALSE(binary.empty()); - EXPECT_EQ(0x07230203, binary[0]); // Verify SPIR-V header present. + EXPECT_EQ(0x07230203u, binary[0]); // Verify SPIR-V header present. } #endif // AMBER_ENABLE_SHADERC @@ -131,7 +131,7 @@ TEST_F(ShaderCompilerTest, CompilesSpirvAsm) { std::tie(r, binary) = sc.Compile(&pipeline, &shader_info, ShaderMap()); ASSERT_TRUE(r.IsSuccess()); EXPECT_FALSE(binary.empty()); - EXPECT_EQ(0x07230203, binary[0]); // Verify SPIR-V header present. + EXPECT_EQ(0x07230203u, binary[0]); // Verify SPIR-V header present. } TEST_F(ShaderCompilerTest, InvalidSpirvHex) { @@ -241,7 +241,7 @@ TEST_F(ShaderCompilerTest, CompilesSpirvHex) { std::tie(r, binary) = sc.Compile(&pipeline, &shader_info, ShaderMap()); ASSERT_TRUE(r.IsSuccess()); EXPECT_FALSE(binary.empty()); - EXPECT_EQ(0x07230203, binary[0]); // Verify SPIR-V header present. + EXPECT_EQ(0x07230203u, binary[0]); // Verify SPIR-V header present. } TEST_F(ShaderCompilerTest, FailsOnInvalidShader) { @@ -312,7 +312,7 @@ kernel void TestShader(global int* in, global int* out) { std::tie(r, binary) = sc.Compile(&pipeline, &shader_info, ShaderMap()); ASSERT_TRUE(r.IsSuccess()); EXPECT_FALSE(binary.empty()); - EXPECT_EQ(0x07230203, binary[0]); // Verify SPIR-V header present. + EXPECT_EQ(0x07230203u, binary[0]); // Verify SPIR-V header present. } TEST_F(ShaderCompilerTest, ClspvDisallowCaching) { @@ -361,7 +361,7 @@ kernel void TestShader(global int* in, global int* out, int m, int b) { std::tie(r, binary) = sc.Compile(&pipeline, &shader_info1, ShaderMap()); ASSERT_TRUE(r.IsSuccess()); EXPECT_FALSE(binary.empty()); - EXPECT_EQ(0x07230203, binary[0]); // Verify SPIR-V header present. + EXPECT_EQ(0x07230203u, binary[0]); // Verify SPIR-V header present. auto iter = shader_info1.GetDescriptorMap().find("TestShader"); ASSERT_NE(iter, shader_info1.GetDescriptorMap().end()); uint32_t max_binding = 0; @@ -380,7 +380,7 @@ kernel void TestShader(global int* in, global int* out, int m, int b) { std::tie(r, binary) = sc.Compile(&pipeline, &shader_info2, ShaderMap()); ASSERT_TRUE(r.IsSuccess()); EXPECT_FALSE(binary.empty()); - EXPECT_EQ(0x07230203, binary[0]); // Verify SPIR-V header present. + EXPECT_EQ(0x07230203u, binary[0]); // Verify SPIR-V header present. iter = shader_info2.GetDescriptorMap().find("TestShader"); ASSERT_NE(iter, shader_info2.GetDescriptorMap().end()); max_binding = 0; @@ -416,7 +416,7 @@ kernel void TestShader(read_only image2d_t ro_image, write_only image2d_t wo_ima std::tie(r, binary) = sc.Compile(&pipeline, &shader_info1, ShaderMap()); ASSERT_TRUE(r.IsSuccess()); EXPECT_FALSE(binary.empty()); - EXPECT_EQ(0x07230203, binary[0]); // Verify SPIR-V header present. + EXPECT_EQ(0x07230203u, binary[0]); // Verify SPIR-V header present. auto iter = shader_info1.GetDescriptorMap().find("TestShader"); for (const auto& entry : iter->second) { if (entry.binding == 0) { @@ -459,7 +459,7 @@ kernel void foo(read_only image2d_t im, global float4* out) { std::tie(r, binary) = sc.Compile(&pipeline, &shader_info1, ShaderMap()); ASSERT_TRUE(r.IsSuccess()); EXPECT_FALSE(binary.empty()); - EXPECT_EQ(0x07230203, binary[0]); // Verify SPIR-V header present. + EXPECT_EQ(0x07230203u, binary[0]); // Verify SPIR-V header present. bool found_s1 = false; bool found_s2 = false; EXPECT_EQ(0, pipeline.GetSamplers()[0].descriptor_set); diff --git a/src/tokenizer_test.cc b/src/tokenizer_test.cc index 2685d74..b78e57a 100644 --- a/src/tokenizer_test.cc +++ b/src/tokenizer_test.cc @@ -518,13 +518,13 @@ TEST_F(TokenizerTest, Continuations) { ASSERT_TRUE(next != nullptr); ASSERT_TRUE(next->IsInteger()); EXPECT_EQ(1, next->AsInt32()); - EXPECT_EQ(1, t.GetCurrentLine()); + EXPECT_EQ(1u, t.GetCurrentLine()); next = t.NextToken(); ASSERT_TRUE(next != nullptr); ASSERT_TRUE(next->IsInteger()); EXPECT_EQ(2, next->AsInt32()); - EXPECT_EQ(2, t.GetCurrentLine()); + EXPECT_EQ(2u, t.GetCurrentLine()); next = t.NextToken(); ASSERT_TRUE(next != nullptr); @@ -580,7 +580,7 @@ TEST_F(TokenizerTest, ContinuationTokenInMiddleOfLine) { next = t.NextToken(); ASSERT_TRUE(next != nullptr); ASSERT_TRUE(next->IsInteger()); - EXPECT_EQ(2U, next->AsInt32()); + EXPECT_EQ(2u, next->AsInt32()); next = t.NextToken(); ASSERT_TRUE(next != nullptr); diff --git a/src/type_parser_test.cc b/src/type_parser_test.cc index c26c329..0f923ea 100644 --- a/src/type_parser_test.cc +++ b/src/type_parser_test.cc @@ -1208,7 +1208,7 @@ TEST_F(TypeParserTest, Formats) { if (data.component_count < segs.size()) { // Only one padding added - EXPECT_EQ(1, segs.size() - data.component_count); + EXPECT_EQ(1u, segs.size() - data.component_count); EXPECT_TRUE(segs.back().IsPadding()); } } diff --git a/src/type_test.cc b/src/type_test.cc index bc140d4..285ad6f 100644 --- a/src/type_test.cc +++ b/src/type_test.cc @@ -37,7 +37,7 @@ TEST_F(TypeTest, IsArray) { EXPECT_TRUE(i.IsArray()); EXPECT_FALSE(i.IsRuntimeArray()); EXPECT_TRUE(i.IsSizedArray()); - EXPECT_EQ(3, i.ArraySize()); + EXPECT_EQ(3u, i.ArraySize()); } TEST_F(TypeTest, IsStruct) { @@ -62,7 +62,7 @@ TEST_F(TypeTest, Vectors) { Number i(FormatMode::kSInt, 16); i.SetRowCount(2); - EXPECT_EQ(2, i.RowCount()); + EXPECT_EQ(2u, i.RowCount()); EXPECT_TRUE(i.IsVec()); EXPECT_FALSE(i.IsVec3()); EXPECT_FALSE(i.IsMatrix()); @@ -76,8 +76,8 @@ TEST_F(TypeTest, Matrix) { i.SetColumnCount(2); i.SetRowCount(2); - EXPECT_EQ(2, i.ColumnCount()); - EXPECT_EQ(2, i.RowCount()); + EXPECT_EQ(2u, i.ColumnCount()); + EXPECT_EQ(2u, i.RowCount()); EXPECT_FALSE(i.IsVec()); EXPECT_TRUE(i.IsMatrix()); @@ -205,14 +205,14 @@ TEST_F(TypeTest, StructEqual) { } TEST_F(TypeTest, NumberDefault32Bits) { - EXPECT_EQ(4, Number(FormatMode::kUNorm).SizeInBytes()); + EXPECT_EQ(4u, Number(FormatMode::kUNorm).SizeInBytes()); } TEST_F(TypeTest, NumberInBytes) { - EXPECT_EQ(1, Number(FormatMode::kSInt, 8).SizeInBytes()); - EXPECT_EQ(2, Number(FormatMode::kSInt, 16).SizeInBytes()); - EXPECT_EQ(4, Number(FormatMode::kSInt, 32).SizeInBytes()); - EXPECT_EQ(8, Number(FormatMode::kSInt, 64).SizeInBytes()); + EXPECT_EQ(1u, Number(FormatMode::kSInt, 8).SizeInBytes()); + EXPECT_EQ(2u, Number(FormatMode::kSInt, 16).SizeInBytes()); + EXPECT_EQ(4u, Number(FormatMode::kSInt, 32).SizeInBytes()); + EXPECT_EQ(8u, Number(FormatMode::kSInt, 64).SizeInBytes()); } TEST_F(TypeTest, IsInt) { diff --git a/src/vkscript/parser_test.cc b/src/vkscript/parser_test.cc index c62052c..0b82a81 100644 --- a/src/vkscript/parser_test.cc +++ b/src/vkscript/parser_test.cc @@ -163,8 +163,8 @@ TEST_F(VkScriptParserTest, RequireFbSize) { auto script = parser.GetScript(); const auto& pipelines = script->GetPipelines(); ASSERT_EQ(1U, pipelines.size()); - EXPECT_EQ(300, pipelines[0]->GetFramebufferWidth()); - EXPECT_EQ(400, pipelines[0]->GetFramebufferHeight()); + EXPECT_EQ(300u, pipelines[0]->GetFramebufferWidth()); + EXPECT_EQ(400u, pipelines[0]->GetFramebufferHeight()); } TEST_F(VkScriptParserTest, RequireFbSizeMissingSize) { @@ -260,9 +260,9 @@ TEST_F(VkScriptParserTest, IndicesBlock) { EXPECT_EQ(3U * sizeof(uint32_t), bufs[1]->GetSizeInBytes()); const auto* data = bufs[1]->GetValues<uint32_t>(); - EXPECT_EQ(1, data[0]); - EXPECT_EQ(2, data[1]); - EXPECT_EQ(3, data[2]); + EXPECT_EQ(1u, data[0]); + EXPECT_EQ(2u, data[1]); + EXPECT_EQ(3u, data[2]); } TEST_F(VkScriptParserTest, IndicesBlockMultipleLines) { @@ -380,7 +380,7 @@ TEST_F(VkScriptParserTest, VertexDataHeaderGlslString) { EXPECT_EQ(FormatType::kR32G32B32_SINT, bufs[2]->GetFormat()->GetFormatType()); auto& segs2 = bufs[2]->GetFormat()->GetSegments(); - ASSERT_EQ(4, segs2.size()); + ASSERT_EQ(4u, segs2.size()); EXPECT_EQ(FormatMode::kSInt, segs2[0].GetFormatMode()); EXPECT_EQ(FormatMode::kSInt, segs2[1].GetFormatMode()); EXPECT_EQ(FormatMode::kSInt, segs2[2].GetFormatMode()); diff --git a/src/vulkan/engine_vulkan_debugger.cc b/src/vulkan/engine_vulkan_debugger.cc index 9129b32..d0f1432 100644 --- a/src/vulkan/engine_vulkan_debugger.cc +++ b/src/vulkan/engine_vulkan_debugger.cc @@ -26,11 +26,10 @@ #include <thread> // NOLINT(build/c++11) #include <unordered_map> -#include "src/virtual_file_store.h" - #include "dap/network.h" #include "dap/protocol.h" #include "dap/session.h" +#include "src/virtual_file_store.h" // Set to 1 to enable verbose debugger logging #define ENABLE_DEBUGGER_LOG 0 diff --git a/src/vulkan/image_descriptor.cc b/src/vulkan/image_descriptor.cc index 1305a52..550ce0b 100644 --- a/src/vulkan/image_descriptor.cc +++ b/src/vulkan/image_descriptor.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/vulkan/image_descriptor.h" + #include "src/vulkan/device.h" #include "src/vulkan/resource.h" diff --git a/src/vulkan/sampler_descriptor.cc b/src/vulkan/sampler_descriptor.cc index 58cbf6a..59f6c77 100644 --- a/src/vulkan/sampler_descriptor.cc +++ b/src/vulkan/sampler_descriptor.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/vulkan/sampler_descriptor.h" + #include "src/vulkan/device.h" #include "src/vulkan/resource.h" diff --git a/src/vulkan/transfer_buffer.cc b/src/vulkan/transfer_buffer.cc index a5fb2d1..a13b22e 100644 --- a/src/vulkan/transfer_buffer.cc +++ b/src/vulkan/transfer_buffer.cc @@ -13,6 +13,7 @@ // limitations under the License. #include "src/vulkan/transfer_buffer.h" + #include "src/vulkan/command_buffer.h" #include "src/vulkan/device.h" diff --git a/tests/run_tests.py b/tests/run_tests.py index 08bf7ee..26d9a54 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -89,6 +89,10 @@ SUPPRESSIONS_SWIFTSHADER = [ "glsl_read_and_write_image3d_rgba32i.amber", # shaderStorageImageMultisample feature not supported "draw_storageimage_multisample.amber", + # Fails on Ubuntu bot + "debugger_hlsl_basic_vertex_with_legalization.amber", + "debugger_hlsl_function_call.amber", + "debugger_hlsl_shadowed_vars.amber", ] OPENCL_CASES = [ |