archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix an error message in d3d plugin

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2618 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-03-08 19:36:00 +00:00
parent c6ffcec991
commit bdb41dfe2f
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
View file

@ -69,7 +69,6 @@ D3DDECLTYPE VarToD3D(VarType t)
// TODO: Ban signed bytes as normals - not likely that ATI supports them natively.
// We probably won't see much of a speed loss, and any speed loss will be regained anyway
// when we finally compile display lists.
void D3DVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
{
vertex_stride = _vtx_decl.stride;
@ -125,7 +124,7 @@ void D3DVertexFormat::Initialize(const PortableVertexDeclaration &_vtx_decl)
if (_vtx_decl.posmtx_offset != -1)
{
PanicAlert("boo %i", _vtx_decl.posmtx_offset);
PanicAlert("Posmtx stream not supported correctly. %i", _vtx_decl.posmtx_offset);
// glVertexAttribPointer(SHADER_POSMTX_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_FALSE, vtx_decl.stride, (void *)vtx_decl.posmtx_offset);
elems[elem_idx].Offset = _vtx_decl.posmtx_offset;
elems[elem_idx].Usage = D3DDECLUSAGE_BLENDINDICES;

5
Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
View file

@ -100,8 +100,11 @@ void PixelShaderCache::SetShader()
INCSTAT(stats.numPixelShadersCreated);
SETSTAT(stats.numPixelShadersAlive, (int)PixelShaders.size());
} else if(g_Config.bShowShaderErrors)
}
else if (g_Config.bShowShaderErrors)
{
PanicAlert("Failed to compile Pixel Shader:\n\n%s", code);
}
}
LPDIRECT3DPIXELSHADER9 PixelShaderCache::CompileCgShader(const char *pstrprogram)

6
Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
View file

@ -100,9 +100,11 @@ void VertexShaderCache::SetShader(u32 components)
INCSTAT(stats.numVertexShadersCreated);
SETSTAT(stats.numVertexShadersAlive, (int)vshaders.size());
} else if(g_Config.bShowShaderErrors)
}
else if (g_Config.bShowShaderErrors)
{
PanicAlert("Failed to compile Vertex Shader:\n\n%s", code);
}
D3D::dev->SetFVF(NULL);
D3D::dev->SetVertexShader(shader);
}