summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/33-pom/pom.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/33-pom/pom.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/33-pom/pom.cpp')
-rw-r--r--3rdparty/bgfx/examples/33-pom/pom.cpp27
1 files changed, 16 insertions, 11 deletions
diff --git a/3rdparty/bgfx/examples/33-pom/pom.cpp b/3rdparty/bgfx/examples/33-pom/pom.cpp
index 4148c32129d..66880ee1950 100644
--- a/3rdparty/bgfx/examples/33-pom/pom.cpp
+++ b/3rdparty/bgfx/examples/33-pom/pom.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
*/
@@ -23,7 +23,7 @@ struct PosTangentBitangentTexcoordVertex
static void init()
{
- ms_decl
+ ms_layout
.begin()
.add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float)
.add(bgfx::Attrib::Tangent, 4, bgfx::AttribType::Uint8, true, true)
@@ -32,10 +32,10 @@ struct PosTangentBitangentTexcoordVertex
.end();
}
- static bgfx::VertexDecl ms_decl;
+ static bgfx::VertexLayout ms_layout;
};
-bgfx::VertexDecl PosTangentBitangentTexcoordVertex::ms_decl;
+bgfx::VertexLayout PosTangentBitangentTexcoordVertex::ms_layout;
uint32_t packUint32(uint8_t _x, uint8_t _y, uint8_t _z, uint8_t _w)
{
@@ -111,8 +111,8 @@ static const uint16_t s_cubeIndices[36] =
class ExamplePom : public entry::AppI
{
public:
- ExamplePom(const char* _name, const char* _description)
- : entry::AppI(_name, _description)
+ ExamplePom(const char* _name, const char* _description, const char* _url)
+ : entry::AppI(_name, _description, _url)
{
}
@@ -149,15 +149,15 @@ public:
// Create static vertex buffer.
m_vbh = bgfx::createVertexBuffer(bgfx::makeRef(s_cubeVertices, sizeof(s_cubeVertices) ),
- PosTangentBitangentTexcoordVertex::ms_decl);
+ PosTangentBitangentTexcoordVertex::ms_layout);
// Create static index buffer.
m_ibh = bgfx::createIndexBuffer(bgfx::makeRef(s_cubeIndices, sizeof(s_cubeIndices) ) );
// Create texture sampler uniforms.
- s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Int1);
- s_texNormal = bgfx::createUniform("s_texNormal", bgfx::UniformType::Int1);
- s_texDepth = bgfx::createUniform("s_texDepth", bgfx::UniformType::Int1);
+ s_texColor = bgfx::createUniform("s_texColor", bgfx::UniformType::Sampler);
+ s_texNormal = bgfx::createUniform("s_texNormal", bgfx::UniformType::Sampler);
+ s_texDepth = bgfx::createUniform("s_texDepth", bgfx::UniformType::Sampler);
u_light_pos = bgfx::createUniform("u_light_pos", bgfx::UniformType::Vec4);
@@ -385,4 +385,9 @@ public:
} // namespace
-ENTRY_IMPLEMENT_MAIN(ExamplePom, "33-pom", "Parallax mapping.");
+ENTRY_IMPLEMENT_MAIN(
+ ExamplePom
+ , "33-pom"
+ , "Parallax mapping."
+ , "https://bkaradzic.github.io/bgfx/examples.html#pom"
+ );