ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

D3D vertex format wrapper: Fix a really small memory leak, add some sanity checks. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4809 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2010-01-11 23:47:32 +00:00
parent 1bca5e8c86
commit 8558f364e1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
View File

@ -59,6 +59,9 @@ D3DVertexFormat::~D3DVertexFormat()
D3DDECLTYPE VarToD3D(VarType t, int size) D3DDECLTYPE VarToD3D(VarType t, int size)
{ {
if (t < 0 || t > 4) {
PanicAlert("VarToD3D: Invalid VarType %i", t);
}
static const D3DDECLTYPE lookup1[5] = { static const D3DDECLTYPE lookup1[5] = {
D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_FLOAT1, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_UNUSED, D3DDECLTYPE_FLOAT1,
}; };
@ -78,6 +81,7 @@ D3DDECLTYPE VarToD3D(VarType t, int size)
case 2: retval = lookup2[t]; break; case 2: retval = lookup2[t]; break;
case 3: retval = lookup3[t]; break; case 3: retval = lookup3[t]; break;
case 4: retval = lookup4[t]; break; case 4: retval = lookup4[t]; break;
default: PanicAlert("VarToD3D: size wrong (%i)", size); break;
} }
if (retval == D3DDECLTYPE_UNUSED) { if (retval == D3DDECLTYPE_UNUSED) {
PanicAlert("VarToD3D: Invalid type/size combo %i , %i", (int)t, size); PanicAlert("VarToD3D: Invalid type/size combo %i , %i", (int)t, size);
@ -157,6 +161,7 @@ void D3DVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
PanicAlert("Failed to create D3D vertex declaration!"); PanicAlert("Failed to create D3D vertex declaration!");
return; return;
} }
delete [] elems;
} }
void D3DVertexFormat::SetupVertexPointers() const void D3DVertexFormat::SetupVertexPointers() const