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/34-mvs/mvs.cpp | |
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/34-mvs/mvs.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/34-mvs/mvs.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/3rdparty/bgfx/examples/34-mvs/mvs.cpp b/3rdparty/bgfx/examples/34-mvs/mvs.cpp index 87144356f8f..a2382d6e626 100644 --- a/3rdparty/bgfx/examples/34-mvs/mvs.cpp +++ b/3rdparty/bgfx/examples/34-mvs/mvs.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 */ @@ -18,16 +18,16 @@ struct PosVertex static void init() { - ms_decl + ms_layout .begin() .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float) .end(); }; - static bgfx::VertexDecl ms_decl; + static bgfx::VertexLayout ms_layout; }; -bgfx::VertexDecl PosVertex::ms_decl; +bgfx::VertexLayout PosVertex::ms_layout; struct ColorVertex { @@ -35,16 +35,16 @@ struct ColorVertex static void init() { - ms_decl + ms_layout .begin() .add(bgfx::Attrib::Color0, 4, bgfx::AttribType::Uint8, true) .end(); }; - static bgfx::VertexDecl ms_decl; + static bgfx::VertexLayout ms_layout; }; -bgfx::VertexDecl ColorVertex::ms_decl; +bgfx::VertexLayout ColorVertex::ms_layout; static PosVertex s_cubePosVertices[] = { @@ -105,8 +105,8 @@ static const uint16_t s_cubeTriStrip[] = class ExampleMvs : public entry::AppI { public: - ExampleMvs(const char* _name, const char* _description) - : entry::AppI(_name, _description) + ExampleMvs(const char* _name, const char* _description, const char* _url) + : entry::AppI(_name, _description, _url) { } @@ -148,13 +148,13 @@ public: m_vbh[0] = bgfx::createVertexBuffer( // Static data can be passed with bgfx::makeRef bgfx::makeRef(s_cubePosVertices, sizeof(s_cubePosVertices) ) - , PosVertex::ms_decl + , PosVertex::ms_layout ); m_vbh[1] = bgfx::createVertexBuffer( // Static data can be passed with bgfx::makeRef bgfx::makeRef(s_cubeColorVertices, sizeof(s_cubeColorVertices) ) - , ColorVertex::ms_decl + , ColorVertex::ms_layout ); // Create static index buffer. @@ -281,4 +281,9 @@ public: } // namespace -ENTRY_IMPLEMENT_MAIN(ExampleMvs, "34-mvs", "Multiple vertex streams."); +ENTRY_IMPLEMENT_MAIN( + ExampleMvs + , "34-mvs" + , "Multiple vertex streams." + , "https://bkaradzic.github.io/bgfx/examples.html#mvs" + ); |