diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-12-17 19:42:55 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-12-17 19:42:55 +0300 |
| commit | 7359bd509afa235acc2ac2f7f95fc9cb5cafd1a4 (patch) | |
| tree | b5bb90eeca58fdeb9fde6825f21a25a319823cb4 /src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp | |
| parent | d30b15ed4b98c28951d6d45b8928f4c2b6a11129 (diff) | |
apply astyle formatting
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2786 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp')
| -rw-r--r-- | src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp b/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp index 97b02fe56..b8813b4ea 100644 --- a/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp +++ b/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp @@ -35,20 +35,15 @@ CPixelShaderCompiler::CPixelShaderCompiler(IDirect3DDevice9* pD3DDev, bool fStay HINSTANCE hDll;
hDll = GetRenderersData()->GetD3X9Dll();
- if(hDll)
- {
+ if(hDll) {
m_pD3DXCompileShader = (D3DXCompileShaderPtr)GetProcAddress(hDll, "D3DXCompileShader");
m_pD3DXDisassembleShader = (D3DXDisassembleShaderPtr)GetProcAddress(hDll, "D3DXDisassembleShader");
}
- if(!fStaySilent)
- {
- if(!hDll)
- {
+ if(!fStaySilent) {
+ if(!hDll) {
AfxMessageBox(ResStr(IDS_PIXELSHADERCOMPILER_0), MB_OK);
- }
- else if(!m_pD3DXCompileShader || !m_pD3DXDisassembleShader)
- {
+ } else if(!m_pD3DXCompileShader || !m_pD3DXDisassembleShader) {
AfxMessageBox(ResStr(IDS_PIXELSHADERCOMPILER_1), MB_OK);
}
}
@@ -67,22 +62,20 @@ HRESULT CPixelShaderCompiler::CompileShader( CString* disasm,
CString* errmsg)
{
- if(!m_pD3DXCompileShader || !m_pD3DXDisassembleShader)
+ if(!m_pD3DXCompileShader || !m_pD3DXDisassembleShader) {
return E_FAIL;
+ }
HRESULT hr;
CComPtr<ID3DXBuffer> pShader, pDisAsm, pErrorMsgs;
hr = m_pD3DXCompileShader(pSrcData, strlen(pSrcData), NULL, NULL, pFunctionName, pProfile, Flags, &pShader, &pErrorMsgs, NULL);
- if(FAILED(hr))
- {
- if(errmsg)
- {
+ if(FAILED(hr)) {
+ if(errmsg) {
CStringA msg = "Unexpected compiler error";
- if(pErrorMsgs)
- {
+ if(pErrorMsgs) {
int len = pErrorMsgs->GetBufferSize();
memcpy(msg.GetBufferSetLength(len), pErrorMsgs->GetBufferPointer(), len);
}
@@ -93,17 +86,21 @@ HRESULT CPixelShaderCompiler::CompileShader( return hr;
}
- if(ppPixelShader)
- {
- if(!m_pD3DDev) return E_FAIL;
+ if(ppPixelShader) {
+ if(!m_pD3DDev) {
+ return E_FAIL;
+ }
hr = m_pD3DDev->CreatePixelShader((DWORD*)pShader->GetBufferPointer(), ppPixelShader);
- if(FAILED(hr)) return hr;
+ if(FAILED(hr)) {
+ return hr;
+ }
}
- if(disasm)
- {
+ if(disasm) {
hr = m_pD3DXDisassembleShader((DWORD*)pShader->GetBufferPointer(), FALSE, NULL, &pDisAsm);
- if(SUCCEEDED(hr) && pDisAsm) *disasm = CStringA((const char*)pDisAsm->GetBufferPointer());
+ if(SUCCEEDED(hr) && pDisAsm) {
+ *disasm = CStringA((const char*)pDisAsm->GetBufferPointer());
+ }
}
return S_OK;
|