From b16c2968220579ef11df597071fce4275aa981ae Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 13 Jul 2015 22:49:51 -0700 Subject: [PATCH] Remove deprecated plPipeline BeginDrawable/EndDrawable. --- Sources/Plasma/NucleusLib/inc/plPipeline.h | 3 --- .../PubUtilLib/plPipeline/DX/plDXPipeline.cpp | 17 ----------------- .../PubUtilLib/plPipeline/DX/plDXPipeline.h | 3 --- 3 files changed, 23 deletions(-) diff --git a/Sources/Plasma/NucleusLib/inc/plPipeline.h b/Sources/Plasma/NucleusLib/inc/plPipeline.h index 4e735828..fa761264 100644 --- a/Sources/Plasma/NucleusLib/inc/plPipeline.h +++ b/Sources/Plasma/NucleusLib/inc/plPipeline.h @@ -228,9 +228,6 @@ public: virtual bool EndRender() = 0; virtual void RenderScreenElements( void ) = 0; - virtual bool BeginDrawable(plDrawable* d) = 0; - virtual bool EndDrawable(plDrawable* d) = 0; - virtual void BeginVisMgr(plVisMgr* visMgr) = 0; virtual void EndVisMgr(plVisMgr* visMgr) = 0; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp index e7a6c319..c1ab012e 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.cpp @@ -2884,21 +2884,6 @@ void plDXPipeline::Render( plDrawable *d, const hsTArray& visList ) } } -//// BeginDrawable //////////////////////////////////////////////////////////// -// Obsolete, should be removed -bool plDXPipeline::BeginDrawable( plDrawable *d ) -{ - return true; -} - -//// EndDrawable ////////////////////////////////////////////////////////////// -// Obsolete, should be removed - -bool plDXPipeline::EndDrawable( plDrawable *d ) -{ - return true; -} - // IMakeLightLists /////////////////////////////////////////////////////////// // Look through all the current lights, and fill out two lists. // Only active lights (not disabled, not exactly black, and not @@ -5202,9 +5187,7 @@ void plDXPipeline::ClearRenderTarget( plDrawable* d ) fView.fDrawableTypeMask = plDrawable::kNormal; fView.fSubDrawableTypeMask = uint32_t(-1); - BeginDrawable(d); Draw(d); - EndDrawable(d); fView.fSubDrawableTypeMask = sdtm; fView.fDrawableTypeMask = dtm; diff --git a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h index 801ab389..690fe0b5 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/DX/plDXPipeline.h @@ -645,9 +645,6 @@ public: virtual bool EndRender(); virtual void RenderScreenElements(); - virtual bool BeginDrawable(plDrawable* d); - virtual bool EndDrawable(plDrawable* d); - virtual void BeginVisMgr(plVisMgr* visMgr); virtual void EndVisMgr(plVisMgr* visMgr);