Cleanup.

scripts/bgfx.lua

@@ -132,22 +132,13 @@ function bgfxProject(_name, _kind, _defines)
 		if _OPTIONS["with-amalgamated"] then
 			excludes {
 				path.join(BGFX_DIR, "src/bgfx.cpp"),
-				path.join(BGFX_DIR, "src/glcontext_egl.cpp"),
-				path.join(BGFX_DIR, "src/glcontext_glx.cpp"),
-				path.join(BGFX_DIR, "src/glcontext_ppapi.cpp"),
-				path.join(BGFX_DIR, "src/glcontext_wgl.cpp"),
+				path.join(BGFX_DIR, "src/debug_**.cpp"),
+				path.join(BGFX_DIR, "src/glcontext_**.cpp"),
 				path.join(BGFX_DIR, "src/image.cpp"),
-				path.join(BGFX_DIR, "src/ovr.cpp"),
-				path.join(BGFX_DIR, "src/renderdoc.cpp"),
-				path.join(BGFX_DIR, "src/renderer_d3d9.cpp"),
-				path.join(BGFX_DIR, "src/renderer_d3d11.cpp"),
-				path.join(BGFX_DIR, "src/renderer_d3d12.cpp"),
-				path.join(BGFX_DIR, "src/renderer_null.cpp"),
-				path.join(BGFX_DIR, "src/renderer_gl.cpp"),
-				path.join(BGFX_DIR, "src/renderer_vk.cpp"),
-				path.join(BGFX_DIR, "src/shader_dx9bc.cpp"),
-				path.join(BGFX_DIR, "src/shader_dxbc.cpp"),
-				path.join(BGFX_DIR, "src/shader_spirv.cpp"),
+				path.join(BGFX_DIR, "src/hmd**.cpp"),
+				path.join(BGFX_DIR, "src/renderer_**.cpp"),
+				path.join(BGFX_DIR, "src/shader_**.cpp"),
+				path.join(BGFX_DIR, "src/topology.cpp"),
 				path.join(BGFX_DIR, "src/vertexdecl.cpp"),
 			}
 
@@ -157,9 +148,8 @@ function bgfxProject(_name, _kind, _defines)
 				}
 
 				excludes {
-					path.join(BGFX_DIR, "src/glcontext_eagl.mm"),
-					path.join(BGFX_DIR, "src/glcontext_nsgl.mm"),
-					path.join(BGFX_DIR, "src/renderer_mtl.mm"),
+					path.join(BGFX_DIR, "src/glcontext_**.mm"),
+					path.join(BGFX_DIR, "src/renderer_**.mm"),
 					path.join(BGFX_DIR, "src/amalgamated.cpp"),
 				}
 
@@ -168,9 +158,8 @@ function bgfxProject(_name, _kind, _defines)
 		else
 			configuration { "xcode* or osx or ios*" }
 				files {
-					path.join(BGFX_DIR, "src/glcontext_eagl.mm"),
-					path.join(BGFX_DIR, "src/glcontext_nsgl.mm"),
-					path.join(BGFX_DIR, "src/renderer_mtl.mm"),
+					path.join(BGFX_DIR, "src/glcontext_**.mm"),
+					path.join(BGFX_DIR, "src/renderer_**.mm"),
 				}
 
 			configuration {}

src/amalgamated.cpp

@@ -9,6 +9,7 @@
 #include "glcontext_ppapi.cpp"
 #include "glcontext_wgl.cpp"
 #include "image.cpp"
+#include "hmd.cpp"
 #include "hmd_ovr.cpp"
 #include "hmd_openvr.cpp"
 #include "debug_renderdoc.cpp"

src/hmd.cpp

@@ -64,8 +64,8 @@ namespace bgfx
 
 		_viewport->m_x      = 0;
 		_viewport->m_y      = 0;
-		_viewport->m_width  = m_desc.m_eyeSize[_eye].m_w;
-		_viewport->m_height = m_desc.m_eyeSize[_eye].m_h;
+		_viewport->m_width  = uint16_t(m_desc.m_eyeSize[_eye].m_w);
+		_viewport->m_height = uint16_t(m_desc.m_eyeSize[_eye].m_h);
 
 		m_impl->renderEyeStart(m_desc, _eye);
 	}
@@ -128,10 +128,10 @@ namespace bgfx
 		}
 
 		_hmd.flags = BGFX_HMD_DEVICE_RESOLUTION;
-		_hmd.deviceWidth = m_desc.m_deviceSize.m_w;
+		_hmd.deviceWidth  = m_desc.m_deviceSize.m_w;
 		_hmd.deviceHeight = m_desc.m_deviceSize.m_h;
-		_hmd.width = m_hmdSize.m_w;
-		_hmd.height = m_hmdSize.m_h;
+		_hmd.width  = uint16_t(m_hmdSize.m_w);
+		_hmd.height = uint16_t(m_hmdSize.m_h);
 
 		if (!m_impl->updateTracking(_hmd) )
 		{