zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-30 16:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use RefCountedPtr to manage 2D shape buffer infos

Browse source
This commit is contained in:
alexey.lysiuk 2021-08-03 09:55:01 +03:00 committed by Christoph Oelckers
parent 76ecf44549
commit 387aef27ad
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/2d/v_2ddrawer.cpp
View file

@ -534,7 +534,7 @@ void DShape2D::OnDestroy() {
mIndices.Reset();
mVertices.Reset();
mCoords.Reset();
bufferInfo.reset();
bufferInfo = nullptr;
}
//==========================================================================

14
src/common/2d/v_2ddrawer.h
View file

@ -7,7 +7,7 @@
#include "textures.h"
#include "renderstyle.h"
#include "dobject.h"
#include <memory>
#include "refcounted.h"
struct DrawParms;
struct FColormap;
@ -50,7 +50,7 @@ struct F2DPolygons
};
class DShape2D;
class DShape2DBufferInfo;
struct DShape2DBufferInfo;
class F2DDrawer
{
@ -125,7 +125,7 @@ public:
bool useTransform;
DMatrix3x3 transform;
std::shared_ptr<DShape2DBufferInfo> shape2DBufInfo;
RefCountedPtr<DShape2DBufferInfo> shape2DBufInfo;
int shape2DBufIndex;
int shape2DIndexCount;
int shape2DCommandCounter;
@ -133,7 +133,6 @@ public:
RenderCommand()
{
memset(this, 0, sizeof(*this));
shape2DBufInfo.reset();
}
// If these fields match, two draw commands can be batched.
@ -243,9 +242,8 @@ public:
bool mIsFirstPass = true;
};
class DShape2DBufferInfo
struct DShape2DBufferInfo : NoVirtualRefCountedBase
{
public:
TArray<F2DVertexBuffer> buffers;
bool needsVertexUpload = true;
int bufIndex = -1;
@ -259,8 +257,8 @@ class DShape2D : public DObject
DECLARE_CLASS(DShape2D,DObject)
public:
DShape2D()
: bufferInfo(new DShape2DBufferInfo)
{
bufferInfo = std::make_shared<DShape2DBufferInfo>();
transform.Identity();
}
@ -275,7 +273,7 @@ public:
DMatrix3x3 transform;
std::shared_ptr<DShape2DBufferInfo> bufferInfo;
RefCountedPtr<DShape2DBufferInfo> bufferInfo;
DrawParms* lastParms;