diff options
author | 2019-10-13 13:50:38 +0200 | |
---|---|---|
committer | 2019-10-13 07:50:38 -0400 | |
commit | 0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch) | |
tree | 626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /3rdparty/bx/tests/uint32_test.cpp | |
parent | c913ccb59d713ce0b91135520719ac5385e54358 (diff) |
WIP: sync bgfx, bx and bimg with latest upstream (#5723)
* Sync with bgfx upstream revision b91d0b6
* Sync with bx upstream revision d60912b
* Sync with bimg upstream revision bd81f60
* Add astc-codec decoder
* Rename VertexDecl to VertexLayout
* Rename UniformType enum Int1 to Sampler.
* Add NVN stub
* Fix unused-const-variable error on macOS
* Drop redundant explicit language parameters
buildoptions_cpp are only applied to c++ files and buildoptions_objcpp are only
applied to objective c++ files. As such, hardcoding -x offers no benefit while
preventing overrides (such as one needed by 3rdparty/bgfx/src/renderer_vk.cpp on
macOS) from working.
* Re-introduce -x c++ in places where C code is compiled as C++ to prevent clang from throwing a warning
* Build bgfx as Objective-C++ on macOS
It is needed due to included headers
* Enable Direct3D12 and Vulkan bgfx rendering backends
* Enable building of spirv shaders
* Properly escape /c in cmd call
* Comment out dx12 bgfx renderer
* Honor VERBOSE setting during shaders build
* Only invert hlsl shader XYZ_TO_sRGB matrix for opengl
* Add spirv shaders
* OpenGL ES needs transposed matrix too
* Metal needs transposed matrix as well
Diffstat (limited to '3rdparty/bx/tests/uint32_test.cpp')
-rw-r--r-- | 3rdparty/bx/tests/uint32_test.cpp | 53 |
1 files changed, 41 insertions, 12 deletions
diff --git a/3rdparty/bx/tests/uint32_test.cpp b/3rdparty/bx/tests/uint32_test.cpp index bb7e0dccacd..b209219cd56 100644 --- a/3rdparty/bx/tests/uint32_test.cpp +++ b/3rdparty/bx/tests/uint32_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 Branimir Karadzic. All rights reserved. + * Copyright 2010-2019 Branimir Karadzic. All rights reserved. * License: https://github.com/bkaradzic/bx#license-bsd-2-clause */ @@ -14,28 +14,57 @@ TEST_CASE("StrideAlign") REQUIRE(12 == bx::strideAlign(ii+1, 12) ); } - REQUIRE(0 == bx::strideAlign16(0, 12) ); + REQUIRE(0 == bx::strideAlign<16>(0, 12) ); for (uint32_t ii = 0; ii < 12; ++ii) { - REQUIRE(48 == bx::strideAlign16(ii+1, 12) ); + REQUIRE(48 == bx::strideAlign<16>(ii+1, 12) ); } + + uint32_t offset = 11; + offset = bx::strideAlign(offset, 32); + REQUIRE(offset == 32); + + offset = bx::strideAlign(offset, 24); + REQUIRE(offset == 48); } TEST_CASE("uint32_cnt") { - REQUIRE( 0 == bx::uint32_cnttz(UINT32_C(1) ) ); - - REQUIRE(31 == bx::uint32_cntlz(UINT32_C(1) ) ); - - REQUIRE( 0 == bx::uint64_cnttz(UINT64_C(1) ) ); - - REQUIRE(63 == bx::uint64_cntlz(UINT64_C(1) ) ); - + REQUIRE( 0 == bx::uint32_cnttz<uint8_t >(1) ); + REQUIRE( 7 == bx::uint32_cnttz<uint8_t >(1<<7) ); + REQUIRE( 8 == bx::uint32_cnttz<uint8_t >(0) ); + REQUIRE( 1 == bx::uint32_cnttz<uint8_t >(0x3e) ); + REQUIRE( 0 == bx::uint32_cnttz<uint16_t>(1) ); + REQUIRE(15 == bx::uint32_cnttz<uint16_t>(1<<15) ); + REQUIRE(16 == bx::uint32_cnttz<uint16_t>(0) ); + REQUIRE( 0 == bx::uint32_cnttz<uint32_t>(1) ); + REQUIRE(32 == bx::uint32_cnttz<uint32_t>(0) ); + REQUIRE(31 == bx::uint32_cnttz<uint32_t>(1<<31) ); + REQUIRE( 0 == bx::uint32_cnttz<uint64_t>(1) ); + REQUIRE(64 == bx::uint32_cnttz<uint64_t>(0) ); + + REQUIRE( 7 == bx::uint32_cntlz<uint8_t >(1) ); + REQUIRE( 8 == bx::uint32_cntlz<uint8_t >(0) ); + REQUIRE( 2 == bx::uint32_cntlz<uint8_t >(0x3e) ); + REQUIRE(15 == bx::uint32_cntlz<uint16_t>(1) ); + REQUIRE(16 == bx::uint32_cntlz<uint16_t>(0) ); + REQUIRE(31 == bx::uint32_cntlz<uint32_t>(1) ); + REQUIRE(32 == bx::uint32_cntlz<uint32_t>(0) ); + REQUIRE(63 == bx::uint32_cntlz<uint64_t>(1) ); + REQUIRE(64 == bx::uint32_cntlz<uint64_t>(0) ); + + REQUIRE( 0 == bx::uint32_cntbits(0) ); REQUIRE( 1 == bx::uint32_cntbits(1) ); - REQUIRE(16 == bx::uint32_cntbits(UINT16_MAX) ); + REQUIRE( 4 == bx::uint32_cntbits<uint8_t>(0x55) ); + REQUIRE( 8 == bx::uint32_cntbits<uint16_t>(0x5555) ); + REQUIRE(16 == bx::uint32_cntbits<uint32_t>(0x55555555) ); + REQUIRE(32 == bx::uint32_cntbits<uint64_t>(0x5555555555555555) ); + REQUIRE( 8 == bx::uint32_cntbits(UINT8_MAX) ); + REQUIRE(16 == bx::uint32_cntbits(UINT16_MAX) ); REQUIRE(32 == bx::uint32_cntbits(UINT32_MAX) ); + REQUIRE(64 == bx::uint32_cntbits(UINT64_MAX) ); } TEST_CASE("uint32_part") |