From 8f8a7daee387c9f9e8b14bd003ebc88c611cf932 Mon Sep 17 00:00:00 2001 From: Laura Hermanns Date: Mon, 3 Jul 2023 14:08:41 -0400 Subject: [PATCH] Fixed compile errors on iOS platform. --- sources/Renderer/Metal/MTTypes.mm | 2 ++ tests/Test_iOS.mm | 25 +++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/sources/Renderer/Metal/MTTypes.mm b/sources/Renderer/Metal/MTTypes.mm index fa87df4785..e8d0d82b0a 100644 --- a/sources/Renderer/Metal/MTTypes.mm +++ b/sources/Renderer/Metal/MTTypes.mm @@ -286,8 +286,10 @@ MTLTextureType ToMTLTextureType(const TextureType textureType) case TextureType::TextureCubeArray: return MTLTextureTypeCubeArray; case TextureType::Texture2DMS: return MTLTextureType2DMultisample; case TextureType::Texture2DMSArray: + #ifndef LLGL_OS_IOS if (@available(macOS 10.14, *)) return MTLTextureType2DMultisampleArray; + #endif break; } MapFailed("TextureType", "MTLTextureType"); diff --git a/tests/Test_iOS.mm b/tests/Test_iOS.mm index b07100f053..15b2c0e28c 100644 --- a/tests/Test_iOS.mm +++ b/tests/Test_iOS.mm @@ -6,8 +6,7 @@ */ #include -#include -#include +#include #if 0 // TESTING @@ -194,7 +193,7 @@ int main() { try { - LLGL::Log::SetReportCallbackStd(&std::cout); + LLGL::Log::RegisterCallbackStd(); // Load render system module auto renderer = LLGL::RenderSystem::Load("Metal"); @@ -212,10 +211,16 @@ int main() // Print rendering capabilities const auto& info = renderer->GetRendererInfo(); - std::cout << "Renderer: " << info.rendererName << std::endl; - std::cout << "Vendor: " << info.vendorName << std::endl; - std::cout << "Device: " << info.deviceName << std::endl; - std::cout << "Shading Language: " << info.shadingLanguageName << std::endl; + LLGL::Log::Printf( + "Renderer: %s\n" + "Vendor: %s\n" + "Device: %s\n" + "Shading Language: %s\n", + info.rendererName.c_str(), + info.vendorName.c_str(), + info.deviceName.c_str(), + info.shadingLanguageName.c_str() + ); // Create command buffer auto commandQueue = renderer->GetCommandQueue(); @@ -301,7 +306,7 @@ int main() if (auto report = shader->GetReport()) { if (report->HasErrors()) - std::cerr << report->GetText() << std::endl; + LLGL::Log::Errorf("%s\n", report->GetText()); } } @@ -314,7 +319,7 @@ int main() } auto pipeline = renderer->CreatePipelineState(pipelineDesc); - LLGL::ColorRGBAf bgColor{ 0.0, 1.0f, 0.0f }; + LLGL::ClearValue bgColor{ 0.0, 1.0f, 0.0f, 1.0f }; // Main loop while (canvas.ProcessEvents()/* && !input->KeyDown(LLGL::Key::Escape)*/) @@ -342,7 +347,7 @@ int main() } catch (const std::exception& e) { - std::cerr << e.what() << std::endl; + LLGL::Log::Errorf("%s\n", e.what()); } return 0; }