mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-05 17:40:39 +00:00
[Coverity] Fix some more uninitialised values/members
This commit is contained in:
@@ -83,7 +83,7 @@ struct WrappedID3D11Debug : public ID3D11Debug
|
||||
WrappedID3D11Device *m_pDevice;
|
||||
ID3D11Debug *m_pDebug;
|
||||
|
||||
WrappedID3D11Debug() {}
|
||||
WrappedID3D11Debug() : m_pDevice(NULL), m_pDebug(NULL) {}
|
||||
//////////////////////////////
|
||||
// implement IUnknown
|
||||
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
|
||||
|
||||
@@ -290,6 +290,23 @@ FetchTexture D3D11Replay::GetTexture(ResourceId id)
|
||||
return tex;
|
||||
}
|
||||
|
||||
RDCERR("Unrecognised/unknown texture %llu", id);
|
||||
|
||||
tex.name = "Unrecognised/unknown texture";
|
||||
tex.customName = true;
|
||||
tex.byteSize = 0;
|
||||
tex.dimension = 2;
|
||||
tex.resType = eResType_Texture2D;
|
||||
tex.width = 1;
|
||||
tex.height = 1;
|
||||
tex.depth = 1;
|
||||
tex.cubemap = false;
|
||||
tex.mips = 1;
|
||||
tex.arraysize = 1;
|
||||
tex.numSubresources = 1;
|
||||
tex.msQual = 0;
|
||||
tex.msSamp = 1;
|
||||
|
||||
return tex;
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ struct DummyID3D12DebugCommandList : public ID3D12DebugCommandList
|
||||
WrappedID3D12GraphicsCommandList *m_pList;
|
||||
ID3D12DebugCommandList *m_pReal;
|
||||
|
||||
DummyID3D12DebugCommandList() {}
|
||||
DummyID3D12DebugCommandList() : m_pList(NULL), m_pReal(NULL) {}
|
||||
//////////////////////////////
|
||||
// implement IUnknown
|
||||
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject)
|
||||
|
||||
@@ -37,7 +37,7 @@ struct DummyID3D12DebugCommandQueue : public ID3D12DebugCommandQueue
|
||||
WrappedID3D12CommandQueue *m_pQueue;
|
||||
ID3D12DebugCommandQueue *m_pReal;
|
||||
|
||||
DummyID3D12DebugCommandQueue() {}
|
||||
DummyID3D12DebugCommandQueue() : m_pQueue(NULL), m_pReal(NULL) {}
|
||||
//////////////////////////////
|
||||
// implement IUnknown
|
||||
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject)
|
||||
|
||||
@@ -161,7 +161,7 @@ struct WrappedID3D12DebugDevice : public ID3D12DebugDevice
|
||||
WrappedID3D12Device *m_pDevice;
|
||||
ID3D12DebugDevice *m_pDebug;
|
||||
|
||||
WrappedID3D12DebugDevice() {}
|
||||
WrappedID3D12DebugDevice() : m_pDevice(NULL), m_pDebug(NULL) {}
|
||||
//////////////////////////////
|
||||
// implement IUnknown
|
||||
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
|
||||
@@ -194,7 +194,7 @@ struct DummyID3D12DebugDevice : public ID3D12DebugDevice
|
||||
{
|
||||
WrappedID3D12Device *m_pDevice;
|
||||
|
||||
DummyID3D12DebugDevice() {}
|
||||
DummyID3D12DebugDevice() : m_pDevice(NULL) {}
|
||||
//////////////////////////////
|
||||
// implement IUnknown
|
||||
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject);
|
||||
|
||||
@@ -32,7 +32,11 @@
|
||||
class TrackedResource
|
||||
{
|
||||
public:
|
||||
TrackedResource() { m_ID = ResourceIDGen::GetNewUniqueID(); }
|
||||
TrackedResource()
|
||||
{
|
||||
m_ID = ResourceIDGen::GetNewUniqueID();
|
||||
m_pRecord = NULL;
|
||||
}
|
||||
ResourceId GetResourceID() { return m_ID; }
|
||||
D3D12ResourceRecord *GetResourceRecord() { return m_pRecord; }
|
||||
void SetResourceRecord(D3D12ResourceRecord *record) { m_pRecord = record; }
|
||||
|
||||
@@ -351,6 +351,8 @@ private:
|
||||
{
|
||||
ContextData()
|
||||
{
|
||||
ctx = NULL;
|
||||
|
||||
built = ready = false;
|
||||
attribsCreate = false;
|
||||
version = 0;
|
||||
|
||||
@@ -393,6 +393,8 @@ public:
|
||||
|
||||
RDCEraseEl(GL);
|
||||
|
||||
m_HasHooks = false;
|
||||
|
||||
m_GLDriver = NULL;
|
||||
|
||||
m_EnabledHooks = true;
|
||||
@@ -542,7 +544,7 @@ DefineGLExtensionHooks();
|
||||
for I in `seq 1 $N`; do echo -n "t$I"; if [ $I -ne $N ]; then echo -n ", "; fi; done;
|
||||
echo "); \\";
|
||||
|
||||
echo -en "\tCONCAT(function, _hooktype) CONCAT(unsupported_real_,function);";
|
||||
echo -en "\tCONCAT(function, _hooktype) CONCAT(unsupported_real_,function) = NULL;";
|
||||
|
||||
echo -en "\tret CONCAT(function,_renderdoc_hooked)(";
|
||||
for I in `seq 1 $N`; do echo -n "t$I p$I"; if [ $I -ne $N ]; then echo -n ", "; fi;
|
||||
@@ -565,7 +567,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper0
|
||||
#define HookWrapper0(ret, function) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)() \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -580,7 +582,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper1
|
||||
#define HookWrapper1(ret, function, t1, p1) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1) \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -595,7 +597,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper2
|
||||
#define HookWrapper2(ret, function, t1, p1, t2, p2) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2) \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -610,7 +612,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper3
|
||||
#define HookWrapper3(ret, function, t1, p1, t2, p2, t3, p3) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3) \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -625,7 +627,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper4
|
||||
#define HookWrapper4(ret, function, t1, p1, t2, p2, t3, p3, t4, p4) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4) \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -640,7 +642,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper5
|
||||
#define HookWrapper5(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5) \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -655,7 +657,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper6
|
||||
#define HookWrapper6(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6) \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -670,7 +672,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper7
|
||||
#define HookWrapper7(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7) \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -685,7 +687,7 @@ DefineGLExtensionHooks();
|
||||
#undef HookWrapper8
|
||||
#define HookWrapper8(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, p8) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7, t8); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8) \
|
||||
{ \
|
||||
static bool hit = false; \
|
||||
@@ -701,7 +703,7 @@ DefineGLExtensionHooks();
|
||||
#define HookWrapper9(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7, t8, t9); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8, \
|
||||
t9 p9) \
|
||||
{ \
|
||||
@@ -718,7 +720,7 @@ DefineGLExtensionHooks();
|
||||
#define HookWrapper10(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8, \
|
||||
t9 p9, t10 p10) \
|
||||
{ \
|
||||
@@ -735,7 +737,7 @@ DefineGLExtensionHooks();
|
||||
#define HookWrapper11(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10, t11, p11) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8, \
|
||||
t9 p9, t10 p10, t11 p11) \
|
||||
{ \
|
||||
@@ -752,7 +754,7 @@ DefineGLExtensionHooks();
|
||||
#define HookWrapper12(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10, t11, p11, t12, p12) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8, \
|
||||
t9 p9, t10 p10, t11 p11, t12 p12) \
|
||||
{ \
|
||||
@@ -770,7 +772,7 @@ DefineGLExtensionHooks();
|
||||
p8, t9, p9, t10, p10, t11, p11, t12, p12, t13, p13) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, \
|
||||
t13); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8, \
|
||||
t9 p9, t10 p10, t11 p11, t12 p12, t13 p13) \
|
||||
{ \
|
||||
@@ -789,7 +791,7 @@ DefineGLExtensionHooks();
|
||||
p8, t9, p9, t10, p10, t11, p11, t12, p12, t13, p13, t14, p14) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, \
|
||||
t13, t14); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8, \
|
||||
t9 p9, t10 p10, t11 p11, t12 p12, t13 p13, t14 p14) \
|
||||
{ \
|
||||
@@ -808,7 +810,7 @@ DefineGLExtensionHooks();
|
||||
p8, t9, p9, t10, p10, t11, p11, t12, p12, t13, p13, t14, p14, t15, p15) \
|
||||
typedef ret (*CONCAT(function, _hooktype))(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, \
|
||||
t13, t14, t15); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function); \
|
||||
CONCAT(function, _hooktype) CONCAT(unsupported_real_, function) = NULL; \
|
||||
ret CONCAT(function, _renderdoc_hooked)(t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8, \
|
||||
t9 p9, t10 p10, t11 p11, t12 p12, t13 p13, t14 p14, \
|
||||
t15 p15) \
|
||||
|
||||
@@ -318,12 +318,16 @@ public:
|
||||
|
||||
m_GLDriver = NULL;
|
||||
|
||||
m_HasHooks = false;
|
||||
|
||||
m_HaveContextCreation = false;
|
||||
|
||||
m_EnabledHooks = true;
|
||||
m_PopulatedHooks = false;
|
||||
|
||||
m_CreatingContext = false;
|
||||
|
||||
SetUnsupportedFunctionPointersToNULL();
|
||||
}
|
||||
~OpenGLHook() { delete m_GLDriver; }
|
||||
bool CreateHooks(const char *libName)
|
||||
@@ -1206,6 +1210,95 @@ private:
|
||||
}
|
||||
|
||||
DefineUnsupportedDummies();
|
||||
|
||||
/*
|
||||
in bash:
|
||||
|
||||
function HookWrapper()
|
||||
{
|
||||
N=$1;
|
||||
echo "#undef HookWrapper$N";
|
||||
echo -n "#define HookWrapper$N(ret, function";
|
||||
for I in `seq 1 $N`; do echo -n ", t$I, p$I"; done;
|
||||
echo ") \\";
|
||||
|
||||
echo -e "\tCONCAT(unsupported_real_,function) = NULL;";
|
||||
}
|
||||
|
||||
for I in `seq 0 15`; do HookWrapper $I; echo; done
|
||||
*/
|
||||
void SetUnsupportedFunctionPointersToNULL()
|
||||
{
|
||||
#undef HookWrapper0
|
||||
#define HookWrapper0(ret, function) CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper1
|
||||
#define HookWrapper1(ret, function, t1, p1) CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper2
|
||||
#define HookWrapper2(ret, function, t1, p1, t2, p2) CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper3
|
||||
#define HookWrapper3(ret, function, t1, p1, t2, p2, t3, p3) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper4
|
||||
#define HookWrapper4(ret, function, t1, p1, t2, p2, t3, p3, t4, p4) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper5
|
||||
#define HookWrapper5(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper6
|
||||
#define HookWrapper6(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper7
|
||||
#define HookWrapper7(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper8
|
||||
#define HookWrapper8(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, p8) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper9
|
||||
#define HookWrapper9(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper10
|
||||
#define HookWrapper10(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper11
|
||||
#define HookWrapper11(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10, t11, p11) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper12
|
||||
#define HookWrapper12(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10, t11, p11, t12, p12) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper13
|
||||
#define HookWrapper13(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10, t11, p11, t12, p12, t13, p13) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper14
|
||||
#define HookWrapper14(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10, t11, p11, t12, p12, t13, p13, t14, p14) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
#undef HookWrapper15
|
||||
#define HookWrapper15(ret, function, t1, p1, t2, p2, t3, p3, t4, p4, t5, p5, t6, p6, t7, p7, t8, \
|
||||
p8, t9, p9, t10, p10, t11, p11, t12, p12, t13, p13, t14, p14, t15, p15) \
|
||||
CONCAT(unsupported_real_, function) = NULL;
|
||||
|
||||
DefineUnsupportedDummies();
|
||||
}
|
||||
};
|
||||
|
||||
OpenGLHook OpenGLHook::glhooks;
|
||||
|
||||
@@ -93,11 +93,13 @@ struct GLResource
|
||||
GLResource()
|
||||
{
|
||||
Namespace = eResUnknown;
|
||||
Context = NULL;
|
||||
name = ~0U;
|
||||
}
|
||||
GLResource(NullInitialiser)
|
||||
{
|
||||
Namespace = eResUnknown;
|
||||
Context = NULL;
|
||||
name = ~0U;
|
||||
}
|
||||
GLResource(void *ctx, GLNamespace n, GLuint i)
|
||||
|
||||
@@ -3534,7 +3534,7 @@ bool WrappedOpenGL::Serialise_glTextureStorage1DEXT(GLuint texture, GLenum targe
|
||||
|
||||
if(m_State == READING)
|
||||
{
|
||||
GLenum dummy;
|
||||
GLenum dummy = eGL_NONE;
|
||||
bool emulated = EmulateLuminanceFormat(m_Real, GetResourceManager()->GetLiveResource(id).name,
|
||||
Target, Format, dummy);
|
||||
|
||||
@@ -3652,7 +3652,7 @@ bool WrappedOpenGL::Serialise_glTextureStorage2DEXT(GLuint texture, GLenum targe
|
||||
|
||||
if(m_State == READING)
|
||||
{
|
||||
GLenum dummy;
|
||||
GLenum dummy = eGL_NONE;
|
||||
bool emulated = EmulateLuminanceFormat(m_Real, GetResourceManager()->GetLiveResource(id).name,
|
||||
Target, Format, dummy);
|
||||
|
||||
@@ -3774,7 +3774,7 @@ bool WrappedOpenGL::Serialise_glTextureStorage3DEXT(GLuint texture, GLenum targe
|
||||
|
||||
if(m_State == READING)
|
||||
{
|
||||
GLenum dummy;
|
||||
GLenum dummy = eGL_NONE;
|
||||
bool emulated = EmulateLuminanceFormat(m_Real, GetResourceManager()->GetLiveResource(id).name,
|
||||
Target, Format, dummy);
|
||||
|
||||
@@ -3899,7 +3899,7 @@ bool WrappedOpenGL::Serialise_glTextureStorage2DMultisampleEXT(GLuint texture, G
|
||||
|
||||
if(m_State == READING)
|
||||
{
|
||||
GLenum dummy;
|
||||
GLenum dummy = eGL_NONE;
|
||||
bool emulated = EmulateLuminanceFormat(m_Real, GetResourceManager()->GetLiveResource(id).name,
|
||||
Target, Format, dummy);
|
||||
|
||||
@@ -4063,7 +4063,7 @@ bool WrappedOpenGL::Serialise_glTextureStorage3DMultisampleEXT(GLuint texture, G
|
||||
|
||||
if(m_State == READING)
|
||||
{
|
||||
GLenum dummy;
|
||||
GLenum dummy = eGL_NONE;
|
||||
bool emulated = EmulateLuminanceFormat(m_Real, GetResourceManager()->GetLiveResource(id).name,
|
||||
Target, Format, dummy);
|
||||
|
||||
|
||||
@@ -284,6 +284,9 @@ WrappedVulkan::WrappedVulkan(const char *logFilename) : m_RenderState(&m_Creatio
|
||||
|
||||
m_DrawcallCallback = NULL;
|
||||
|
||||
m_CurChunkOffset = 0;
|
||||
m_AddedDrawcall = false;
|
||||
|
||||
m_LastCmdBufferID = ResourceId();
|
||||
|
||||
m_DrawcallStack.push_back(&m_ParentDrawcall);
|
||||
@@ -292,9 +295,19 @@ WrappedVulkan::WrappedVulkan(const char *logFilename) : m_RenderState(&m_Creatio
|
||||
|
||||
m_ResourceManager = new VulkanResourceManager(m_State, m_pSerialiser, this);
|
||||
|
||||
m_DebugManager = NULL;
|
||||
|
||||
m_pSerialiser->SetUserData(m_ResourceManager);
|
||||
m_RenderState.m_ResourceManager = GetResourceManager();
|
||||
|
||||
m_Instance = VK_NULL_HANDLE;
|
||||
m_PhysicalDevice = VK_NULL_HANDLE;
|
||||
m_Device = VK_NULL_HANDLE;
|
||||
m_Queue = VK_NULL_HANDLE;
|
||||
m_QueueFamilyIdx = 0;
|
||||
m_SupportedQueueFamily = 0;
|
||||
m_DbgMsgCallback = NULL;
|
||||
|
||||
m_HeaderChunk = NULL;
|
||||
|
||||
if(!RenderDoc::Inst().IsReplayApp())
|
||||
|
||||
@@ -260,8 +260,12 @@ private:
|
||||
{
|
||||
PhysicalDeviceData() : readbackMemIndex(0), uploadMemIndex(0), GPULocalMemIndex(0)
|
||||
{
|
||||
fakeMemProps = NULL;
|
||||
memIdxMap = NULL;
|
||||
RDCEraseEl(features);
|
||||
RDCEraseEl(props);
|
||||
RDCEraseEl(memProps);
|
||||
RDCEraseEl(fmtprops);
|
||||
}
|
||||
|
||||
uint32_t GetMemoryIndex(uint32_t resourceRequiredBitmask, uint32_t allocRequiredProps,
|
||||
|
||||
@@ -32,8 +32,7 @@
|
||||
#include "vk_debug.h"
|
||||
#include "vk_resources.h"
|
||||
|
||||
VulkanReplay::OutputWindow::OutputWindow()
|
||||
: wnd(NULL_WND_HANDLE), width(0), height(0), dsimg(VK_NULL_HANDLE), dsmem(VK_NULL_HANDLE)
|
||||
VulkanReplay::OutputWindow::OutputWindow() : wnd(NULL_WND_HANDLE), width(0), height(0)
|
||||
{
|
||||
surface = VK_NULL_HANDLE;
|
||||
swap = VK_NULL_HANDLE;
|
||||
@@ -47,12 +46,23 @@ VulkanReplay::OutputWindow::OutputWindow()
|
||||
failures = recreatePause = 0;
|
||||
|
||||
bb = VK_NULL_HANDLE;
|
||||
bbmem = VK_NULL_HANDLE;
|
||||
bbview = VK_NULL_HANDLE;
|
||||
|
||||
dsimg = VK_NULL_HANDLE;
|
||||
dsmem = VK_NULL_HANDLE;
|
||||
dsview = VK_NULL_HANDLE;
|
||||
|
||||
fb = VK_NULL_HANDLE;
|
||||
fbdepth = VK_NULL_HANDLE;
|
||||
rp = VK_NULL_HANDLE;
|
||||
rpdepth = VK_NULL_HANDLE;
|
||||
|
||||
numImgs = 0;
|
||||
curidx = 0;
|
||||
|
||||
m_ResourceManager = NULL;
|
||||
|
||||
VkImageMemoryBarrier t = {
|
||||
VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
|
||||
NULL,
|
||||
|
||||
@@ -43,6 +43,8 @@ VulkanRenderState::VulkanRenderState(VulkanCreationInfo *createInfo) : m_Creatio
|
||||
RDCEraseEl(back);
|
||||
RDCEraseEl(pushconsts);
|
||||
|
||||
m_ResourceManager = NULL;
|
||||
|
||||
renderPass = ResourceId();
|
||||
subpass = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user