Browse Source
Two of the big nasties, according to profiling, are the TnL enum and creation of Direct3D objects. It turned out we were doing these things several times (3 and 4 respectively) during the init process. So, now we have an hsGDirect3D namespace and some smart pointers to manage them!
7 changed files with 205 additions and 95 deletions
@ -0,0 +1,82 @@ |
|||||||
|
/*==LICENSE==*
|
||||||
|
|
||||||
|
CyanWorlds.com Engine - MMOG client, server and tools |
||||||
|
Copyright (C) 2011 Cyan Worlds, Inc. |
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify |
||||||
|
it under the terms of the GNU General Public License as published by |
||||||
|
the Free Software Foundation, either version 3 of the License, or |
||||||
|
(at your option) any later version. |
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful, |
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||||
|
GNU General Public License for more details. |
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License |
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Additional permissions under GNU GPL version 3 section 7 |
||||||
|
|
||||||
|
If you modify this Program, or any covered work, by linking or |
||||||
|
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, |
||||||
|
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent |
||||||
|
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK |
||||||
|
(or a modified version of those libraries), |
||||||
|
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, |
||||||
|
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG |
||||||
|
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the |
||||||
|
licensors of this Program grant you additional |
||||||
|
permission to convey the resulting work. Corresponding Source for a |
||||||
|
non-source form of such a combination shall include the source code for |
||||||
|
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered |
||||||
|
work. |
||||||
|
|
||||||
|
You can contact Cyan Worlds, Inc. by email legal@cyan.com |
||||||
|
or by snail mail at: |
||||||
|
Cyan Worlds, Inc. |
||||||
|
14617 N Newport Hwy |
||||||
|
Mead, WA 99021 |
||||||
|
|
||||||
|
*==LICENSE==*/ |
||||||
|
|
||||||
|
#include "hsGDirect3D.h" |
||||||
|
#include "plDXEnumerate.h" |
||||||
|
|
||||||
|
#include <d3d9.h> |
||||||
|
#include <functional> |
||||||
|
#include <memory> |
||||||
|
|
||||||
|
static std::unique_ptr<hsGDirect3DTnLEnumerate> s_tnlEnum; |
||||||
|
hsGDirect3DTnLEnumerate& hsGDirect3D::EnumerateTnL(bool reenum) |
||||||
|
{ |
||||||
|
if (reenum || !s_tnlEnum.get()) |
||||||
|
s_tnlEnum.reset(new hsGDirect3DTnLEnumerate()); |
||||||
|
|
||||||
|
// Be nice to legacy code and return a reference...
|
||||||
|
hsGDirect3DTnLEnumerate* ptr = s_tnlEnum.get(); |
||||||
|
return *ptr; |
||||||
|
} |
||||||
|
|
||||||
|
void hsGDirect3D::ReleaseTnLEnum() |
||||||
|
{ |
||||||
|
s_tnlEnum.release(); |
||||||
|
} |
||||||
|
|
||||||
|
static void IDeleteDirect3D(IDirect3D9* d3d) |
||||||
|
{ |
||||||
|
while (d3d->Release()) { } |
||||||
|
} |
||||||
|
|
||||||
|
static std::unique_ptr<IDirect3D9, std::function<void(IDirect3D9*)>> s_direct3d(nullptr, IDeleteDirect3D); |
||||||
|
IDirect3D9* hsGDirect3D::GetDirect3D(bool recreate) |
||||||
|
{ |
||||||
|
if (recreate || !s_direct3d.get()) { |
||||||
|
IDirect3D9* ptr = Direct3DCreate9(D3D_SDK_VERSION); |
||||||
|
hsAssert(ptr, "failed to create Direct3D"); |
||||||
|
|
||||||
|
s_direct3d.reset(ptr); |
||||||
|
} |
||||||
|
return s_direct3d.get(); |
||||||
|
} |
||||||
|
|
||||||
@ -0,0 +1,60 @@ |
|||||||
|
/*==LICENSE==*
|
||||||
|
|
||||||
|
CyanWorlds.com Engine - MMOG client, server and tools |
||||||
|
Copyright (C) 2011 Cyan Worlds, Inc. |
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify |
||||||
|
it under the terms of the GNU General Public License as published by |
||||||
|
the Free Software Foundation, either version 3 of the License, or |
||||||
|
(at your option) any later version. |
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful, |
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||||
|
GNU General Public License for more details. |
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License |
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Additional permissions under GNU GPL version 3 section 7 |
||||||
|
|
||||||
|
If you modify this Program, or any covered work, by linking or |
||||||
|
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, |
||||||
|
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent |
||||||
|
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK |
||||||
|
(or a modified version of those libraries), |
||||||
|
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, |
||||||
|
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG |
||||||
|
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the |
||||||
|
licensors of this Program grant you additional |
||||||
|
permission to convey the resulting work. Corresponding Source for a |
||||||
|
non-source form of such a combination shall include the source code for |
||||||
|
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered |
||||||
|
work. |
||||||
|
|
||||||
|
You can contact Cyan Worlds, Inc. by email legal@cyan.com |
||||||
|
or by snail mail at: |
||||||
|
Cyan Worlds, Inc. |
||||||
|
14617 N Newport Hwy |
||||||
|
Mead, WA 99021 |
||||||
|
|
||||||
|
*==LICENSE==*/ |
||||||
|
|
||||||
|
#ifndef _hsGDirect3D_inc_ |
||||||
|
#define _hsGDirect3D_inc_ |
||||||
|
|
||||||
|
class hsGDirect3DTnLEnumerate; |
||||||
|
struct IDirect3D9; |
||||||
|
|
||||||
|
namespace hsGDirect3D |
||||||
|
{ |
||||||
|
hsGDirect3DTnLEnumerate& EnumerateTnL(bool reenum=false); |
||||||
|
void ReleaseTnLEnum(); |
||||||
|
|
||||||
|
/** Get a root Direct3D object.
|
||||||
|
* \remarks You should not hold this pointer. |
||||||
|
*/ |
||||||
|
IDirect3D9* GetDirect3D(bool recreate=false); |
||||||
|
} |
||||||
|
|
||||||
|
#endif // _hsGDirect3D_inc_
|
||||||
Loading…
Reference in new issue