lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-20 22:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor BufferViewer to avoid race conditions

Browse Source 
* We now push everything mutable about the draw data configuration into a single
  struct which we copy around (the actual buffer data remains refcounted and not
  copied). This means that we don't have one thread still trying to do things on
  a model which is being updated on another thread.
This commit is contained in:
baldurk
2019-02-28 17:48:30 +00:00
parent 7541dc6bc7
commit ac37a592cc
2 changed files with 962 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/BufferViewer.cpp
+941 -947
View File
File diff suppressed because it is too large Load Diff
qrenderdoc/Windows/BufferViewer.h
+21 -46
View File
@@ -42,6 +42,8 @@ class CameraWrapper;
class ArcballWrapper;
class FlycamWrapper;
struct BufferData;
struct PopulateBufferData;
struct CalcBoundingBoxData;
struct BufferExport
{
@@ -56,6 +58,15 @@ struct BufferExport
BufferExport(ExportFormat f) : format(f) {}
};
struct BBoxData
{
struct
{
QList<FloatVector> Min;
QList<FloatVector> Max;
} bounds[3];
};
class BufferViewer : public QFrame, public IBufferViewer, public ICaptureViewer
{
Q_OBJECT
@@ -70,12 +81,7 @@ public:
QWidget *Widget() override { return this; }
void ScrollToRow(int row, MeshDataStage stage = MeshDataStage::VSIn) override
{
if(stage == MeshDataStage::VSOut)
ScrollToRow(m_ModelVSOut, row);
else if(stage == MeshDataStage::GSOut)
ScrollToRow(m_ModelGSOut, row);
else
ScrollToRow(m_ModelVSIn, row);
ScrollToRow(tableForStage(stage), row);
}
void ViewBuffer(uint64_t byteOffset, uint64_t byteSize, ResourceId id,
const rdcstr &format = "") override;
@@ -141,56 +147,28 @@ private:
void configureDrawRange();
void RT_UpdateAndDisplay(IReplayController *);
void RT_FetchMeshData(IReplayController *r);
void RT_UpdateAndDisplay(IReplayController *r);
MeshDisplay m_Config;
MeshDataStage m_CurStage;
// data from mesh output
MeshFormat m_PostVS;
MeshFormat m_PostGS;
// cached data from PostVS data
MeshFormat m_PostVS, m_PostGS;
// the configurations for 3D preview
MeshFormat m_VSInPosition, m_VSInSecondary;
MeshFormat m_PostVSPosition, m_PostVSSecondary;
MeshFormat m_PostGSPosition, m_PostGSSecondary;
struct BBoxData
{
struct
{
QList<FloatVector> Min;
QList<FloatVector> Max;
} bounds[3];
};
struct CalcBoundingBoxData
{
uint32_t eventId;
uint32_t inst;
struct StageData
{
QList<FormatElement> elements;
uint32_t count;
BufferData *indices = NULL;
int32_t baseVertex;
uint32_t primRestart;
QList<BufferData *> buffers;
} input[3];
BBoxData output;
};
QMutex m_BBoxLock;
QMap<uint32_t, BBoxData> m_BBoxes;
void populateBBox(PopulateBufferData *data);
void calcBoundingData(CalcBoundingBoxData &bbox);
void updateBoundingBox(const CalcBoundingBoxData &bbox);
void UI_UpdateBoundingBox(const CalcBoundingBoxData &bbox);
void resetArcball();
void UI_ResetArcball();
// data from raw buffer view
bool m_IsBuffer = true;
@@ -252,12 +230,9 @@ private:
void ClearModels();
void guessPositionColumn(BufferItemModel *model);
void guessSecondaryColumn(BufferItemModel *model);
void updatePreviewColumns();
void configureMeshColumns();
void UI_CalculateMeshFormats();
void UpdateMeshConfig();
void UpdateCurrentMeshConfig();
void EnableCameraGuessControls();
void CalcColumnWidth(int maxNumRows = 1);
@@ -265,5 +240,5 @@ private:
void SyncViews(RDTableView *primary, bool selection, bool scroll);
void UpdateHighlightVerts();
void ScrollToRow(BufferItemModel *model, int row);
void ScrollToRow(RDTableView *view, int row);
};