diff --git a/.gitignore b/.gitignore index 53d6568c..38c4fbe4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,10 @@ ## ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore +# Jetbrains Project Files +.idea/ +cmake* + # User-specific files *.rsuser *.suo diff --git a/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp b/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp index 1ac51313..b73e33d2 100644 --- a/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp +++ b/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp @@ -197,8 +197,11 @@ static bool FontBuilder_Build(ImFontAtlas* atlas) for (auto& glyph : glyphs) glyph.edgeColoring(&msdfgen::edgeColoringByDistance, 3.0, 0); - for (auto& customRect : atlas->CustomRects) - customRects.emplace_back(0, 0, int(customRect.Width), int(customRect.Height)); + for (auto &customRect : atlas->CustomRects) + customRects.push_back( + msdf_atlas::Rectangle{0, 0, + int(customRect.Width), + int(customRect.Height)}); TightAtlasPacker packer; packer.spacing = 1; diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp index 2333dfb7..ea26226d 100644 --- a/UnleashedRecomp/gpu/video.cpp +++ b/UnleashedRecomp/gpu/video.cpp @@ -428,7 +428,7 @@ static void EnqueuePipelineTask(PipelineTaskType type, const boost::shared_ptr buffer; void* mappedMemory = nullptr; uint32_t dataSize = 0; @@ -204,6 +206,7 @@ struct GuestSurfaceDesc // RenderTarget/DepthStencil struct GuestSurface : GuestBaseTexture { + using GuestBaseTexture::GuestBaseTexture; uint32_t guestFormat = 0; ankerl::unordered_dense::map> framebuffers; RenderSampleCounts sampleCount = RenderSampleCount::COUNT_1; @@ -270,6 +273,7 @@ struct GuestVertexElement struct GuestVertexDeclaration : GuestResource { + using GuestResource::GuestResource; XXH64_hash_t hash = 0; std::unique_ptr inputElements; std::unique_ptr vertexElements; @@ -284,6 +288,7 @@ struct GuestVertexDeclaration : GuestResource // VertexShader/PixelShader struct GuestShader : GuestResource { + using GuestResource::GuestResource; Mutex mutex; std::unique_ptr shader; struct ShaderCacheEntry* shaderCacheEntry = nullptr;