Skip to content

Main: RenderTarget - add TargetPriorityGroup to replace #defines #3419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
paroj wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Main: RenderTarget - add TargetPriorityGroup to replace #defines #3419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions OgreMain/include/OgreRenderTarget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ THE SOFTWARE.
#include "OgrePixelFormat.h"
#include "OgreHeaderPrefix.h"

/* Define the number of priority groups for the render system's render targets. */
#ifndef OGRE_NUM_RENDERTARGET_GROUPS
#define OGRE_NUM_RENDERTARGET_GROUPS 10
#define OGRE_DEFAULT_RT_GROUP 4
#define OGRE_REND_TO_TEX_RT_GROUP 2
#endif
/// @deprecated
#define OGRE_REND_TO_TEX_RT_GROUP Ogre::RenderTarget::TP_REND_TO_TEX
/// @deprecated
#define OGRE_DEFAULT_RT_GROUP Ogre::RenderTarget::TP_DEFAULT

namespace Ogre {

Expand Down Expand Up @@ -86,6 +84,12 @@ namespace Ogre {
FB_AUTO
};

enum TargetPriorityGroup
{
TP_REND_TO_TEX = 2,
TP_DEFAULT = 4,
};

RenderTarget();
virtual ~RenderTarget();

Expand Down
2 changes: 0 additions & 2 deletions OgreMain/src/OgreRenderSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,6 @@ namespace Ogre {
//---------------------------------------------------------------------------------------------
void RenderSystem::attachRenderTarget( RenderTarget &target )
{
assert( target.getPriority() < OGRE_NUM_RENDERTARGET_GROUPS );

mRenderTargets.emplace(target.getName(), &target);
mPrioritisedRenderTargets.emplace(target.getPriority(), &target);
}
Expand Down
2 changes: 1 addition & 1 deletion OgreMain/src/OgreRenderTarget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ THE SOFTWARE.
namespace Ogre {

RenderTarget::RenderTarget()
: mPriority(OGRE_DEFAULT_RT_GROUP)
: mPriority(TP_DEFAULT)
, mDepthBufferPoolId(DepthBuffer::POOL_DEFAULT)
, mDepthBuffer(0)
, mActive(true)
Expand Down
4 changes: 2 additions & 2 deletions OgreMain/src/OgreRenderTexture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace Ogre
RenderTexture::RenderTexture(HardwarePixelBuffer *buffer, uint32 zoffset):
mBuffer(buffer), mZOffset(zoffset)
{
mPriority = OGRE_REND_TO_TEX_RT_GROUP;
mPriority = TP_REND_TO_TEX;
mWidth = mBuffer->getWidth();
mHeight = mBuffer->getHeight();

Expand All @@ -62,7 +62,7 @@ namespace Ogre
//-----------------------------------------------------------------------------
MultiRenderTarget::MultiRenderTarget(const String &name)
{
mPriority = OGRE_REND_TO_TEX_RT_GROUP;
mPriority = TP_REND_TO_TEX;
mName = name;
/// Width and height is unknown with no targets attached
mWidth = mHeight = 0;
Expand Down