diff --git a/src/common/fonts/ttffont.cpp b/src/common/fonts/ttffont.cpp index f7e0f708c..f7477d4ba 100644 --- a/src/common/fonts/ttffont.cpp +++ b/src/common/fonts/ttffont.cpp @@ -1,3 +1,4 @@ +#include #include "engineerrors.h" #include "textures.h" diff --git a/src/common/platform/posix/cocoa/gl_sysfb.h b/src/common/platform/posix/cocoa/base_sysfb.h similarity index 100% rename from src/common/platform/posix/cocoa/gl_sysfb.h rename to src/common/platform/posix/cocoa/base_sysfb.h diff --git a/src/common/rendering/vulkan/vk_renderdevice.cpp b/src/common/rendering/vulkan/vk_renderdevice.cpp index 78e70a93e..f4a7f5ada 100644 --- a/src/common/rendering/vulkan/vk_renderdevice.cpp +++ b/src/common/rendering/vulkan/vk_renderdevice.cpp @@ -195,7 +195,7 @@ void VulkanRenderDevice::InitializeState() for (int threadIndex = 0; threadIndex < MaxThreads; threadIndex++) { #ifdef __APPLE__ - mRenderState.push_back(std::make_unique(this)); + mRenderState.push_back(std::make_unique(this, 0)); #else mRenderState.push_back(std::make_unique(this, 0)); #endif diff --git a/src/common/utility/matrix.h b/src/common/utility/matrix.h index a38b17146..bafef419b 100644 --- a/src/common/utility/matrix.h +++ b/src/common/utility/matrix.h @@ -110,10 +110,10 @@ class VSMatrix { { #ifdef NO_SSE FVector4 result; - result.x = mMatrix[0 * 4 + 0] * v.X + mMatrix[1 * 4 + 0] * v.Y + mMatrix[2 * 4 + 0] * v.Z + mMatrix[3 * 4 + 0] * v.W; - result.y = mMatrix[0 * 4 + 1] * v.X + mMatrix[1 * 4 + 1] * v.Y + mMatrix[2 * 4 + 1] * v.Z + mMatrix[3 * 4 + 1] * v.W; - result.z = mMatrix[0 * 4 + 2] * v.X + mMatrix[1 * 4 + 2] * v.Y + mMatrix[2 * 4 + 2] * v.Z + mMatrix[3 * 4 + 2] * v.W; - result.w = mMatrix[0 * 4 + 3] * v.X + mMatrix[1 * 4 + 3] * v.Y + mMatrix[2 * 4 + 3] * v.Z + mMatrix[3 * 4 + 3] * v.W; + result.X = mMatrix[0 * 4 + 0] * v.X + mMatrix[1 * 4 + 0] * v.Y + mMatrix[2 * 4 + 0] * v.Z + mMatrix[3 * 4 + 0] * v.W; + result.Y = mMatrix[0 * 4 + 1] * v.X + mMatrix[1 * 4 + 1] * v.Y + mMatrix[2 * 4 + 1] * v.Z + mMatrix[3 * 4 + 1] * v.W; + result.Z = mMatrix[0 * 4 + 2] * v.X + mMatrix[1 * 4 + 2] * v.Y + mMatrix[2 * 4 + 2] * v.Z + mMatrix[3 * 4 + 2] * v.W; + result.W = mMatrix[0 * 4 + 3] * v.X + mMatrix[1 * 4 + 3] * v.Y + mMatrix[2 * 4 + 3] * v.Z + mMatrix[3 * 4 + 3] * v.W; return result; #else __m128 m0 = _mm_loadu_ps(mMatrix);