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/08-update/update.cpp | 78 ++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 13 deletions(-) (limited to '3rdparty/bgfx/examples/08-update/update.cpp') diff --git a/3rdparty/bgfx/examples/08-update/update.cpp b/3rdparty/bgfx/examples/08-update/update.cpp index 0eb0c53cabe..341f8c75b2d 100644 --- a/3rdparty/bgfx/examples/08-update/update.cpp +++ b/3rdparty/bgfx/examples/08-update/update.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2011-2018 Branimir Karadzic. All rights reserved. + * Copyright 2011-2019 Branimir Karadzic. All rights reserved. * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause */ @@ -26,17 +26,17 @@ struct PosTexcoordVertex static void init() { - ms_decl + ms_layout .begin() .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) .add(bgfx::Attrib::TexCoord0, 3, bgfx::AttribType::Float) .end(); }; - static bgfx::VertexDecl ms_decl; + static bgfx::VertexLayout ms_layout; }; -bgfx::VertexDecl PosTexcoordVertex::ms_decl; +bgfx::VertexLayout PosTexcoordVertex::ms_layout; static PosTexcoordVertex s_cubeVertices[] = { @@ -99,6 +99,16 @@ static const uint16_t s_cubeIndices[] = }; BX_STATIC_ASSERT(BX_COUNTOF(s_cubeIndices) == 36); +bx::Vec3 s_faceColors[] = +{ + { 0.75f, 0.0f, 0.0f }, + { 0.75f, 0.75f, 0.0f }, + { 0.75f, 0.0f, 0.75f }, + { 0.0f, 0.75f, 0.0f }, + { 0.0f, 0.75f, 0.75f }, + { 0.0f, 0.0f, 0.75f }, +}; + static void updateTextureCubeRectBgra8( bgfx::TextureHandle _handle , uint8_t _side @@ -135,8 +145,8 @@ static const uint32_t kTexture2dSize = 256; class ExampleUpdate : public entry::AppI { public: - ExampleUpdate(const char* _name, const char* _description) - : entry::AppI(_name, _description) + ExampleUpdate(const char* _name, const char* _description, const char* _url) + : entry::AppI(_name, _description, _url) , m_cube(kTextureSide) { } @@ -229,7 +239,7 @@ public: } // Create static vertex buffer. - m_vbh = bgfx::createVertexBuffer(bgfx::makeRef(s_cubeVertices, sizeof(s_cubeVertices) ), PosTexcoordVertex::ms_decl); + m_vbh = bgfx::createVertexBuffer(bgfx::makeRef(s_cubeVertices, sizeof(s_cubeVertices) ), PosTexcoordVertex::ms_layout); // Create static index buffer. m_ibh = bgfx::createIndexBuffer(bgfx::makeRef(s_cubeIndices, sizeof(s_cubeIndices) ) ); @@ -250,8 +260,8 @@ public: } // Create texture sampler uniforms. - s_texCube = bgfx::createUniform("s_texCube", bgfx::UniformType::Int1); - s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Int1); + s_texCube = bgfx::createUniform("s_texCube", bgfx::UniformType::Sampler); + s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Sampler); // Create time uniform. u_time = bgfx::createUniform("u_time", bgfx::UniformType::Vec4); @@ -291,6 +301,17 @@ public: ); } + { + m_textureCube[3] = bgfx::createTextureCube(kTextureSide, false, 1, bgfx::TextureFormat::BGRA8, BGFX_TEXTURE_RT); + + for (uint32_t ii = 0; ii < BX_COUNTOF(m_textureCubeFaceFb); ++ii) + { + bgfx::Attachment at; + at.init(m_textureCube[3], bgfx::Access::Write, uint16_t(ii)); + m_textureCubeFaceFb[ii] = bgfx::createFrameBuffer(1, &at); + } + } + m_texture2d = bgfx::createTexture2D( kTexture2dSize , kTexture2dSize @@ -347,6 +368,14 @@ public: } } + for (uint32_t ii = 0; ii