From 636a42ab542a11c71a45e25793d2ef09164d5468 Mon Sep 17 00:00:00 2001 From: halx99 Date: Sun, 4 Aug 2024 23:51:22 +0800 Subject: [PATCH] Fix #2069 liv2d compile error --- .../src/Rendering/axmol/CubismCommandBuffer_Cocos2dx.cpp | 2 +- .../Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.cpp | 4 ++-- .../Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/Live2D/Framework/src/Rendering/axmol/CubismCommandBuffer_Cocos2dx.cpp b/extensions/Live2D/Framework/src/Rendering/axmol/CubismCommandBuffer_Cocos2dx.cpp index 669ff909c866..ac7b03acd22a 100644 --- a/extensions/Live2D/Framework/src/Rendering/axmol/CubismCommandBuffer_Cocos2dx.cpp +++ b/extensions/Live2D/Framework/src/Rendering/axmol/CubismCommandBuffer_Cocos2dx.cpp @@ -234,7 +234,7 @@ void CubismCommandBuffer_Cocos2dx::SetColorBuffer(backend::TextureBackend* color { rt = GetCocos2dRenderer()->getOffscreenRenderTarget(); rt->setColorAttachment(colorBuffer); - rt->setTargetFlags(RenderTargetFlag::COLOR); + //rt->setTargetFlags(RenderTargetFlag::COLOR); } else { diff --git a/extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.cpp b/extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.cpp index 41388c018f3e..2de58908e887 100644 --- a/extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.cpp +++ b/extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.cpp @@ -656,7 +656,7 @@ void CubismRendererProfile_Cocos2dx::Save() // _lastRenderTargetFlag = GetCocos2dRenderer()->getRenderTargetFlag(); // _lastColorBuffer = nullptr; // unused _lastRenderTarget = GetCocos2dRenderer()->getRenderTarget(); - _lastRenderTargetFlag = _lastRenderTarget->getTargetFlags(); + //_lastRenderTargetFlag = _lastRenderTarget->getTargetFlags(); _lastColorBuffer = _lastRenderTarget->_color[0].texture; _lastDepthBuffer = _lastRenderTarget->_depth.texture; _lastStencilBuffer = _lastRenderTarget->_stencil.texture; @@ -684,7 +684,7 @@ void CubismRendererProfile_Cocos2dx::Restore() restoringRT->setColorAttachment(_lastColorBuffer); restoringRT->setDepthAttachment(_lastDepthBuffer); restoringRT->setStencilAttachment(_lastStencilBuffer); - restoringRT->setTargetFlags(_lastRenderTargetFlag); + // restoringRT->setTargetFlags(_lastRenderTargetFlag); cmd->func = [=]() -> void { GetCocos2dRenderer()->setRenderTarget(restoringRT); }; diff --git a/extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.hpp b/extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.hpp index fd70807542c5..506dda8cdae8 100644 --- a/extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.hpp +++ b/extensions/Live2D/Framework/src/Rendering/axmol/CubismRenderer_Cocos2dx.hpp @@ -366,7 +366,7 @@ class CubismRendererProfile_Cocos2dx backend::TextureBackend* _lastColorBuffer; ///< モデル描画直前のフレームバッファ backend::TextureBackend* _lastDepthBuffer; backend::TextureBackend* _lastStencilBuffer; - ax::RenderTargetFlag _lastRenderTargetFlag; + //ax::RenderTargetFlag _lastRenderTargetFlag; backend::RenderTarget* _lastRenderTarget; csmRectF _lastViewport; ///< モデル描画直前のビューポート };