Просмотр исходного кода

Added version info to debug stats.

Бранимир Караџић 5 лет назад
Родитель
Сommit
e878147cf9
9 измененных файлов с 53 добавлено и 10 удалено
  1. 0 1
      src/bgfx.cpp
  2. 1 0
      src/bgfx_p.h
  3. 8 2
      src/renderer_d3d11.cpp
  4. 7 1
      src/renderer_d3d12.cpp
  5. 7 1
      src/renderer_d3d9.cpp
  6. 9 2
      src/renderer_gl.cpp
  7. 7 1
      src/renderer_mtl.mm
  8. 7 1
      src/renderer_vk.cpp
  9. 7 1
      src/renderer_webgpu.cpp

+ 0 - 1
src/bgfx.cpp

@@ -11,7 +11,6 @@
 #include <bx/mutex.h>
 #include <bx/mutex.h>
 
 
 #include "topology.h"
 #include "topology.h"
-#include "version.h"
 
 
 #if BX_PLATFORM_OSX || BX_PLATFORM_IOS
 #if BX_PLATFORM_OSX || BX_PLATFORM_IOS
 #	include <objc/message.h>
 #	include <objc/message.h>

+ 1 - 0
src/bgfx_p.h

@@ -131,6 +131,7 @@ namespace bgfx
 #include <bimg/bimg.h>
 #include <bimg/bimg.h>
 #include "shader.h"
 #include "shader.h"
 #include "vertexlayout.h"
 #include "vertexlayout.h"
+#include "version.h"
 
 
 #define BGFX_CHUNK_MAGIC_TEX BX_MAKEFOURCC('T', 'E', 'X', 0x0)
 #define BGFX_CHUNK_MAGIC_TEX BX_MAKEFOURCC('T', 'E', 'X', 0x0)
 
 

+ 8 - 2
src/renderer_d3d11.cpp

@@ -1018,7 +1018,7 @@ namespace bgfx { namespace d3d11
 					 *
 					 *
 					 * Moreover, it is actually not desirable to create the backbuffer with an _SRGB format, because that
 					 * Moreover, it is actually not desirable to create the backbuffer with an _SRGB format, because that
 					 * is incompatible with the flip presentation model, which is desirable for various reasons including
 					 * is incompatible with the flip presentation model, which is desirable for various reasons including
-					 * player embedding. 
+					 * player embedding.
 					 */
 					 */
 					m_scd.format = s_textureFormat[_init.resolution.format].m_fmt;
 					m_scd.format = s_textureFormat[_init.resolution.format].m_fmt;
 
 
@@ -6448,11 +6448,17 @@ namespace bgfx { namespace d3d11
 				tvm.clear();
 				tvm.clear();
 				uint16_t pos = 0;
 				uint16_t pos = 0;
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
-					, " %s.%d (FL %d.%d) / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
+					, " %s.%d (FL %d.%d) / " BX_COMPILER_NAME
+					  " / " BX_CPU_NAME
+					  " / " BX_ARCH_NAME
+					  " / " BX_PLATFORM_NAME
+					  " / Version 1.%d.%d (commit: " BGFX_REV_SHA1 ")"
 					, getRendererName()
 					, getRendererName()
 					, m_deviceInterfaceVersion
 					, m_deviceInterfaceVersion
 					, (m_featureLevel >> 12) & 0xf
 					, (m_featureLevel >> 12) & 0xf
 					, (m_featureLevel >>  8) & 0xf
 					, (m_featureLevel >>  8) & 0xf
+					, BGFX_API_VERSION
+					, BGFX_REV_NUMBER
 					);
 					);
 
 
 				const DXGI_ADAPTER_DESC& desc = m_dxgi.m_adapterDesc;
 				const DXGI_ADAPTER_DESC& desc = m_dxgi.m_adapterDesc;

+ 7 - 1
src/renderer_d3d12.cpp

@@ -6837,11 +6837,17 @@ namespace bgfx { namespace d3d12
 				tvm.clear();
 				tvm.clear();
 				uint16_t pos = 0;
 				uint16_t pos = 0;
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
-					, " %s.%d (FL %d.%d) / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
+					, " %s.%d (FL %d.%d) / " BX_COMPILER_NAME
+					  " / " BX_CPU_NAME
+					  " / " BX_ARCH_NAME
+					  " / " BX_PLATFORM_NAME
+					  " / Version 1.%d.%d (commit: " BGFX_REV_SHA1 ")"
 					, getRendererName()
 					, getRendererName()
 					, m_deviceInterfaceVersion
 					, m_deviceInterfaceVersion
 					, (m_featureLevel >> 12) & 0xf
 					, (m_featureLevel >> 12) & 0xf
 					, (m_featureLevel >>  8) & 0xf
 					, (m_featureLevel >>  8) & 0xf
+					, BGFX_API_VERSION
+					, BGFX_REV_NUMBER
 					);
 					);
 
 
 				const DXGI_ADAPTER_DESC& desc = m_dxgi.m_adapterDesc;
 				const DXGI_ADAPTER_DESC& desc = m_dxgi.m_adapterDesc;

+ 7 - 1
src/renderer_d3d9.cpp

@@ -4450,8 +4450,14 @@ namespace bgfx { namespace d3d9
 				tvm.clear();
 				tvm.clear();
 				uint16_t pos = 0;
 				uint16_t pos = 0;
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
-					, " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
+					, " %s / " BX_COMPILER_NAME
+					  " / " BX_CPU_NAME
+					  " / " BX_ARCH_NAME
+					  " / " BX_PLATFORM_NAME
+					  " / Version 1.%d.%d (commit: " BGFX_REV_SHA1 ")"
 					, getRendererName()
 					, getRendererName()
+					, BGFX_API_VERSION
+					, BGFX_REV_NUMBER
 					);
 					);
 
 
 				const D3DADAPTER_IDENTIFIER9& identifier = m_identifier;
 				const D3DADAPTER_IDENTIFIER9& identifier = m_identifier;

+ 9 - 2
src/renderer_gl.cpp

@@ -815,7 +815,7 @@ namespace bgfx { namespace gl
 		{ "EXT_unpack_subimage",                      false,                             true  },
 		{ "EXT_unpack_subimage",                      false,                             true  },
 		{ "EXT_sRGB",                                 false,                             true  }, // GLES2 extension.
 		{ "EXT_sRGB",                                 false,                             true  }, // GLES2 extension.
 		{ "EXT_multisampled_render_to_texture",       false,                             true  }, // GLES2 extension.
 		{ "EXT_multisampled_render_to_texture",       false,                             true  }, // GLES2 extension.
-		
+
 		{ "GOOGLE_depth_texture",                     false,                             true  },
 		{ "GOOGLE_depth_texture",                     false,                             true  },
 
 
 		{ "IMG_multisampled_render_to_texture",       false,                             true  },
 		{ "IMG_multisampled_render_to_texture",       false,                             true  },
@@ -8216,9 +8216,16 @@ namespace bgfx { namespace gl
 				tvm.clear();
 				tvm.clear();
 				uint16_t pos = 0;
 				uint16_t pos = 0;
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
-					, " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
+					, " %s / " BX_COMPILER_NAME
+					  " / " BX_CPU_NAME
+					  " / " BX_ARCH_NAME
+					  " / " BX_PLATFORM_NAME
+					  " / Version 1.%d.%d (commit: " BGFX_REV_SHA1 ")"
 					, getRendererName()
 					, getRendererName()
+					, BGFX_API_VERSION
+					, BGFX_REV_NUMBER
 					);
 					);
+
 				tvm.printf(0, pos++, 0x8f, "       Vendor: %s ", m_vendor);
 				tvm.printf(0, pos++, 0x8f, "       Vendor: %s ", m_vendor);
 				tvm.printf(0, pos++, 0x8f, "     Renderer: %s ", m_renderer);
 				tvm.printf(0, pos++, 0x8f, "     Renderer: %s ", m_renderer);
 				tvm.printf(0, pos++, 0x8f, "      Version: %s ", m_version);
 				tvm.printf(0, pos++, 0x8f, "      Version: %s ", m_version);

+ 7 - 1
src/renderer_mtl.mm

@@ -4761,8 +4761,14 @@ namespace bgfx { namespace mtl
 				tvm.clear();
 				tvm.clear();
 				uint16_t pos = 0;
 				uint16_t pos = 0;
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
-					, " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
+					, " %s / " BX_COMPILER_NAME
+					  " / " BX_CPU_NAME
+					  " / " BX_ARCH_NAME
+					  " / " BX_PLATFORM_NAME
+					  " / Version 1.%d.%d (commit: " BGFX_REV_SHA1 ")"
 					, getRendererName()
 					, getRendererName()
+					, BGFX_API_VERSION
+					, BGFX_REV_NUMBER
 					);
 					);
 
 
 				pos = 10;
 				pos = 10;

+ 7 - 1
src/renderer_vk.cpp

@@ -7100,8 +7100,14 @@ BX_UNUSED(presentMin, presentMax);
 				tvm.clear();
 				tvm.clear();
 				uint16_t pos = 0;
 				uint16_t pos = 0;
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
-					, " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
+					, " %s / " BX_COMPILER_NAME
+					  " / " BX_CPU_NAME
+					  " / " BX_ARCH_NAME
+					  " / " BX_PLATFORM_NAME
+					  " / Version 1.%d.%d (commit: " BGFX_REV_SHA1 ")"
 					, getRendererName()
 					, getRendererName()
+					, BGFX_API_VERSION
+					, BGFX_REV_NUMBER
 					);
 					);
 
 
 				const VkPhysicalDeviceProperties& pdp = m_deviceProperties;
 				const VkPhysicalDeviceProperties& pdp = m_deviceProperties;

+ 7 - 1
src/renderer_webgpu.cpp

@@ -4798,8 +4798,14 @@ namespace bgfx { namespace webgpu
 				tvm.clear();
 				tvm.clear();
 				uint16_t pos = 0;
 				uint16_t pos = 0;
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
 				tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x8c : 0x8f
-					, " %s / " BX_COMPILER_NAME " / " BX_CPU_NAME " / " BX_ARCH_NAME " / " BX_PLATFORM_NAME " "
+					, " %s / " BX_COMPILER_NAME
+					  " / " BX_CPU_NAME
+					  " / " BX_ARCH_NAME
+					  " / " BX_PLATFORM_NAME
+					  " / Version 1.%d.%d (commit: " BGFX_REV_SHA1 ")"
 					, getRendererName()
 					, getRendererName()
+					, BGFX_API_VERSION
+					, BGFX_REV_NUMBER
 					);
 					);
 
 
 				pos = 10;
 				pos = 10;