From 697dfa9fac769726c136c9c487bb3d47b7d07f56 Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 18 Oct 2019 18:01:13 +0200 Subject: [PATCH] Revert accidental commit of bgfx hacks. (nw) --- 3rdparty/bgfx/src/renderer_gl.cpp | 5 +---- 3rdparty/bgfx/src/renderer_vk.cpp | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/3rdparty/bgfx/src/renderer_gl.cpp b/3rdparty/bgfx/src/renderer_gl.cpp index c990e635350..3fe8afcba0f 100644 --- a/3rdparty/bgfx/src/renderer_gl.cpp +++ b/3rdparty/bgfx/src/renderer_gl.cpp @@ -5579,10 +5579,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) ); version = 0 == bx::strCmp(code, "#version 430", 12) ? 430 : version; - if (version < 130) - bx::write(&writer, &err, "#version %d\n", 130); - else - bx::write(&writer, &err, "#version %d\n", version); + 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 a4ec5f31435..579b6c146b8 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;