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/examples/common/camera.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '3rdparty/bgfx/examples/common/camera.h') diff --git a/3rdparty/bgfx/examples/common/camera.h b/3rdparty/bgfx/examples/common/camera.h index ba1c0cc1f96..451546448a0 100644 --- a/3rdparty/bgfx/examples/common/camera.h +++ b/3rdparty/bgfx/examples/common/camera.h @@ -22,7 +22,7 @@ void cameraCreate(); void cameraDestroy(); /// -void cameraSetPosition(const float* _pos); +void cameraSetPosition(const bx::Vec3& _pos); /// void cameraSetHorizontalAngle(float _horizontalAngle); @@ -37,10 +37,10 @@ void cameraSetKeyState(uint8_t _key, bool _down); void cameraGetViewMtx(float* _viewMtx); /// -void cameraGetPosition(float* _pos); +bx::Vec3 cameraGetPosition(); /// -void cameraGetAt(float* _at); +bx::Vec3 cameraGetAt(); /// void cameraUpdate(float _deltaTime, const entry::MouseState& _mouseState); -- cgit v1.2.3-70-g09d2