2
0
Эх сурвалжийг харах

Merge branch 'master' of github.com:bkaradzic/bgfx

Branimir Karadzic 11 жил өмнө
parent
commit
4bb7714da8

+ 2 - 2
src/glcontext_wgl.cpp

@@ -43,7 +43,7 @@ namespace bgfx
 		{
 		{
 			wglMakeCurrent(m_hdc, m_context);
 			wglMakeCurrent(m_hdc, m_context);
 			GLenum err = glGetError();
 			GLenum err = glGetError();
-			BX_WARN(0 == err, "wglMakeCurrent failed with GL error: 0x%04x.", err);
+			BX_WARN(0 == err, "wglMakeCurrent failed with GL error: 0x%04x.", err); BX_UNUSED(err);
 		}
 		}
 
 
 		void swapBuffers()
 		void swapBuffers()
@@ -322,7 +322,7 @@ namespace bgfx
 		{
 		{
 			wglMakeCurrent(m_hdc, m_context);
 			wglMakeCurrent(m_hdc, m_context);
 			GLenum err = glGetError();
 			GLenum err = glGetError();
-			BX_WARN(0 == err, "wglMakeCurrent failed with GL error: 0x%04x.", err);
+			BX_WARN(0 == err, "wglMakeCurrent failed with GL error: 0x%04x.", err); BX_UNUSED(err);
 		}
 		}
 		else
 		else
 		{
 		{

+ 1 - 1
src/renderer_d3d11.cpp

@@ -2957,7 +2957,7 @@ RENDERDOC_IMPORT
 
 
 			for (uint32_t eye = 0; eye < 2; ++eye)
 			for (uint32_t eye = 0; eye < 2; ++eye)
 			{
 			{
-				const HMD::Eye hmdEye = hmd.eye[eye];
+				const HMD::Eye& hmdEye = hmd.eye[eye];
 				viewAdjust.un.val[12] = hmdEye.adjust[0];
 				viewAdjust.un.val[12] = hmdEye.adjust[0];
 				viewAdjust.un.val[13] = hmdEye.adjust[1];
 				viewAdjust.un.val[13] = hmdEye.adjust[1];
 				viewAdjust.un.val[14] = hmdEye.adjust[2];
 				viewAdjust.un.val[14] = hmdEye.adjust[2];

+ 1 - 1
src/renderer_gl.cpp

@@ -4126,7 +4126,7 @@ namespace bgfx
 
 
 			for (uint32_t eye = 0; eye < 2; ++eye)
 			for (uint32_t eye = 0; eye < 2; ++eye)
 			{
 			{
-				const HMD::Eye hmdEye = hmd.eye[eye];
+				const HMD::Eye& hmdEye = hmd.eye[eye];
 				viewAdjust.un.val[12] = hmdEye.adjust[0];
 				viewAdjust.un.val[12] = hmdEye.adjust[0];
 				viewAdjust.un.val[13] = hmdEye.adjust[1];
 				viewAdjust.un.val[13] = hmdEye.adjust[1];
 				viewAdjust.un.val[14] = hmdEye.adjust[2];
 				viewAdjust.un.val[14] = hmdEye.adjust[2];