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/texturev.lua | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to '3rdparty/bgfx/scripts/texturev.lua') diff --git a/3rdparty/bgfx/scripts/texturev.lua b/3rdparty/bgfx/scripts/texturev.lua index 8d17034c664..f6e93d8ba06 100644 --- a/3rdparty/bgfx/scripts/texturev.lua +++ b/3rdparty/bgfx/scripts/texturev.lua @@ -80,6 +80,7 @@ project ("texturev") configuration { "vs20* or mingw*" } links { + "comdlg32", "gdi32", "psapi", } @@ -116,24 +117,6 @@ project ("texturev") "GLESv2", } - configuration { "nacl*" } - kind "ConsoleApp" - targetextension ".nexe" - links { - "ppapi", - "ppapi_gles2", - "pthread", - } - - configuration { "pnacl" } - kind "ConsoleApp" - targetextension ".pexe" - links { - "ppapi", - "ppapi_gles2", - "pthread", - } - configuration { "asmjs" } kind "ConsoleApp" targetextension ".bc" @@ -174,7 +157,7 @@ project ("texturev") "-framework QuartzCore", } - configuration { "xcode4", "ios" } + configuration { "xcode*", "ios" } kind "WindowedApp" configuration { "qnx*" } -- cgit v1.2.3-70-g09d2