@babylonjs/react-native 2.0.0 → 2.0.1-preview

package/shared/BabylonNative/deps/bgfx.cmake-src/bgfx/src/renderer_d3d11.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2025 Branimir Karadzic. All rights reserved.
+ * Copyright 2011-2026 Branimir Karadzic. All rights reserved.
  * License: https://github.com/bkaradzic/bgfx/blob/master/LICENSE
  */
 
@@ -214,6 +214,10 @@ namespace bgfx { namespace d3d11
 		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // ETC2
 		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // ETC2A
 		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // ETC2A1
+		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // EACR11 UNORM
+		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // EACR11 SNORM
+		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // EACRG11 UNORM
+		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // EACRG11 SNORM
 		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // PTC12
 		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // PTC14
 		{ DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN,               DXGI_FORMAT_UNKNOWN,           DXGI_FORMAT_UNKNOWN              }, // PTC12A
@@ -431,6 +435,7 @@ namespace bgfx { namespace d3d11
 
 	static const GUID WKPDID_D3DDebugObjectName     = { 0x429b8c22, 0x9188, 0x4b0c, { 0x87, 0x42, 0xac, 0xb0, 0xbf, 0x85, 0xc2, 0x00 } };
 	static const GUID IID_ID3D11Texture2D           = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } };
+	static const GUID IID_ID3D11Resource            = { 0xdc8e63f3, 0xd12b, 0x4952, { 0xb4, 0x7b, 0x5e, 0x45, 0x02, 0x6a, 0x86, 0x2d } };
 	static const GUID IID_ID3D11Device1             = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } };
 	static const GUID IID_ID3D11Device2             = { 0x9d06dffa, 0xd1e5, 0x4d07, { 0x83, 0xa8, 0x1b, 0xb1, 0x23, 0xf2, 0xf8, 0x41 } };
 	static const GUID IID_ID3D11Device3             = { 0xa05c8c37, 0xd2c6, 0x4732, { 0xb3, 0xa0, 0x9c, 0xe0, 0xb0, 0xdc, 0x9a, 0xe6 } };
@@ -1260,6 +1265,7 @@ namespace bgfx { namespace d3d11
 					| ((m_featureLevel >= D3D_FEATURE_LEVEL_11_0)
 						? BGFX_CAPS_PRIMITIVE_ID
 						: 0)
+					| BGFX_CAPS_TEXTURE_EXTERNAL
 					);
 
 				m_timerQuerySupport   = m_featureLevel >= D3D_FEATURE_LEVEL_10_0;
@@ -1380,9 +1386,10 @@ namespace bgfx { namespace d3d11
 
 				for (uint32_t ii = 0; ii < TextureFormat::Count; ++ii)
 				{
-					uint16_t support = BGFX_CAPS_FORMAT_TEXTURE_NONE;
+					uint32_t support = BGFX_CAPS_FORMAT_TEXTURE_NONE;
 
-					const DXGI_FORMAT fmt = bimg::isDepth(bimg::TextureFormat::Enum(ii) )
+					const bool isDepthFormat = bimg::isDepth(bimg::TextureFormat::Enum(ii));
+					const DXGI_FORMAT fmt = isDepthFormat
 						? s_textureFormat[ii].m_fmtDsv
 						: s_textureFormat[ii].m_fmt
 						;
@@ -1464,6 +1471,13 @@ namespace bgfx { namespace d3d11
 										? BGFX_CAPS_FORMAT_TEXTURE_MIP_AUTOGEN
 										: BGFX_CAPS_FORMAT_TEXTURE_NONE
 										;
+
+								support |= 0 != (data.OutFormatSupport & (0
+										| D3D11_FORMAT_SUPPORT_DISPLAY
+										) )
+										? BGFX_CAPS_FORMAT_TEXTURE_BACKBUFFER
+										: BGFX_CAPS_FORMAT_TEXTURE_NONE
+										;
 							}
 							else
 							{
@@ -1474,6 +1488,30 @@ namespace bgfx { namespace d3d11
 									);
 							}
 
+							if (isDepthFormat)
+							{
+								const DXGI_FORMAT fmtDepthSampling = s_textureFormat[ii].m_fmtSrv;
+								if (DXGI_FORMAT_UNKNOWN != fmtDepthSampling)
+								{
+									D3D11_FEATURE_DATA_FORMAT_SUPPORT dataSampling;
+									dataSampling.InFormat = fmtDepthSampling;
+									hr = m_device->CheckFeatureSupport(D3D11_FEATURE_FORMAT_SUPPORT, &dataSampling, sizeof(dataSampling));
+									if (SUCCEEDED(hr))
+									{
+										support |= 0 != (dataSampling.OutFormatSupport & (0
+											| D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD
+											))
+											? BGFX_CAPS_FORMAT_TEXTURE_MSAA
+											: BGFX_CAPS_FORMAT_TEXTURE_NONE
+											;
+									}
+									else
+									{
+										BX_TRACE("CheckFeatureSupport depth srv failed with %x for format %s.", hr, getName(TextureFormat::Enum(ii)));
+									}
+								}
+							}
+
 							if (0 != (support & BGFX_CAPS_FORMAT_TEXTURE_IMAGE_READ) )
 							{
 								D3D11_FEATURE_DATA_FORMAT_SUPPORT2 data2;
@@ -1552,6 +1590,13 @@ namespace bgfx { namespace d3d11
 										? BGFX_CAPS_FORMAT_TEXTURE_CUBE_SRGB
 										: BGFX_CAPS_FORMAT_TEXTURE_NONE
 										;
+
+								support |= 0 != (data.OutFormatSupport & (0
+										| D3D11_FORMAT_SUPPORT_DISPLAY
+										) )
+										? BGFX_CAPS_FORMAT_TEXTURE_BACKBUFFER
+										: BGFX_CAPS_FORMAT_TEXTURE_NONE
+										;
 							}
 							else
 							{
@@ -1846,13 +1891,9 @@ namespace bgfx { namespace d3d11
 			m_program[_handle.idx].destroy();
 		}
 
-		void* createTexture(TextureHandle _handle, const Memory* _mem, uint64_t _flags, uint8_t _skip) override
-		{
-			return m_textures[_handle.idx].create(_mem, _flags, _skip);
-		}
-
-		void updateTextureBegin(TextureHandle /*_handle*/, uint8_t /*_side*/, uint8_t /*_mip*/) override
+		void* createTexture(TextureHandle _handle, const Memory* _mem, uint64_t _flags, uint8_t _skip, uint64_t _external) override
 		{
+			return m_textures[_handle.idx].create(_mem, _flags, _skip, _external);
 		}
 
 		void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) override
@@ -1860,10 +1901,6 @@ namespace bgfx { namespace d3d11
 			m_textures[_handle.idx].update(_side, _mip, _rect, _z, _depth, _pitch, _mem);
 		}
 
-		void updateTextureEnd() override
-		{
-		}
-
 		void readTexture(TextureHandle _handle, void* _data, uint8_t _mip) override
 		{
 			const TextureD3D11& texture = m_textures[_handle.idx];
@@ -1908,7 +1945,7 @@ namespace bgfx { namespace d3d11
 			bx::write(&writer, tc, bx::ErrorAssert{});
 
 			texture.destroy();
-			texture.create(mem, texture.m_flags, 0);
+			texture.create(mem, texture.m_flags, 0, 0);
 
 			release(mem);
 		}
@@ -2015,6 +2052,29 @@ namespace bgfx { namespace d3d11
 			D3D11_TEXTURE2D_DESC backBufferDesc;
 			backBuffer->GetDesc(&backBufferDesc);
 
+			TextureFormat::Enum colorFormat = TextureFormat::Enum::Count;
+			for (int i = 0; i < TextureFormat::Enum::Count; i++)
+			{
+				if (s_textureFormat[i].m_fmt == backBufferDesc.Format)
+				{
+					colorFormat = TextureFormat::Enum(i);
+					break;
+				}
+
+				if (s_textureFormat[i].m_fmtSrgb == backBufferDesc.Format)
+				{
+					colorFormat = TextureFormat::Enum(i);
+					break;
+				}
+			}
+
+			if (colorFormat == TextureFormat::Enum::Count)
+			{
+				BX_TRACE("Unable to capture screenshot %s.", _filePath);
+				DX_RELEASE(backBuffer, 0);
+				return;
+			}
+
 			D3D11_TEXTURE2D_DESC desc;
 			bx::memCopy(&desc, &backBufferDesc, sizeof(desc) );
 			desc.SampleDesc.Count = 1;
@@ -2047,22 +2107,18 @@ namespace bgfx { namespace d3d11
 
 				D3D11_MAPPED_SUBRESOURCE mapped;
 				DX_CHECK(m_deviceCtx->Map(texture, 0, D3D11_MAP_READ, 0, &mapped) );
-				bimg::imageSwizzleBgra8(
-					  mapped.pData
-					, mapped.RowPitch
-					, backBufferDesc.Width
-					, backBufferDesc.Height
-					, mapped.pData
-					, mapped.RowPitch
-					);
-				g_callback->screenShot(_filePath
+
+				g_callback->screenShot(
+					  _filePath
 					, backBufferDesc.Width
 					, backBufferDesc.Height
 					, mapped.RowPitch
+					, colorFormat
 					, mapped.pData
 					, backBufferDesc.Height*mapped.RowPitch
 					, false
 					);
+
 				m_deviceCtx->Unmap(texture, 0);
 
 				DX_RELEASE(texture, 0);
@@ -2137,9 +2193,11 @@ namespace bgfx { namespace d3d11
 
 		void submitBlit(BlitState& _bs, uint16_t _view);
 
+		void submitUniformCache(UniformCacheState& _ucs, uint16_t _view);
+
 		void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) override;
 
-		void blitSetup(TextVideoMemBlitter& _blitter) override
+		void dbgTextRenderBegin(TextVideoMemBlitter& _blitter) override
 		{
 			ID3D11DeviceContext* deviceCtx = m_deviceCtx;
 
@@ -2195,7 +2253,7 @@ namespace bgfx { namespace d3d11
 			commitTextureStage();
 		}
 
-		void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override
+		void dbgTextRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override
 		{
 			const uint32_t numVertices = _numIndices*4/6;
 			if (0 < numVertices)
@@ -2210,6 +2268,10 @@ namespace bgfx { namespace d3d11
 			}
 		}
 
+		void dbgTextRenderEnd(TextVideoMemBlitter& /*_blitter*/) override
+		{
+		}
+
 		void preReset()
 		{
 			m_needPresent = false;
@@ -2906,7 +2968,7 @@ namespace bgfx { namespace d3d11
 
 			uint32_t fstencil = unpackStencil(0, _stencil);
 			uint32_t ref = (fstencil&BGFX_STENCIL_FUNC_REF_MASK)>>BGFX_STENCIL_FUNC_REF_SHIFT;
-			_stencil &= packStencil(~BGFX_STENCIL_FUNC_REF_MASK, ~BGFX_STENCIL_FUNC_REF_MASK);
+			_stencil &= kStencilNoRefMask;
 
 			bx::HashMurmur2A murmur;
 			murmur.begin();
@@ -3198,8 +3260,18 @@ namespace bgfx { namespace d3d11
 				switch (texture.m_type)
 				{
 				case TextureD3D11::Texture2D:
-					desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D;
-					desc.Texture2D.MipSlice = _mip;
+					if (1 < texture.m_numLayers)
+					{
+						desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2DARRAY;
+						desc.Texture2DArray.MipSlice = _mip;
+						desc.Texture2DArray.FirstArraySlice = 0;
+						desc.Texture2DArray.ArraySize = texture.m_numLayers;
+					}
+					else
+					{
+						desc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D;
+						desc.Texture2D.MipSlice = _mip;
+					}
 					break;
 
 				case TextureD3D11::TextureCube:
@@ -3461,7 +3533,7 @@ namespace bgfx { namespace d3d11
 			}
 		}
 
-		void clearQuad(ClearQuad& _clearQuad, const Rect& _rect, const Clear& _clear, const float _palette[][4])
+		void clearQuad(const ClearQuad& _clearQuad, const Rect& _rect, const Clear& _clear, const float _palette[][4])
 		{
 			uint32_t width;
 			uint32_t height;
@@ -3478,10 +3550,9 @@ namespace bgfx { namespace d3d11
 				height = m_scd.height;
 			}
 
-			if (0      == _rect.m_x
-			&&  0      == _rect.m_y
-			&&  width  == _rect.m_width
-			&&  height == _rect.m_height)
+			const Rect fbRect(0, 0, bx::narrowCast<uint16_t>(width), bx::narrowCast<uint16_t>(height) );
+
+			if (_rect.isEqual(fbRect) )
 			{
 				clear(_clear, _palette);
 			}
@@ -3522,7 +3593,7 @@ namespace bgfx { namespace d3d11
 				const ShaderD3D11* vsh = program.m_vsh;
 				deviceCtx->VSSetShader(vsh->m_vertexShader, NULL, 0);
 				deviceCtx->VSSetConstantBuffers(0, 1, &vsh->m_buffer);
-				float mrtClearDepth[4] = { _clear.m_depth };
+				const float mrtClearDepth[4] = { _clear.m_depth };
 				deviceCtx->UpdateSubresource(vsh->m_buffer, 0, 0, mrtClearDepth, 0, 0);
 
 				if (NULL != m_currentColor)
@@ -3563,8 +3634,8 @@ namespace bgfx { namespace d3d11
 					deviceCtx->PSSetShader(NULL, NULL, 0);
 				}
 
-				VertexBufferD3D11& vb = m_vertexBuffers[_clearQuad.m_vb.idx];
-				const VertexLayout& layout = _clearQuad.m_layout;
+				const VertexBufferD3D11& vb = m_vertexBuffers[_clearQuad.m_vb.idx];
+				const VertexLayout&  layout = m_vertexLayouts[_clearQuad.m_layout.idx];
 
 				const uint32_t stride = layout.m_stride;
 				const uint32_t offset = 0;
@@ -4387,7 +4458,7 @@ namespace bgfx { namespace d3d11
 		}
 	}
 
-	void* TextureD3D11::create(const Memory* _mem, uint64_t _flags, uint8_t _skip)
+	void* TextureD3D11::create(const Memory* _mem, uint64_t _flags, uint8_t _skip, uint64_t _external)
 	{
 		void* directAccessPtr = NULL;
 
@@ -4512,12 +4583,14 @@ namespace bgfx { namespace d3d11
 				}
 			}
 
-			const bool writeOnly    = 0 != (m_flags&(BGFX_TEXTURE_RT_WRITE_ONLY|BGFX_TEXTURE_READ_BACK) );
-			const bool computeWrite = 0 != (m_flags&BGFX_TEXTURE_COMPUTE_WRITE);
-			const bool renderTarget = 0 != (m_flags&BGFX_TEXTURE_RT_MASK);
-			const bool srgb         = 0 != (m_flags&BGFX_TEXTURE_SRGB);
-			const bool blit         = 0 != (m_flags&BGFX_TEXTURE_BLIT_DST);
-			const bool readBack     = 0 != (m_flags&BGFX_TEXTURE_READ_BACK);
+			const bool writeOnly      = 0 != (m_flags & (BGFX_TEXTURE_RT_WRITE_ONLY|BGFX_TEXTURE_READ_BACK) );
+			const bool computeWrite   = 0 != (m_flags & BGFX_TEXTURE_COMPUTE_WRITE);
+			const bool renderTarget   = 0 != (m_flags & BGFX_TEXTURE_RT_MASK);
+			const bool srgb           = 0 != (m_flags & BGFX_TEXTURE_SRGB);
+			const bool blit           = 0 != (m_flags & BGFX_TEXTURE_BLIT_DST);
+			const bool readBack       = 0 != (m_flags & BGFX_TEXTURE_READ_BACK);
+			const bool externalShared = 0 != (m_flags & BGFX_TEXTURE_EXTERNAL_SHARED);
+
 			const uint32_t msaaQuality = bx::uint32_satsub( (m_flags&BGFX_TEXTURE_RT_MSAA_MASK)>>BGFX_TEXTURE_RT_MSAA_SHIFT, 1);
 			const DXGI_SAMPLE_DESC& msaa = s_msaa[msaaQuality];
 			const bool msaaSample  = true
@@ -4561,161 +4634,185 @@ namespace bgfx { namespace d3d11
 				&& !writeOnly
 				;
 
-			switch (m_type)
+			if (0 != _external)
 			{
-			case Texture2D:
-			case TextureCube:
+				if (externalShared)
 				{
-					D3D11_TEXTURE2D_DESC desc = {};
-					desc.Width      = ti.width;
-					desc.Height     = ti.height;
-					desc.MipLevels  = ti.numMips;
-					desc.ArraySize  = numSides;
-					desc.Format     = format;
-					desc.SampleDesc = msaa;
-					desc.Usage      = kk == 0 || blit ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE;
-					desc.BindFlags  = writeOnly ? 0 : D3D11_BIND_SHADER_RESOURCE;
-					desc.CPUAccessFlags = 0;
-					desc.MiscFlags      = 0;
-
-					if (bimg::isDepth(bimg::TextureFormat::Enum(m_textureFormat) ) )
-					{
-						desc.BindFlags |= D3D11_BIND_DEPTH_STENCIL;
-						desc.Usage = D3D11_USAGE_DEFAULT;
-					}
-					else if (renderTarget)
-					{
-						desc.BindFlags |= D3D11_BIND_RENDER_TARGET;
-						desc.Usage = D3D11_USAGE_DEFAULT;
-						desc.MiscFlags |= 0
-							| (1 < ti.numMips ? D3D11_RESOURCE_MISC_GENERATE_MIPS : 0)
-							;
-					}
+					DX_CHECK(s_renderD3D11->m_device->OpenSharedResource(HANDLE(_external), IID_ID3D11Resource, (void**)&m_ptr) );
+				}
+				else
+				{
+					m_ptr = (ID3D11Resource*)(_external);
+				}
 
-					if (computeWrite)
+				m_flags |= BGFX_SAMPLER_INTERNAL_SHARED;
+			}
+			else
+			{
+				switch (m_type)
+				{
+				case Texture2D:
+				case TextureCube:
 					{
-						desc.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-						desc.Usage = D3D11_USAGE_DEFAULT;
-					}
+						D3D11_TEXTURE2D_DESC desc = {};
+						desc.Width      = ti.width;
+						desc.Height     = ti.height;
+						desc.MipLevels  = ti.numMips;
+						desc.ArraySize  = numSides;
+						desc.Format     = format;
+						desc.SampleDesc = msaa;
+						desc.Usage      = kk == 0 || blit ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE;
+						desc.BindFlags  = writeOnly ? 0 : D3D11_BIND_SHADER_RESOURCE;
+						desc.CPUAccessFlags = 0;
+						desc.MiscFlags      = 0;
 
-					if (readBack)
-					{
-						desc.BindFlags      = 0;
-						desc.Usage          = D3D11_USAGE_STAGING;
-						desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-					}
+						if (bimg::isDepth(bimg::TextureFormat::Enum(m_textureFormat) ) )
+						{
+							desc.BindFlags |= D3D11_BIND_DEPTH_STENCIL;
+							desc.Usage = D3D11_USAGE_DEFAULT;
+						}
+						else if (renderTarget)
+						{
+							desc.BindFlags |= D3D11_BIND_RENDER_TARGET;
+							desc.Usage = D3D11_USAGE_DEFAULT;
+							desc.MiscFlags |= 0
+								| (1 < ti.numMips ? D3D11_RESOURCE_MISC_GENERATE_MIPS : 0)
+								;
+						}
 
-					if (imageContainer.m_cubeMap)
-					{
-						desc.MiscFlags |= D3D11_RESOURCE_MISC_TEXTURECUBE;
-						if (1 < ti.numLayers)
+						if (computeWrite)
 						{
-							srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY;
-							srvd.TextureCubeArray.MipLevels = ti.numMips;
-							srvd.TextureCubeArray.NumCubes  = ti.numLayers;
+							desc.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
+							desc.Usage = D3D11_USAGE_DEFAULT;
 						}
-						else
+
+						if (readBack)
 						{
-							srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
-							srvd.TextureCube.MipLevels = ti.numMips;
+							desc.BindFlags      = 0;
+							desc.Usage          = D3D11_USAGE_STAGING;
+							desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
 						}
-					}
-					else
-					{
-						if (msaaSample)
+
+						if (imageContainer.m_cubeMap)
 						{
+							desc.MiscFlags |= D3D11_RESOURCE_MISC_TEXTURECUBE;
 							if (1 < ti.numLayers)
 							{
-								srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY;
-								srvd.Texture2DMSArray.ArraySize = ti.numLayers;
+								srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY;
+								srvd.TextureCubeArray.MipLevels = ti.numMips;
+								srvd.TextureCubeArray.NumCubes  = ti.numLayers;
 							}
 							else
 							{
-								srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS;
+								srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE;
+								srvd.TextureCube.MipLevels = ti.numMips;
 							}
 						}
 						else
 						{
-							if (1 < ti.numLayers)
+							if (msaaSample)
 							{
-								srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
-								srvd.Texture2DArray.MipLevels = ti.numMips;
-								srvd.Texture2DArray.ArraySize = ti.numLayers;
+								if (1 < ti.numLayers)
+								{
+									srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY;
+									srvd.Texture2DMSArray.ArraySize = ti.numLayers;
+								}
+								else
+								{
+									srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS;
+								}
 							}
 							else
 							{
-								srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
-								srvd.Texture2D.MipLevels = ti.numMips;
+								if (1 < ti.numLayers)
+								{
+									srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY;
+									srvd.Texture2DArray.MipLevels = ti.numMips;
+									srvd.Texture2DArray.ArraySize = ti.numLayers;
+								}
+								else
+								{
+									srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+									srvd.Texture2D.MipLevels = ti.numMips;
+								}
 							}
 						}
-					}
 
-					if (needResolve)
-					{
-						DX_CHECK(s_renderD3D11->m_device->CreateTexture2D(&desc, NULL, &m_rt2d) );
-						desc.BindFlags &= ~(D3D11_BIND_RENDER_TARGET|D3D11_BIND_DEPTH_STENCIL);
-						desc.SampleDesc = s_msaa[0];
-					}
+						desc.MiscFlags |= externalShared ? D3D11_RESOURCE_MISC_SHARED : 0;
 
-					if (directAccess)
-					{
-						directAccessPtr = m_dar.createTexture2D(&desc, kk == 0 ? NULL : srd, &m_texture2d);
+						if (needResolve)
+						{
+							DX_CHECK(s_renderD3D11->m_device->CreateTexture2D(&desc, NULL, &m_rt2d) );
+							desc.BindFlags &= ~(D3D11_BIND_RENDER_TARGET|D3D11_BIND_DEPTH_STENCIL);
+							desc.SampleDesc = s_msaa[0];
+						}
+
+						if (directAccess)
+						{
+							directAccessPtr = m_dar.createTexture2D(&desc, kk == 0 ? NULL : srd, &m_texture2d);
+						}
+						else
+						{
+							DX_CHECK(s_renderD3D11->m_device->CreateTexture2D(&desc, kk == 0 ? NULL : srd, &m_texture2d) );
+						}
 					}
-					else
+					break;
+
+				case Texture3D:
 					{
-						DX_CHECK(s_renderD3D11->m_device->CreateTexture2D(&desc, kk == 0 ? NULL : srd, &m_texture2d) );
-					}
-				}
-				break;
+						D3D11_TEXTURE3D_DESC desc = {};
+						desc.Width     = ti.width;
+						desc.Height    = ti.height;
+						desc.Depth     = ti.depth;
+						desc.MipLevels = ti.numMips;
+						desc.Format    = format;
+						desc.Usage     = kk == 0 || blit ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE;
+						desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+						desc.CPUAccessFlags = 0;
+						desc.MiscFlags      = 0;
 
-			case Texture3D:
-				{
-					D3D11_TEXTURE3D_DESC desc = {};
-					desc.Width     = ti.width;
-					desc.Height    = ti.height;
-					desc.Depth     = ti.depth;
-					desc.MipLevels = ti.numMips;
-					desc.Format    = format;
-					desc.Usage     = kk == 0 || blit ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE;
-					desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
-					desc.CPUAccessFlags = 0;
-					desc.MiscFlags      = 0;
+						if (renderTarget)
+						{
+							desc.BindFlags |= D3D11_BIND_RENDER_TARGET;
+							desc.Usage = D3D11_USAGE_DEFAULT;
+							desc.MiscFlags |= 0
+								| (1 < ti.numMips ? D3D11_RESOURCE_MISC_GENERATE_MIPS : 0)
+								;
+						}
 
-					if (renderTarget)
-					{
-						desc.BindFlags |= D3D11_BIND_RENDER_TARGET;
-						desc.Usage = D3D11_USAGE_DEFAULT;
-						desc.MiscFlags |= 0
-							| (1 < ti.numMips ? D3D11_RESOURCE_MISC_GENERATE_MIPS : 0)
-							;
-					}
+						if (computeWrite)
+						{
+							desc.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
+							desc.Usage = D3D11_USAGE_DEFAULT;
+						}
 
-					if (computeWrite)
-					{
-						desc.BindFlags |= D3D11_BIND_UNORDERED_ACCESS;
-						desc.Usage = D3D11_USAGE_DEFAULT;
-					}
+						if (readBack)
+						{
+							desc.BindFlags = 0;
+							desc.Usage = D3D11_USAGE_STAGING;
+							desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+						}
 
-					if (readBack)
-					{
-						desc.BindFlags = 0;
-						desc.Usage = D3D11_USAGE_STAGING;
-						desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
-					}
+						srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
+						srvd.Texture3D.MipLevels = ti.numMips;
 
-					srvd.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
-					srvd.Texture3D.MipLevels = ti.numMips;
+						desc.MiscFlags |= externalShared ? D3D11_RESOURCE_MISC_SHARED : 0;
 
-					if (directAccess)
-					{
-						directAccessPtr = m_dar.createTexture3D(&desc, kk == 0 ? NULL : srd, &m_texture3d);
-					}
-					else
-					{
-						DX_CHECK(s_renderD3D11->m_device->CreateTexture3D(&desc, kk == 0 ? NULL : srd, &m_texture3d) );
+						if (directAccess)
+						{
+							directAccessPtr = m_dar.createTexture3D(&desc, kk == 0 ? NULL : srd, &m_texture3d);
+						}
+						else
+						{
+							DX_CHECK(s_renderD3D11->m_device->CreateTexture3D(&desc, kk == 0 ? NULL : srd, &m_texture3d) );
+						}
 					}
+					break;
+				}
+
+				if (externalShared)
+				{
 				}
-				break;
 			}
 
 			if (!writeOnly)
@@ -4753,6 +4850,7 @@ namespace bgfx { namespace d3d11
 		DX_RELEASE(m_rt, 0);
 		DX_RELEASE(m_srv, 0);
 		DX_RELEASE(m_uav, 0);
+
 		if (0 == (m_flags & BGFX_SAMPLER_INTERNAL_SHARED) )
 		{
 			DX_RELEASE(m_ptr, 0);
@@ -5009,7 +5107,6 @@ namespace bgfx { namespace d3d11
 		DX_CHECK(device->CreateDepthStencilView(depthStencil, NULL, &m_dsv) );
 		DX_RELEASE(depthStencil, 0);
 
-		m_srv[0]   = NULL;
 		m_nwh      = _nwh;
 		m_denseIdx = _denseIdx;
 		m_num      = 1;
@@ -5234,9 +5331,13 @@ namespace bgfx { namespace d3d11
 							break;
 						}
 
-						D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc{};
-						texture.m_srv->GetDesc(&srvDesc);
-						DX_CHECK(s_renderD3D11->m_device->CreateShaderResourceView(texture.m_ptr, &srvDesc, &m_srv[m_num]));
+						if (NULL != texture.m_srv)
+						{
+							D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc{};
+							texture.m_srv->GetDesc(&srvDesc);
+							DX_CHECK(s_renderD3D11->m_device->CreateShaderResourceView(texture.m_ptr, &srvDesc, &m_srv[m_num]));
+						}
+
 						m_num++;
 					}
 					else
@@ -5414,7 +5515,7 @@ namespace bgfx { namespace d3d11
 
 	bool TimerQueryD3D11::update()
 	{
-		if (0 != m_control.available() )
+		if (0 != m_control.getNumUsed() )
 		{
 			Query& query = m_query[m_control.m_read];
 
@@ -5506,7 +5607,7 @@ namespace bgfx { namespace d3d11
 	{
 		ID3D11DeviceContext* deviceCtx = s_renderD3D11->m_deviceCtx;
 
-		while (0 != m_control.available() )
+		while (0 != m_control.getNumUsed() )
 		{
 			Query& query = m_query[m_control.m_read];
 
@@ -5530,7 +5631,7 @@ namespace bgfx { namespace d3d11
 	{
 		const uint32_t size = m_control.m_size;
 
-		for (uint32_t ii = 0, num = m_control.available(); ii < num; ++ii)
+		for (uint32_t ii = 0, num = m_control.getNumUsed(); ii < num; ++ii)
 		{
 			Query& query = m_query[(m_control.m_read + ii) % size];
 			if (query.m_handle.idx == _handle.idx)
@@ -5603,6 +5704,16 @@ namespace bgfx { namespace d3d11
 		}
 	}
 
+	void RendererContextD3D11::submitUniformCache(UniformCacheState& _ucs, uint16_t _view)
+	{
+		while (_ucs.hasItem(_view) )
+		{
+			const UniformCacheItem& uci = _ucs.advance();
+
+			bx::memCopy(m_uniforms[uci.m_handle], &_ucs.m_frame->m_uniformCacheFrame.m_data[uci.m_offset], uci.m_size);
+		}
+	}
+
 	void RendererContextD3D11::submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter)
 	{
 		if (m_lost)
@@ -5673,6 +5784,7 @@ namespace bgfx { namespace d3d11
 		uint16_t view = UINT16_MAX;
 		FrameBufferHandle fbh = { BGFX_CONFIG_MAX_FRAME_BUFFERS };
 
+		UniformCacheState ucs(_render);
 		BlitState bs(_render);
 
 		const uint64_t primType = _render->m_debug&BGFX_DEBUG_WIREFRAME ? BGFX_STATE_PT_LINES : 0;
@@ -5773,6 +5885,7 @@ namespace bgfx { namespace d3d11
 						prim = s_primInfo[Topology::Count]; // Force primitive type update after clear quad.
 					}
 
+					submitUniformCache(ucs, view);
 					submitBlit(bs, view);
 				}
 
@@ -6256,14 +6369,12 @@ namespace bgfx { namespace d3d11
 
 					if (UINT32_MAX != draw.m_streamMask)
 					{
-						for (uint32_t idx = 0, streamMask = draw.m_streamMask
-							; 0 != streamMask
-							; streamMask >>= 1, idx += 1, ++numStreams
+						for (BitMaskToIndexIteratorT it(draw.m_streamMask)
+							; !it.isDone()
+							; it.next(), numStreams++
 							)
 						{
-							const uint32_t ntz = bx::uint32_cnttz(streamMask);
-							streamMask >>= ntz;
-							idx         += ntz;
+							const uint8_t idx = it.idx;
 
 							currentState.m_stream[idx].m_layoutHandle = draw.m_stream[idx].m_layoutHandle;
 							currentState.m_stream[idx].m_handle       = draw.m_stream[idx].m_handle;
@@ -6472,11 +6583,11 @@ namespace bgfx { namespace d3d11
 									);
 							}
 						}
+					}
 
-						if (hasOcclusionQuery)
-						{
-							m_occlusionQuery.end();
-						}
+					if (hasOcclusionQuery)
+					{
+						m_occlusionQuery.end();
 					}
 
 					statsNumPrimsSubmitted[primIndex] += numPrimsSubmitted;
@@ -6663,7 +6774,7 @@ namespace bgfx { namespace d3d11
 				tvm.printf(10, pos++, 0x8b, "     DIB size: %7d ", _render->m_iboffset);
 
 				pos++;
-				tvm.printf(10, pos++, 0x8b, " Occlusion queries: %3d ", m_occlusionQuery.m_control.available() );
+				tvm.printf(10, pos++, 0x8b, " Occlusion queries: %3d ", m_occlusionQuery.m_control.getNumUsed() );
 
 				pos++;
 				tvm.printf(10, pos++, 0x8b, " State cache:                                ");
@@ -6690,7 +6801,7 @@ namespace bgfx { namespace d3d11
 				max = frameTime;
 			}
 
-			blit(this, _textVideoMemBlitter, tvm);
+			dbgTextSubmit(this, _textVideoMemBlitter, tvm);
 
 			BGFX_D3D11_PROFILER_END();
 		}
@@ -6698,7 +6809,7 @@ namespace bgfx { namespace d3d11
 		{
 			BGFX_D3D11_PROFILER_BEGIN_LITERAL("debugtext", kColorFrame);
 
-			blit(this, _textVideoMemBlitter, _render->m_textVideoMem);
+			dbgTextSubmit(this, _textVideoMemBlitter, _render->m_textVideoMem);
 
 			BGFX_D3D11_PROFILER_END();
 		}