mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-10 22:49:00 +01:00
Oops, committed something I didn't want to commit.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2602 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
7419475959
commit
6e9cc44d20
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="9,00"
|
Version="9.00"
|
||||||
Name="Plugin_VideoDX9"
|
Name="Plugin_VideoDX9"
|
||||||
ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
|
ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
|
||||||
RootNamespace="Plugin_VideoDX9"
|
RootNamespace="Plugin_VideoDX9"
|
||||||
|
@ -43,7 +43,7 @@ LPDIRECT3DVERTEXSHADER9 CompileVertexShader(const char *code, int len, bool asse
|
|||||||
std::string hello = (char*)errorBuffer->GetBufferPointer();
|
std::string hello = (char*)errorBuffer->GetBufferPointer();
|
||||||
hello += "\n\n";
|
hello += "\n\n";
|
||||||
hello += code;
|
hello += code;
|
||||||
//MessageBox(0, hello.c_str(), "Error assembling vertex shader", MB_ICONERROR);
|
MessageBox(0, hello.c_str(), "Error assembling vertex shader", MB_ICONERROR);
|
||||||
vShader = 0;
|
vShader = 0;
|
||||||
}
|
}
|
||||||
else if (SUCCEEDED(hr))
|
else if (SUCCEEDED(hr))
|
||||||
@ -86,7 +86,7 @@ LPDIRECT3DPIXELSHADER9 CompilePixelShader(const char *code, int len, bool assemb
|
|||||||
std::string hello = (char*)errorBuffer->GetBufferPointer();
|
std::string hello = (char*)errorBuffer->GetBufferPointer();
|
||||||
hello += "\n\n";
|
hello += "\n\n";
|
||||||
hello += code;
|
hello += code;
|
||||||
//MessageBox(0, hello.c_str(), "Error assembling pixel shader", MB_ICONERROR);
|
MessageBox(0, hello.c_str(), "Error assembling pixel shader", MB_ICONERROR);
|
||||||
pShader = 0;
|
pShader = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -99,8 +99,8 @@ void PixelShaderCache::SetShader()
|
|||||||
|
|
||||||
INCSTAT(stats.numPixelShadersCreated);
|
INCSTAT(stats.numPixelShadersCreated);
|
||||||
SETSTAT(stats.numPixelShadersAlive, (int)PixelShaders.size());
|
SETSTAT(stats.numPixelShadersAlive, (int)PixelShaders.size());
|
||||||
} else;
|
} else
|
||||||
//PanicAlert("Failed to compile Pixel Shader:\n\n%s", code);
|
PanicAlert("Failed to compile Pixel Shader:\n\n%s", code);
|
||||||
}
|
}
|
||||||
|
|
||||||
LPDIRECT3DPIXELSHADER9 PixelShaderCache::CompileCgShader(const char *pstrprogram)
|
LPDIRECT3DPIXELSHADER9 PixelShaderCache::CompileCgShader(const char *pstrprogram)
|
||||||
|
@ -101,7 +101,7 @@ void VertexShaderCache::SetShader(u32 components)
|
|||||||
INCSTAT(stats.numVertexShadersCreated);
|
INCSTAT(stats.numVertexShadersCreated);
|
||||||
SETSTAT(stats.numVertexShadersAlive, (int)vshaders.size());
|
SETSTAT(stats.numVertexShadersAlive, (int)vshaders.size());
|
||||||
} else {
|
} else {
|
||||||
//PanicAlert("Failed to compile Vertex Shader:\n\n%s", code);
|
PanicAlert("Failed to compile Vertex Shader:\n\n%s", code);
|
||||||
}
|
}
|
||||||
|
|
||||||
D3D::dev->SetFVF(NULL);
|
D3D::dev->SetFVF(NULL);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user