summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/12-lod/lod.cpp
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2019-10-13 13:50:38 +0200
committer R. Belmont <rb6502@users.noreply.github.com>2019-10-13 07:50:38 -0400
commit0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch)
tree626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /3rdparty/bgfx/examples/12-lod/lod.cpp
parentc913ccb59d713ce0b91135520719ac5385e54358 (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/12-lod/lod.cpp')
-rw-r--r--3rdparty/bgfx/examples/12-lod/lod.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/3rdparty/bgfx/examples/12-lod/lod.cpp b/3rdparty/bgfx/examples/12-lod/lod.cpp
index 130826c747f..37bd4dd6c50 100644
--- a/3rdparty/bgfx/examples/12-lod/lod.cpp
+++ b/3rdparty/bgfx/examples/12-lod/lod.cpp
@@ -29,8 +29,8 @@ static const KnightPos knightTour[8*4] =
class ExampleLod : public entry::AppI
{
public:
- ExampleLod(const char* _name, const char* _description)
- : entry::AppI(_name, _description)
+ ExampleLod(const char* _name, const char* _description, const char* _url)
+ : entry::AppI(_name, _description, _url)
{
}
@@ -62,8 +62,8 @@ public:
, 0
);
- s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Int1);
- s_texStipple = bgfx::createUniform("s_texStipple", bgfx::UniformType::Int1);
+ s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Sampler);
+ s_texStipple = bgfx::createUniform("s_texStipple", bgfx::UniformType::Sampler);
u_stipple = bgfx::createUniform("u_stipple", bgfx::UniformType::Vec4);
m_program = loadProgram("vs_tree", "fs_tree");
@@ -311,4 +311,9 @@ public:
} // namespace
-ENTRY_IMPLEMENT_MAIN(ExampleLod, "12-lod", "Mesh LOD transitions.");
+ENTRY_IMPLEMENT_MAIN(
+ ExampleLod
+ , "12-lod"
+ , "Mesh LOD transitions."
+ , "https://bkaradzic.github.io/bgfx/examples.html#lod"
+ );