Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-24 14:00:03 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Delete some dead and duplicated code

Browse Source
This commit is contained in:
Henrik Rydgard 2014-09-14 13:23:36 +02:00
parent aa37a98a87
commit a074bf1677
1 changed files with 8 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
GPU/Directx9/helper/global.cpp
View File

@ -140,72 +140,22 @@ bool CompileVertexShader(const char *code, LPDIRECT3DVERTEXSHADER9 *pShader, LPD
}
void CompileShaders() {
ID3DXBuffer* pShaderCode = NULL;
ID3DXBuffer* pErrorMsg = NULL;
std::string errorMsg;
HRESULT hr = -1;
// Compile vertex shader.
hr = dyn_D3DXCompileShader(vscode,
(UINT)strlen(vscode),
NULL,
NULL,
"main",
"vs_2_0",
0,
&pShaderCode,
&pErrorMsg,
NULL);
if (pErrorMsg) {
OutputDebugStringA((CHAR*)pErrorMsg->GetBufferPointer());
pErrorMsg->Release();
}
if (FAILED(hr)) {
if (!CompileVertexShader(vscode, &pFramebufferVertexShader, NULL, errorMsg)) {
OutputDebugStringA(errorMsg.c_str());
DebugBreak();
}
// Create pixel shader.
pD3Ddevice->CreateVertexShader( (DWORD*)pShaderCode->GetBufferPointer(),
&pFramebufferVertexShader );
pShaderCode->Release();
if (pErrorMsg) {
OutputDebugStringA((CHAR*)pErrorMsg->GetBufferPointer());
pErrorMsg->Release();
}
// Compile pixel shader.
hr = dyn_D3DXCompileShader(pscode,
(UINT)strlen(pscode),
NULL,
NULL,
"main",
"ps_2_0",
0,
&pShaderCode,
&pErrorMsg,
NULL);
if (pErrorMsg) {
OutputDebugStringA((CHAR*)pErrorMsg->GetBufferPointer());
pErrorMsg->Release();
}
if (FAILED(hr)) {
if (!CompilePixelShader(pscode, &pFramebufferPixelShader, NULL, errorMsg)) {
OutputDebugStringA(errorMsg.c_str());
DebugBreak();
}
// Create pixel shader.
pD3Ddevice->CreatePixelShader( (DWORD*)pShaderCode->GetBufferPointer(),
&pFramebufferPixelShader );
pShaderCode->Release();
pD3Ddevice->CreateVertexDeclaration( VertexElements, &pFramebufferVertexDecl );
pD3Ddevice->SetVertexDeclaration( pFramebufferVertexDecl );
pD3Ddevice->CreateVertexDeclaration( SoftTransVertexElements, &pSoftVertexDecl );
pD3Ddevice->CreateVertexDeclaration(VertexElements, &pFramebufferVertexDecl);
pD3Ddevice->SetVertexDeclaration(pFramebufferVertexDecl);
pD3Ddevice->CreateVertexDeclaration(SoftTransVertexElements, &pSoftVertexDecl);
}
void DestroyShaders() {
@ -223,8 +173,6 @@ void DestroyShaders() {
}
}
bool useVsync = false;
// Only used by Headless! TODO: Remove
void DirectxInit(HWND window) {
pD3D = Direct3DCreate9( D3D_SDK_VERSION );
@ -265,15 +213,4 @@ void DirectxInit(HWND window) {
fbo_init();
}
void BeginFrame() {
pD3Ddevice->Clear(0, NULL, D3DCLEAR_STENCIL|D3DCLEAR_TARGET|D3DCLEAR_ZBUFFER, D3DCOLOR_ARGB(0, 0, 0, 0), 1.f, 0);
}
void EndFrame() {
}
void SwapBuffers() {
pD3Ddevice->Present(NULL, NULL, NULL, NULL);
}
};