diff options
author | 2019-10-13 13:50:38 +0200 | |
---|---|---|
committer | 2019-10-13 07:50:38 -0400 | |
commit | 0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch) | |
tree | 626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /3rdparty/bimg/scripts | |
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/bimg/scripts')
-rw-r--r-- | 3rdparty/bimg/scripts/bimg.lua | 28 | ||||
-rw-r--r-- | 3rdparty/bimg/scripts/bimg_decode.lua | 4 | ||||
-rw-r--r-- | 3rdparty/bimg/scripts/bimg_encode.lua | 2 | ||||
-rw-r--r-- | 3rdparty/bimg/scripts/genie.lua | 2 | ||||
-rw-r--r-- | 3rdparty/bimg/scripts/texturec.lua | 2 |
5 files changed, 21 insertions, 17 deletions
diff --git a/3rdparty/bimg/scripts/bimg.lua b/3rdparty/bimg/scripts/bimg.lua index a70460ef092..6ea0958cb6a 100644 --- a/3rdparty/bimg/scripts/bimg.lua +++ b/3rdparty/bimg/scripts/bimg.lua @@ -1,30 +1,36 @@ -- --- 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 -- -function filesexist(_srcPath, _dstPath, _files) - for _, file in ipairs(_files) do - file = path.getrelative(_srcPath, file) - local filePath = path.join(_dstPath, file) - if not os.isfile(filePath) then return false end - end - - return true -end - project "bimg" kind "StaticLib" includedirs { path.join(BX_DIR, "include"), path.join(BIMG_DIR, "include"), + path.join(BIMG_DIR, "3rdparty/astc-codec"), + path.join(BIMG_DIR, "3rdparty/astc-codec/include"), } + local ASTC_CODEC_DIR = path.join(BIMG_DIR, "3rdparty/astc-codec") + files { path.join(BIMG_DIR, "include/**"), path.join(BIMG_DIR, "src/image.*"), path.join(BIMG_DIR, "src/image_gnf.cpp"), + + path.join(ASTC_CODEC_DIR, "src/decoder/astc_file.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/codec.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/endpoint_codec.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/footprint.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/integer_sequence_codec.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/intermediate_astc_block.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/logical_astc_block.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/partition.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/physical_astc_block.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/quantization.*"), + path.join(ASTC_CODEC_DIR, "src/decoder/weight_infill.*"), } configuration { "linux-*" } diff --git a/3rdparty/bimg/scripts/bimg_decode.lua b/3rdparty/bimg/scripts/bimg_decode.lua index ca045ed1b92..67c8c43f094 100644 --- a/3rdparty/bimg/scripts/bimg_decode.lua +++ b/3rdparty/bimg/scripts/bimg_decode.lua @@ -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 -- @@ -10,8 +10,6 @@ project "bimg_decode" path.join(BX_DIR, "include"), path.join(BIMG_DIR, "include"), path.join(BIMG_DIR, "3rdparty"), - path.join(BIMG_DIR, "3rdparty/nvtt"), - path.join(BIMG_DIR, "3rdparty/iqa/include"), } files { diff --git a/3rdparty/bimg/scripts/bimg_encode.lua b/3rdparty/bimg/scripts/bimg_encode.lua index 06649108b82..61544200345 100644 --- a/3rdparty/bimg/scripts/bimg_encode.lua +++ b/3rdparty/bimg/scripts/bimg_encode.lua @@ -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 -- diff --git a/3rdparty/bimg/scripts/genie.lua b/3rdparty/bimg/scripts/genie.lua index 93acdfb712f..1a5171599da 100644 --- a/3rdparty/bimg/scripts/genie.lua +++ b/3rdparty/bimg/scripts/genie.lua @@ -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/bimg#license-bsd-2-clause -- diff --git a/3rdparty/bimg/scripts/texturec.lua b/3rdparty/bimg/scripts/texturec.lua index 9bb3ef63649..b094a7d8ab2 100644 --- a/3rdparty/bimg/scripts/texturec.lua +++ b/3rdparty/bimg/scripts/texturec.lua @@ -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/bimg#license-bsd-2-clause -- |