diff options
author | 2019-10-13 13:50:38 +0200 | |
---|---|---|
committer | 2019-10-13 07:50:38 -0400 | |
commit | 0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch) | |
tree | 626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /3rdparty/bgfx/examples/09-hdr | |
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/bgfx/examples/09-hdr')
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/common.sh | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/fs_hdr_blur.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/fs_hdr_bright.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/fs_hdr_lum.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/fs_hdr_lumavg.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/fs_hdr_mesh.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/fs_hdr_skybox.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/fs_hdr_tonemap.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/hdr.cpp | 31 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/makefile | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/vs_hdr_blur.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/vs_hdr_bright.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/vs_hdr_lum.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/vs_hdr_lumavg.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/vs_hdr_mesh.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/vs_hdr_skybox.sc | 2 | ||||
-rw-r--r-- | 3rdparty/bgfx/examples/09-hdr/vs_hdr_tonemap.sc | 2 |
17 files changed, 34 insertions, 29 deletions
diff --git a/3rdparty/bgfx/examples/09-hdr/common.sh b/3rdparty/bgfx/examples/09-hdr/common.sh index c2fb179dbf3..76f789ea564 100644 --- a/3rdparty/bgfx/examples/09-hdr/common.sh +++ b/3rdparty/bgfx/examples/09-hdr/common.sh @@ -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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/fs_hdr_blur.sc b/3rdparty/bgfx/examples/09-hdr/fs_hdr_blur.sc index e4ceb061faa..dbe3ea98b71 100644 --- a/3rdparty/bgfx/examples/09-hdr/fs_hdr_blur.sc +++ b/3rdparty/bgfx/examples/09-hdr/fs_hdr_blur.sc @@ -1,7 +1,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/fs_hdr_bright.sc b/3rdparty/bgfx/examples/09-hdr/fs_hdr_bright.sc index 3c969b30c1c..c078dd7937f 100644 --- a/3rdparty/bgfx/examples/09-hdr/fs_hdr_bright.sc +++ b/3rdparty/bgfx/examples/09-hdr/fs_hdr_bright.sc @@ -1,7 +1,7 @@ $input v_texcoord0 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/fs_hdr_lum.sc b/3rdparty/bgfx/examples/09-hdr/fs_hdr_lum.sc index 488a04b0104..6d0acb55045 100644 --- a/3rdparty/bgfx/examples/09-hdr/fs_hdr_lum.sc +++ b/3rdparty/bgfx/examples/09-hdr/fs_hdr_lum.sc @@ -1,7 +1,7 @@ $input v_texcoord0 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/fs_hdr_lumavg.sc b/3rdparty/bgfx/examples/09-hdr/fs_hdr_lumavg.sc index eb35f1f3caa..26eebbfbe00 100644 --- a/3rdparty/bgfx/examples/09-hdr/fs_hdr_lumavg.sc +++ b/3rdparty/bgfx/examples/09-hdr/fs_hdr_lumavg.sc @@ -1,7 +1,7 @@ $input v_texcoord0 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/fs_hdr_mesh.sc b/3rdparty/bgfx/examples/09-hdr/fs_hdr_mesh.sc index 1e64fd1ff9d..91e125180df 100644 --- a/3rdparty/bgfx/examples/09-hdr/fs_hdr_mesh.sc +++ b/3rdparty/bgfx/examples/09-hdr/fs_hdr_mesh.sc @@ -1,7 +1,7 @@ $input v_pos, v_view, v_normal /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/fs_hdr_skybox.sc b/3rdparty/bgfx/examples/09-hdr/fs_hdr_skybox.sc index 63e6d58e5d1..99e425bd36e 100644 --- a/3rdparty/bgfx/examples/09-hdr/fs_hdr_skybox.sc +++ b/3rdparty/bgfx/examples/09-hdr/fs_hdr_skybox.sc @@ -1,7 +1,7 @@ $input v_texcoord0 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/fs_hdr_tonemap.sc b/3rdparty/bgfx/examples/09-hdr/fs_hdr_tonemap.sc index e17ebfedfa6..5c71ebb0a49 100644 --- a/3rdparty/bgfx/examples/09-hdr/fs_hdr_tonemap.sc +++ b/3rdparty/bgfx/examples/09-hdr/fs_hdr_tonemap.sc @@ -1,7 +1,7 @@ $input v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/hdr.cpp b/3rdparty/bgfx/examples/09-hdr/hdr.cpp index fb3a266dacb..56aaaa59e70 100644 --- a/3rdparty/bgfx/examples/09-hdr/hdr.cpp +++ b/3rdparty/bgfx/examples/09-hdr/hdr.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 */ @@ -24,7 +24,7 @@ struct PosColorTexCoord0Vertex static void init() { - ms_decl + ms_layout .begin() .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) @@ -32,17 +32,17 @@ struct PosColorTexCoord0Vertex .end(); } - static bgfx::VertexDecl ms_decl; + static bgfx::VertexLayout ms_layout; }; -bgfx::VertexDecl PosColorTexCoord0Vertex::ms_decl; +bgfx::VertexLayout PosColorTexCoord0Vertex::ms_layout; void screenSpaceQuad(float _textureWidth, float _textureHeight, bool _originBottomLeft = false, float _width = 1.0f, float _height = 1.0f) { - if (3 == bgfx::getAvailTransientVertexBuffer(3, PosColorTexCoord0Vertex::ms_decl) ) + if (3 == bgfx::getAvailTransientVertexBuffer(3, PosColorTexCoord0Vertex::ms_layout) ) { bgfx::TransientVertexBuffer vb; - bgfx::allocTransientVertexBuffer(&vb, 3, PosColorTexCoord0Vertex::ms_decl); + bgfx::allocTransientVertexBuffer(&vb, 3, PosColorTexCoord0Vertex::ms_layout); PosColorTexCoord0Vertex* vertex = (PosColorTexCoord0Vertex*)vb.data; const float zz = 0.0f; @@ -140,8 +140,8 @@ void setOffsets4x4Lum(bgfx::UniformHandle _handle, uint32_t _width, uint32_t _he class ExampleHDR : public entry::AppI { public: - ExampleHDR(const char* _name, const char* _description) - : entry::AppI(_name, _description) + ExampleHDR(const char* _name, const char* _description, const char* _url) + : entry::AppI(_name, _description, _url) { } @@ -183,10 +183,10 @@ public: m_meshProgram = loadProgram("vs_hdr_mesh", "fs_hdr_mesh"); m_tonemapProgram = loadProgram("vs_hdr_tonemap", "fs_hdr_tonemap"); - s_texCube = bgfx::createUniform("s_texCube", bgfx::UniformType::Int1); - s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Int1); - s_texLum = bgfx::createUniform("s_texLum", bgfx::UniformType::Int1); - s_texBlur = bgfx::createUniform("s_texBlur", bgfx::UniformType::Int1); + s_texCube = bgfx::createUniform("s_texCube", bgfx::UniformType::Sampler); + s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Sampler); + s_texLum = bgfx::createUniform("s_texLum", bgfx::UniformType::Sampler); + s_texBlur = bgfx::createUniform("s_texBlur", bgfx::UniformType::Sampler); u_mtx = bgfx::createUniform("u_mtx", bgfx::UniformType::Mat4); u_tonemap = bgfx::createUniform("u_tonemap", bgfx::UniformType::Vec4); u_offset = bgfx::createUniform("u_offset", bgfx::UniformType::Vec4, 16); @@ -629,4 +629,9 @@ public: } // namespace -ENTRY_IMPLEMENT_MAIN(ExampleHDR, "09-hdr", "Using multiple views with frame buffers, and view order remapping."); +ENTRY_IMPLEMENT_MAIN( + ExampleHDR + , "09-hdr" + , "Using multiple views with frame buffers, and view order remapping." + , "https://bkaradzic.github.io/bgfx/examples.html#hdr" + ); diff --git a/3rdparty/bgfx/examples/09-hdr/makefile b/3rdparty/bgfx/examples/09-hdr/makefile index 171709170a4..ef9203197d7 100644 --- a/3rdparty/bgfx/examples/09-hdr/makefile +++ b/3rdparty/bgfx/examples/09-hdr/makefile @@ -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 # diff --git a/3rdparty/bgfx/examples/09-hdr/vs_hdr_blur.sc b/3rdparty/bgfx/examples/09-hdr/vs_hdr_blur.sc index 51b17c14b5b..319a64340c4 100644 --- a/3rdparty/bgfx/examples/09-hdr/vs_hdr_blur.sc +++ b/3rdparty/bgfx/examples/09-hdr/vs_hdr_blur.sc @@ -2,7 +2,7 @@ $input a_position, a_texcoord0 $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/vs_hdr_bright.sc b/3rdparty/bgfx/examples/09-hdr/vs_hdr_bright.sc index 8c3b7a822b6..33cba4f17cc 100644 --- a/3rdparty/bgfx/examples/09-hdr/vs_hdr_bright.sc +++ b/3rdparty/bgfx/examples/09-hdr/vs_hdr_bright.sc @@ -2,7 +2,7 @@ $input a_position, a_texcoord0 $output v_texcoord0 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/vs_hdr_lum.sc b/3rdparty/bgfx/examples/09-hdr/vs_hdr_lum.sc index 8c3b7a822b6..33cba4f17cc 100644 --- a/3rdparty/bgfx/examples/09-hdr/vs_hdr_lum.sc +++ b/3rdparty/bgfx/examples/09-hdr/vs_hdr_lum.sc @@ -2,7 +2,7 @@ $input a_position, a_texcoord0 $output v_texcoord0 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/vs_hdr_lumavg.sc b/3rdparty/bgfx/examples/09-hdr/vs_hdr_lumavg.sc index 8c3b7a822b6..33cba4f17cc 100644 --- a/3rdparty/bgfx/examples/09-hdr/vs_hdr_lumavg.sc +++ b/3rdparty/bgfx/examples/09-hdr/vs_hdr_lumavg.sc @@ -2,7 +2,7 @@ $input a_position, a_texcoord0 $output v_texcoord0 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/vs_hdr_mesh.sc b/3rdparty/bgfx/examples/09-hdr/vs_hdr_mesh.sc index 01648dc32b5..50231ccc3b9 100644 --- a/3rdparty/bgfx/examples/09-hdr/vs_hdr_mesh.sc +++ b/3rdparty/bgfx/examples/09-hdr/vs_hdr_mesh.sc @@ -2,7 +2,7 @@ $input a_position, a_normal $output v_pos, v_view, v_normal /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/vs_hdr_skybox.sc b/3rdparty/bgfx/examples/09-hdr/vs_hdr_skybox.sc index 8c3b7a822b6..33cba4f17cc 100644 --- a/3rdparty/bgfx/examples/09-hdr/vs_hdr_skybox.sc +++ b/3rdparty/bgfx/examples/09-hdr/vs_hdr_skybox.sc @@ -2,7 +2,7 @@ $input a_position, a_texcoord0 $output v_texcoord0 /* - * 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 */ diff --git a/3rdparty/bgfx/examples/09-hdr/vs_hdr_tonemap.sc b/3rdparty/bgfx/examples/09-hdr/vs_hdr_tonemap.sc index 13604778439..656318b16ed 100644 --- a/3rdparty/bgfx/examples/09-hdr/vs_hdr_tonemap.sc +++ b/3rdparty/bgfx/examples/09-hdr/vs_hdr_tonemap.sc @@ -2,7 +2,7 @@ $input a_position, a_texcoord0 $output v_texcoord0, v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4 /* - * 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 */ |