summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/05-instancing
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/examples/05-instancing')
-rw-r--r--3rdparty/bgfx/examples/05-instancing/fs_instancing.sc2
-rw-r--r--3rdparty/bgfx/examples/05-instancing/instancing.cpp21
-rw-r--r--3rdparty/bgfx/examples/05-instancing/makefile2
-rw-r--r--3rdparty/bgfx/examples/05-instancing/vs_instancing.sc2
4 files changed, 16 insertions, 11 deletions
diff --git a/3rdparty/bgfx/examples/05-instancing/fs_instancing.sc b/3rdparty/bgfx/examples/05-instancing/fs_instancing.sc
index 99ec64685ad..9dc0deaf872 100644
--- a/3rdparty/bgfx/examples/05-instancing/fs_instancing.sc
+++ b/3rdparty/bgfx/examples/05-instancing/fs_instancing.sc
@@ -1,7 +1,7 @@
$input v_color0
/*
- * 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/05-instancing/instancing.cpp b/3rdparty/bgfx/examples/05-instancing/instancing.cpp
index d471efb87fd..83c78e49c1a 100644
--- a/3rdparty/bgfx/examples/05-instancing/instancing.cpp
+++ b/3rdparty/bgfx/examples/05-instancing/instancing.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
*/
@@ -19,17 +19,17 @@ struct PosColorVertex
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)
.end();
};
- static bgfx::VertexDecl ms_decl;
+ static bgfx::VertexLayout ms_layout;
};
-bgfx::VertexDecl PosColorVertex::ms_decl;
+bgfx::VertexLayout PosColorVertex::ms_layout;
static PosColorVertex s_cubeVertices[8] =
{
@@ -62,8 +62,8 @@ static const uint16_t s_cubeIndices[36] =
class ExampleInstancing : public entry::AppI
{
public:
- ExampleInstancing(const char* _name, const char* _description)
- : entry::AppI(_name, _description)
+ ExampleInstancing(const char* _name, const char* _description, const char* _url)
+ : entry::AppI(_name, _description, _url)
{
}
@@ -101,7 +101,7 @@ public:
// Create static vertex buffer.
m_vbh = bgfx::createVertexBuffer(
bgfx::makeRef(s_cubeVertices, sizeof(s_cubeVertices) )
- , PosColorVertex::ms_decl
+ , PosColorVertex::ms_layout
);
// Create static index buffer.
@@ -261,4 +261,9 @@ public:
} // namespace
-ENTRY_IMPLEMENT_MAIN(ExampleInstancing, "05-instancing", "Geometry instancing.");
+ENTRY_IMPLEMENT_MAIN(
+ ExampleInstancing
+ , "05-instancing"
+ , "Geometry instancing."
+ , "https://bkaradzic.github.io/bgfx/examples.html#instancing"
+ );
diff --git a/3rdparty/bgfx/examples/05-instancing/makefile b/3rdparty/bgfx/examples/05-instancing/makefile
index 171709170a4..ef9203197d7 100644
--- a/3rdparty/bgfx/examples/05-instancing/makefile
+++ b/3rdparty/bgfx/examples/05-instancing/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/05-instancing/vs_instancing.sc b/3rdparty/bgfx/examples/05-instancing/vs_instancing.sc
index b48a802b1b4..9d5151d03f4 100644
--- a/3rdparty/bgfx/examples/05-instancing/vs_instancing.sc
+++ b/3rdparty/bgfx/examples/05-instancing/vs_instancing.sc
@@ -2,7 +2,7 @@ $input a_position, a_color0, i_data0, i_data1, i_data2, i_data3, i_data4
$output v_color0
/*
- * 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
*/