From 0837e7451a84f95c29dbdb9bd6b8b931fee1635d Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sun, 13 Oct 2019 13:50:38 +0200 Subject: 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 --- 3rdparty/bgfx/scripts/example-common.lua | 45 +++++++++++++++----------------- 1 file changed, 21 insertions(+), 24 deletions(-) (limited to '3rdparty/bgfx/scripts/example-common.lua') diff --git a/3rdparty/bgfx/scripts/example-common.lua b/3rdparty/bgfx/scripts/example-common.lua index 976675ee746..66f5fad8e5e 100644 --- a/3rdparty/bgfx/scripts/example-common.lua +++ b/3rdparty/bgfx/scripts/example-common.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/bgfx#license-bsd-2-clause -- @@ -28,43 +28,34 @@ project ("example-common") } files { - path.join(BGFX_DIR, "3rdparty/ib-compress/**.cpp"), - path.join(BGFX_DIR, "3rdparty/ib-compress/**.h"), + path.join(BGFX_DIR, "3rdparty/meshoptimizer/src/**.cpp"), + path.join(BGFX_DIR, "3rdparty/meshoptimizer/src/**.h"), path.join(BGFX_DIR, "3rdparty/dear-imgui/**.cpp"), path.join(BGFX_DIR, "3rdparty/dear-imgui/**.h"), path.join(BGFX_DIR, "examples/common/**.cpp"), - path.join(BGFX_DIR, "examples/common/**.cpp"), path.join(BGFX_DIR, "examples/common/**.h"), } - removefiles { - path.join(BGFX_DIR, "examples/common/example-glue.cpp"), - } + if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-gnm"), + { path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_orbis.cpp") }) then - if _OPTIONS["with-scintilla"] then - defines { - "SCI_NAMESPACE", - "SCI_LEXER", + files { + path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_orbis.cpp"), } + end - buildoptions { --- "-Wno-missing-field-initializers", - } - - includedirs { - path.join(BGFX_DIR, "3rdparty/scintilla/include"), - path.join(BGFX_DIR, "3rdparty/scintilla/lexlib"), - } + if filesexist(BGFX_DIR, path.join(BGFX_DIR, "../bgfx-nvn"), + { path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_nx.cpp") }) then files { - path.join(BGFX_DIR, "3rdparty/scintilla/src/**.cxx"), - path.join(BGFX_DIR, "3rdparty/scintilla/src/**.h"), - path.join(BGFX_DIR, "3rdparty/scintilla/lexlib/**.cxx"), - path.join(BGFX_DIR, "3rdparty/scintilla/lexlib/**.h"), - path.join(BGFX_DIR, "3rdparty/scintilla/lexers/**.cxx"), + path.join(BGFX_DIR, "../bgfx-gnm/examples/common/entry/entry_nx.cpp"), } end + removefiles { + path.join(BGFX_DIR, "examples/common/example-glue.cpp"), + } + if _OPTIONS["with-sdl"] then defines { "ENTRY_CONFIG_USE_SDL=1", @@ -80,6 +71,12 @@ project ("example-common") } end + if _OPTIONS["with-wayland"] then + defines { + "ENTRY_CONFIG_USE_WAYLAND=1", + } + end + configuration { "linux-steamlink" } defines { "EGL_API_FB", -- cgit v1.2.3-70-g09d2