From dee11c9655006cd8ad55001a60f029005e6fa0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Fri, 27 Oct 2017 17:57:48 -0700
Subject: [PATCH] Fixed program deduplication issue.

---
 src/bgfx.cpp |  7 ++++++-
 src/bgfx_p.h | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/bgfx.cpp b/src/bgfx.cpp
index 82475cc8d..1e8e759ab 100644
--- a/src/bgfx.cpp
+++ b/src/bgfx.cpp
@@ -1578,7 +1578,12 @@ namespace bgfx
 							{                                                                         \
 								uint16_t idx = _handleAlloc.getHandleAt(ii);                          \
 								const _type& ref = _ref[idx]; BX_UNUSED(ref);                         \
-								BX_TRACE("\t%3d: %4d %s", ii, idx, ref.m_name.getPtr() );             \
+								BX_TRACE("\t%3d: %4d %s (count %d)"                                   \
+										, ii                                                          \
+										, idx                                                         \
+										, ref.m_name.getPtr()                                         \
+										, ref.m_refCount                                              \
+										);                                                            \
 							}                                                                         \
 						}                                                                             \
 					BX_MACRO_BLOCK_END
diff --git a/src/bgfx_p.h b/src/bgfx_p.h
index 21d984bb9..ffdc05661 100644
--- a/src/bgfx_p.h
+++ b/src/bgfx_p.h
@@ -3418,37 +3418,37 @@ namespace bgfx
 				return invalid;
 			}
 
-			uint16_t idx = m_programHashMap.find(_vsh.idx);
-			if (kInvalidHandle != idx)
+			ProgramHandle handle = { m_programHashMap.find(_vsh.idx) };
+
+			if (isValid(handle) )
 			{
-				ProgramHandle handle = { idx };
 				ProgramRef& pr = m_programRef[handle.idx];
 				++pr.m_refCount;
 				shaderIncRef(pr.m_vsh);
-				return handle;
 			}
-
-			ProgramHandle handle;
-			handle.idx = m_programHandle.alloc();
-
-			BX_WARN(isValid(handle), "Failed to allocate program handle.");
-			if (isValid(handle) )
+			else
 			{
-				shaderIncRef(_vsh);
-				ProgramRef& pr = m_programRef[handle.idx];
-				pr.m_vsh = _vsh;
-				ShaderHandle fsh = BGFX_INVALID_HANDLE;
-				pr.m_fsh = fsh;
-				pr.m_refCount = 1;
+				handle.idx = m_programHandle.alloc();
 
-				const uint32_t key = uint32_t(_vsh.idx);
-				bool ok = m_programHashMap.insert(key, handle.idx);
-				BX_CHECK(ok, "Program already exists (key: %x, handle: %3d)!", key, handle.idx); BX_UNUSED(ok);
+				BX_WARN(isValid(handle), "Failed to allocate program handle.");
+				if (isValid(handle) )
+				{
+					shaderIncRef(_vsh);
+					ProgramRef& pr = m_programRef[handle.idx];
+					pr.m_vsh = _vsh;
+					ShaderHandle fsh = BGFX_INVALID_HANDLE;
+					pr.m_fsh = fsh;
+					pr.m_refCount = 1;
 
-				CommandBuffer& cmdbuf = getCommandBuffer(CommandBuffer::CreateProgram);
-				cmdbuf.write(handle);
-				cmdbuf.write(_vsh);
-				cmdbuf.write(fsh);
+					const uint32_t key = uint32_t(_vsh.idx);
+					bool ok = m_programHashMap.insert(key, handle.idx);
+					BX_CHECK(ok, "Program already exists (key: %x, handle: %3d)!", key, handle.idx); BX_UNUSED(ok);
+
+					CommandBuffer& cmdbuf = getCommandBuffer(CommandBuffer::CreateProgram);
+					cmdbuf.write(handle);
+					cmdbuf.write(_vsh);
+					cmdbuf.write(fsh);
+				}
 			}
 
 			if (_destroyShader)