[2.2] Doesn't compile after merging "FSAA explicit resolve logic"

rujialiu · Post by **rujialiu** » Wed Aug 29, 2018 6:36 am

Hi!

The current 2.2 branch doesn't compile.
1. ID_RESOLVE is redefined
2. It's using old TexturePtr (OgreCompositorPassQuad.cpp):

Code: Select all

TexturePtr tex = mParentNode->getDefinedTexture( mDefinition->mFsaaTextureName, 0 );

I think MSAA explicit resolve is already implemented in Ogre 2.2, so this pull request should actually only be merged into Ogre 2.1?

Post by **dark_sylinc** » Wed Aug 29, 2018 11:09 pm

Wow! Yes, I merged the branches, I was gonna remove that code; but due to lots of work I couldn't.
Then that un-reviewed commit got pushed by accident.

Thanks!

rujialiu · Post by **rujialiu** » Thu Aug 30, 2018 6:43 am

dark_sylinc wrote: ↑Wed Aug 29, 2018 11:09 pm Wow! Yes, I merged the branches, I was gonna remove that code; but due to lots of work I couldn't.
Then that un-reviewed commit got pushed by accident.

Thanks!

Thanks for the fix

Ogre Forums

[2.2] Doesn't compile after merging "FSAA explicit resolve logic" Topic is solved

[2.2] Doesn't compile after merging "FSAA explicit resolve logic"

Re: [2.2] Doesn't compile after merging "FSAA explicit resolve logic"

Re: [2.2] Doesn't compile after merging "FSAA explicit resolve logic"