From db318046c4ed54fa7822b6aec55bec6d427e1e95 Mon Sep 17 00:00:00 2001 From: couriersud Date: Thu, 17 Oct 2019 10:21:00 +0200 Subject: 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 --- 3rdparty/bgfx/src/renderer_gl.cpp | 5 ++++- 3rdparty/bgfx/src/renderer_vk.cpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to '3rdparty') 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; -- cgit v1.2.3-70-g09d2