Cleanup.

scripts/bgfx.natvis

@@ -54,7 +54,7 @@
         </Expand>
     </Type>
 
-    <Type Name="bgfx::Context::ShaderRef">
+    <Type Name="bgfx::ShaderRef">
         <Expand>
             <Item Name="m_uniforms">m_uniforms,[m_num]</Item>
             <Item Name="m_name">m_name</Item>
@@ -82,7 +82,7 @@
         </Expand>
     </Type>
 
-    <Type Name="bgfx::Context::TextureRef">
+    <Type Name="bgfx::TextureRef">
         <Expand>
             <Item Name="m_name">m_name</Item>
             <Item Name="m_ptr">m_ptr</Item>

src/bgfx.cpp

@@ -3430,7 +3430,7 @@ namespace bgfx
 	void Encoder::setUniform(UniformHandle _handle, const void* _value, uint16_t _num)
 	{
 		BGFX_CHECK_HANDLE("setUniform", s_ctx->m_uniformHandle, _handle);
-		const Context::UniformRef& uniform = s_ctx->m_uniformRef[_handle.idx];
+		const UniformRef& uniform = s_ctx->m_uniformRef[_handle.idx];
 		BX_CHECK(isValid(_handle) && 0 < uniform.m_refCount, "Setting invalid uniform (handle %3d)!", _handle.idx);
 		BX_CHECK(_num == UINT16_MAX || uniform.m_num >= _num, "Truncated uniform update. %d (max: %d)", _num, uniform.m_num);
 		BGFX_ENCODER(setUniform(uniform.m_type, _handle, _value, UINT16_MAX != _num ? _num : uniform.m_num) );
@@ -3670,8 +3670,8 @@ namespace bgfx
 		BGFX_CHECK_CAPS(BGFX_CAPS_TEXTURE_BLIT, "Texture blit is not supported!");
 		BGFX_CHECK_HANDLE("blit/src TextureHandle", s_ctx->m_textureHandle, _src);
 		BGFX_CHECK_HANDLE("blit/dst TextureHandle", s_ctx->m_textureHandle, _dst);
-		const Context::TextureRef& src = s_ctx->m_textureRef[_src.idx];
-		const Context::TextureRef& dst = s_ctx->m_textureRef[_dst.idx];
+		const TextureRef& src = s_ctx->m_textureRef[_src.idx];
+		const TextureRef& dst = s_ctx->m_textureRef[_dst.idx];
 		BX_CHECK(src.m_format == dst.m_format
 			, "Texture format must match (src %s, dst %s)."
 			, bimg::getName(bimg::TextureFormat::Enum(src.m_format) )

src/bgfx_p.h

@@ -1692,6 +1692,82 @@ namespace bgfx
 		uint16_t m_flags;
 	};
 
+	struct ShaderRef
+	{
+		UniformHandle* m_uniforms;
+		String   m_name;
+		uint32_t m_hashIn;
+		uint32_t m_hashOut;
+		uint16_t m_num;
+		int16_t  m_refCount;
+	};
+
+	struct ProgramRef
+	{
+		ShaderHandle m_vsh;
+		ShaderHandle m_fsh;
+		int16_t      m_refCount;
+	};
+
+	struct UniformRef
+	{
+		String            m_name;
+		UniformType::Enum m_type;
+		uint16_t          m_num;
+		int16_t           m_refCount;
+	};
+
+	struct TextureRef
+	{
+		void init(
+			  BackbufferRatio::Enum _ratio
+			, TextureFormat::Enum _format
+			, uint32_t _storageSize
+			, uint8_t _numMips
+			, uint16_t _numLayers
+			, bool _ptrPending
+			, bool _immutable
+			, bool _rt
+			)
+		{
+			m_ptr         = _ptrPending ? (void*)UINTPTR_MAX : NULL;
+			m_storageSize = _storageSize;
+			m_refCount    = 1;
+			m_bbRatio     = uint8_t(_ratio);
+			m_format      = uint8_t(_format);
+			m_numMips     = _numMips;
+			m_numLayers   = _numLayers;
+			m_owned       = false;
+			m_immutable   = _immutable;
+			m_rt          = _rt;
+		}
+
+		String   m_name;
+		void*    m_ptr;
+		uint32_t m_storageSize;
+		int16_t  m_refCount;
+		uint8_t  m_bbRatio;
+		uint8_t  m_format;
+		uint8_t  m_numMips;
+		uint16_t m_numLayers;
+		bool     m_owned;
+		bool     m_immutable;
+		bool     m_rt;
+	};
+
+	struct FrameBufferRef
+	{
+		String m_name;
+
+		union un
+		{
+			TextureHandle m_th[BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS];
+			void* m_nwh;
+		} un;
+
+		bool m_window;
+	};
+
 	BX_ALIGN_DECL_CACHE_LINE(struct) View
 	{
 		void reset()
@@ -4770,81 +4846,6 @@ namespace bgfx
 		bx::HandleAllocT<BGFX_CONFIG_MAX_UNIFORMS> m_uniformHandle;
 		bx::HandleAllocT<BGFX_CONFIG_MAX_OCCLUSION_QUERIES> m_occlusionQueryHandle;
 
-		struct ShaderRef
-		{
-			UniformHandle* m_uniforms;
-			String   m_name;
-			uint32_t m_hashIn;
-			uint32_t m_hashOut;
-			int16_t  m_refCount;
-			uint16_t m_num;
-		};
-
-		struct ProgramRef
-		{
-			ShaderHandle m_vsh;
-			ShaderHandle m_fsh;
-			int16_t      m_refCount;
-		};
-
-		struct UniformRef
-		{
-			String            m_name;
-			UniformType::Enum m_type;
-			uint16_t          m_num;
-			int16_t           m_refCount;
-		};
-
-		struct TextureRef
-		{
-			void init(
-				  BackbufferRatio::Enum _ratio
-				, TextureFormat::Enum _format
-				, uint32_t _storageSize
-				, uint8_t _numMips
-				, uint16_t _numLayers
-				, bool _ptrPending
-				, bool _immutable
-				, bool _rt
-				)
-			{
-				m_ptr         = _ptrPending ? (void*)UINTPTR_MAX : NULL;
-				m_storageSize = _storageSize;
-				m_refCount    = 1;
-				m_bbRatio     = uint8_t(_ratio);
-				m_format      = uint8_t(_format);
-				m_numMips     = _numMips;
-				m_numLayers   = _numLayers;
-				m_owned       = false;
-				m_immutable   = _immutable;
-				m_rt          = _rt;
-			}
-
-			String   m_name;
-			void*    m_ptr;
-			uint32_t m_storageSize;
-			int16_t  m_refCount;
-			uint8_t  m_bbRatio;
-			uint8_t  m_format;
-			uint8_t  m_numMips;
-			uint16_t m_numLayers;
-			bool     m_owned;
-			bool     m_immutable;
-			bool     m_rt;
-		};
-
-		struct FrameBufferRef
-		{
-			String m_name;
-
-			union un
-			{
-				TextureHandle m_th[BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS];
-				void* m_nwh;
-			} un;
-			bool m_window;
-		};
-
 		typedef bx::HandleHashMapT<BGFX_CONFIG_MAX_UNIFORMS*2> UniformHashMap;
 		UniformHashMap m_uniformHashMap;
 		UniformRef     m_uniformRef[BGFX_CONFIG_MAX_UNIFORMS];