summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2019-10-17 10:21:00 +0200
committer couriersud <couriersud@gmx.org>2019-10-17 10:21:00 +0200
commitdb318046c4ed54fa7822b6aec55bec6d427e1e95 (patch)
tree1636e304db0c44da12d192ef8cd17837d4975b86 /3rdparty
parentda35541e842fe09869d24f2dda23162194c369ce (diff)
Netlist: code maintenance and bug fixes. (nw)
- solver now uses dynamic allocation on systems larger than 512x512 - fixed osx build - moved nl_lists.h classes to plists.h - fixed netlist makefile clint section - readability and typos
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/bgfx/src/renderer_gl.cpp5
-rw-r--r--3rdparty/bgfx/src/renderer_vk.cpp4
2 files changed, 6 insertions, 3 deletions
diff --git a/3rdparty/bgfx/src/renderer_gl.cpp b/3rdparty/bgfx/src/renderer_gl.cpp
index 3fe8afcba0f..c990e635350 100644
--- a/3rdparty/bgfx/src/renderer_gl.cpp
+++ b/3rdparty/bgfx/src/renderer_gl.cpp
@@ -5579,7 +5579,10 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
version = 0 == bx::strCmp(code, "#version 430", 12) ? 430 : version;
- bx::write(&writer, &err, "#version %d\n", version);
+ if (version < 130)
+ bx::write(&writer, &err, "#version %d\n", 130);
+ else
+ bx::write(&writer, &err, "#version %d\n", version);
if (430 > version && usesTextureLod)
{
diff --git a/3rdparty/bgfx/src/renderer_vk.cpp b/3rdparty/bgfx/src/renderer_vk.cpp
index 579b6c146b8..a4ec5f31435 100644
--- a/3rdparty/bgfx/src/renderer_vk.cpp
+++ b/3rdparty/bgfx/src/renderer_vk.cpp
@@ -3935,8 +3935,8 @@ VK_IMPORT_DEVICE
{
attachments[mrt].colorAttachment = mrt;
attachments[mrt].aspectMask = 0;
- attachments[mrt].aspectMask |= (_clear.m_flags & BGFX_CLEAR_DEPTH ) ? VK_IMAGE_ASPECT_DEPTH_BIT : 0;
- attachments[mrt].aspectMask |= (_clear.m_flags & BGFX_CLEAR_STENCIL) ? VK_IMAGE_ASPECT_STENCIL_BIT : 0;
+ //attachments[mrt].aspectMask |= (_clear.m_flags & BGFX_CLEAR_DEPTH ) ? VK_IMAGE_ASPECT_DEPTH_BIT : 0;
+ //attachments[mrt].aspectMask |= (_clear.m_flags & BGFX_CLEAR_STENCIL) ? VK_IMAGE_ASPECT_STENCIL_BIT : 0;
attachments[mrt].clearValue.depthStencil.stencil = _clear.m_stencil;
attachments[mrt].clearValue.depthStencil.depth = _clear.m_depth;