Fix for Mac

effekseer · Feb 26, 2021 · 4d73b11 · 4d73b11
1 parent b55e707
commit 4d73b11
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/Dev/Cpp/Test/Backend/RenderPassTest.cpp b/Dev/Cpp/Test/Backend/RenderPassTest.cpp
@@ -2,7 +2,6 @@
 #include "../Window/RenderingWindowGL.h"
 #include "Effekseer.h"
 #include <EffekseerRendererGL.h>
-#include <Effekseer\Utils\Effekseer.CustomAllocator.h>
 
 struct SimpleVertex
 {
@@ -103,7 +102,8 @@ class ShiftBuffer
 		Effekseer::Backend::DepthTextureParameter depthTexParam;
 		depthTexParam.Size = texParam.Size;
 
-		renderPass = graphicsDevice->CreateRenderPass(textures, graphicsDevice->CreateDepthTexture(depthTexParam));
+        auto depthTex = graphicsDevice->CreateDepthTexture(depthTexParam);
+		renderPass = graphicsDevice->CreateRenderPass(textures, depthTex);
 	}
 };
 

diff --git a/Dev/Cpp/Test/Runtime/EffectPlatformMetal.mm b/Dev/Cpp/Test/Runtime/EffectPlatformMetal.mm
@@ -132,31 +132,27 @@ fragment main0_out main0(main0_in in [[stage_in]], texture2d<float> txt [[textur
 class DistortingCallbackMetal : public EffekseerRenderer::DistortingCallback
 {
 	EffectPlatformMetal* platform_ = nullptr;
-	Effekseer::TextureData* textureData_ = nullptr;
-
+    Effekseer::Backend::TextureRef texture_ = nullptr;
+    
 public:
 	DistortingCallbackMetal(EffectPlatformMetal* platform) : platform_(platform)
 	{
 	}
 
 	virtual ~DistortingCallbackMetal()
 	{
-
-		if (textureData_ != nullptr)
-		{
-			EffekseerRendererMetal::DeleteTextureData(textureData_);
-		}
+        texture_.Reset();
 	}
 
 	bool OnDistorting(EffekseerRenderer::Renderer* renderer) override
 	{
-		if (textureData_ == nullptr)
+        if (texture_ == nullptr)
 		{
 			auto tex = (LLGI::TextureMetal*)(platform_->GetCheckedTexture());
-			textureData_ = EffekseerRendererMetal::CreateTextureData(renderer->GetGraphicsDevice(), tex->GetImpl()->texture);
+			texture_ = EffekseerRendererMetal::CreateTexture(renderer->GetGraphicsDevice(), tex->GetImpl()->texture);
 		}
 
-		renderer->SetBackgroundTexture(textureData_);
+        renderer->SetBackground(texture_);
 
 		return true;
 	}

diff --git a/Dev/Cpp/Test/Runtime/ResourceManager.cpp b/Dev/Cpp/Test/Runtime/ResourceManager.cpp
@@ -26,25 +26,25 @@ void ResourceManager_Basic()
 	auto texture1 = resourceManager->LoadTexture(u"Test", Effekseer::TextureType::Color);
 	if (texture1 == nullptr)
 	{
-		throw std::exception("Failed.");
+		throw std::string("Failed.");
 	}
 	auto texture2 = resourceManager->LoadTexture(u"Test", Effekseer::TextureType::Color);
 	if (texture1 != texture2)
 	{
-		throw std::exception("Failed.");
+        throw std::string("Failed.");
 	}
 
 	resourceManager->UnloadTexture(texture1);
 	resourceManager->UnloadTexture(texture2);
 
 	if (texture1->GetRef() != 2)
 	{
-		throw std::exception("Failed.");
+        throw std::string("Failed.");
 	}
 	texture2.Reset();
 	if (texture1->GetRef() != 1)
 	{
-		throw std::exception("Failed.");
+        throw std::string("Failed.");
 	}
 	texture1.Reset();
 }

diff --git a/Dev/Cpp/Test/TestHelper.cpp b/Dev/Cpp/Test/TestHelper.cpp
@@ -58,7 +58,7 @@ std::u16string GetDirectoryPathAsU16(const char* path)
 	return std::u16string((const char16_t*)w.c_str());
 #else
 	char16_t dst[512];
-	Effekseer::ConvertUtf8ToUtf16((int16_t*)dst, 512, (const int8_t*)p.c_str());
+	Effekseer::ConvertUtf8ToUtf16(dst, 512, p.c_str());
 	return std::u16string(dst);
 #endif
 }