summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/19-oit
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/19-oit
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/19-oit')
-rw-r--r--3rdparty/bgfx/examples/19-oit/fs_oit.sc2
-rw-r--r--3rdparty/bgfx/examples/19-oit/fs_oit_wb.sc2
-rw-r--r--3rdparty/bgfx/examples/19-oit/fs_oit_wb_blit.sc2
-rw-r--r--3rdparty/bgfx/examples/19-oit/fs_oit_wb_separate.sc2
-rw-r--r--3rdparty/bgfx/examples/19-oit/fs_oit_wb_separate_blit.sc2
-rw-r--r--3rdparty/bgfx/examples/19-oit/makefile2
-rw-r--r--3rdparty/bgfx/examples/19-oit/oit.cpp35
-rw-r--r--3rdparty/bgfx/examples/19-oit/vs_oit.sc2
-rw-r--r--3rdparty/bgfx/examples/19-oit/vs_oit_blit.sc2
9 files changed, 28 insertions, 23 deletions
diff --git a/3rdparty/bgfx/examples/19-oit/fs_oit.sc b/3rdparty/bgfx/examples/19-oit/fs_oit.sc
index cd71b902adb..42b93c9eaf3 100644
--- a/3rdparty/bgfx/examples/19-oit/fs_oit.sc
+++ b/3rdparty/bgfx/examples/19-oit/fs_oit.sc
@@ -1,7 +1,7 @@
$input v_pos
/*
- * 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/19-oit/fs_oit_wb.sc b/3rdparty/bgfx/examples/19-oit/fs_oit_wb.sc
index aa9531f96bd..3158277a7f0 100644
--- a/3rdparty/bgfx/examples/19-oit/fs_oit_wb.sc
+++ b/3rdparty/bgfx/examples/19-oit/fs_oit_wb.sc
@@ -1,7 +1,7 @@
$input v_pos
/*
- * 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/19-oit/fs_oit_wb_blit.sc b/3rdparty/bgfx/examples/19-oit/fs_oit_wb_blit.sc
index 4f4c8fae668..aa14724543b 100644
--- a/3rdparty/bgfx/examples/19-oit/fs_oit_wb_blit.sc
+++ b/3rdparty/bgfx/examples/19-oit/fs_oit_wb_blit.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/19-oit/fs_oit_wb_separate.sc b/3rdparty/bgfx/examples/19-oit/fs_oit_wb_separate.sc
index 4a049922363..502fa851e0a 100644
--- a/3rdparty/bgfx/examples/19-oit/fs_oit_wb_separate.sc
+++ b/3rdparty/bgfx/examples/19-oit/fs_oit_wb_separate.sc
@@ -1,7 +1,7 @@
$input v_pos
/*
- * 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/19-oit/fs_oit_wb_separate_blit.sc b/3rdparty/bgfx/examples/19-oit/fs_oit_wb_separate_blit.sc
index 8c6c52c3937..1bbd80e91fd 100644
--- a/3rdparty/bgfx/examples/19-oit/fs_oit_wb_separate_blit.sc
+++ b/3rdparty/bgfx/examples/19-oit/fs_oit_wb_separate_blit.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/19-oit/makefile b/3rdparty/bgfx/examples/19-oit/makefile
index 171709170a4..ef9203197d7 100644
--- a/3rdparty/bgfx/examples/19-oit/makefile
+++ b/3rdparty/bgfx/examples/19-oit/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/19-oit/oit.cpp b/3rdparty/bgfx/examples/19-oit/oit.cpp
index b8660c06362..c071a0620f6 100644
--- a/3rdparty/bgfx/examples/19-oit/oit.cpp
+++ b/3rdparty/bgfx/examples/19-oit/oit.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;
struct PosColorTexCoord0Vertex
{
@@ -42,7 +42,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)
@@ -50,10 +50,10 @@ struct PosColorTexCoord0Vertex
.end();
}
- static bgfx::VertexDecl ms_decl;
+ static bgfx::VertexLayout ms_layout;
};
-bgfx::VertexDecl PosColorTexCoord0Vertex::ms_decl;
+bgfx::VertexLayout PosColorTexCoord0Vertex::ms_layout;
static PosColorVertex s_cubeVertices[8] =
{
@@ -93,10 +93,10 @@ inline void mtxProj(float* _result, float _fovy, float _aspect, float _near, flo
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;
@@ -152,8 +152,8 @@ void screenSpaceQuad(float _textureWidth, float _textureHeight, bool _originBott
class ExampleOIT : public entry::AppI
{
public:
- ExampleOIT(const char* _name, const char* _description)
- : entry::AppI(_name, _description)
+ ExampleOIT(const char* _name, const char* _description, const char* _url)
+ : entry::AppI(_name, _description, _url)
{
}
@@ -203,15 +203,15 @@ 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.
m_ibh = bgfx::createIndexBuffer(bgfx::makeRef(s_cubeIndices, sizeof(s_cubeIndices) ) );
// Create texture sampler uniforms.
- s_texColor0 = bgfx::createUniform("s_texColor0", bgfx::UniformType::Int1);
- s_texColor1 = bgfx::createUniform("s_texColor1", bgfx::UniformType::Int1);
+ s_texColor0 = bgfx::createUniform("s_texColor0", bgfx::UniformType::Sampler);
+ s_texColor1 = bgfx::createUniform("s_texColor1", bgfx::UniformType::Sampler);
u_color = bgfx::createUniform("u_color", bgfx::UniformType::Vec4);
m_blend = loadProgram("vs_oit", "fs_oit" );
@@ -550,4 +550,9 @@ public:
} // namespace
-ENTRY_IMPLEMENT_MAIN(ExampleOIT, "19-oit", "Weighted, Blended Order Independent Transparency.");
+ENTRY_IMPLEMENT_MAIN(
+ ExampleOIT
+ , "19-oit"
+ , "Weighted, Blended Order Independent Transparency."
+ , "https://bkaradzic.github.io/bgfx/examples.html#oit"
+ );
diff --git a/3rdparty/bgfx/examples/19-oit/vs_oit.sc b/3rdparty/bgfx/examples/19-oit/vs_oit.sc
index cd66075de26..3c9fb6ddfd4 100644
--- a/3rdparty/bgfx/examples/19-oit/vs_oit.sc
+++ b/3rdparty/bgfx/examples/19-oit/vs_oit.sc
@@ -2,7 +2,7 @@ $input a_position
$output v_pos
/*
- * 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/19-oit/vs_oit_blit.sc b/3rdparty/bgfx/examples/19-oit/vs_oit_blit.sc
index 8c3b7a822b6..33cba4f17cc 100644
--- a/3rdparty/bgfx/examples/19-oit/vs_oit_blit.sc
+++ b/3rdparty/bgfx/examples/19-oit/vs_oit_blit.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
*/