diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-13 13:05:30 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-13 13:05:30 +0400 |
| commit | 0b9ec9a361f62ce15fc58763ca8b533afe405973 (patch) | |
| tree | 02fb318875748db7e28f0b303d9907e58d69ca8c /src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp | |
| parent | d3b052fb035d8b242e4b328722f4ed7ac84ee20c (diff) | |
apply the new astyle command; use 4 spaces for indentation and k&r style
Note: if you have any local patches just run astyle.bat
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5110 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp')
| -rw-r--r-- | src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp b/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp index adb353346..95cfa7d1e 100644 --- a/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp +++ b/src/filters/renderer/VideoRenderers/PixelShaderCompiler.cpp @@ -28,25 +28,25 @@ CPixelShaderCompiler::CPixelShaderCompiler(IDirect3DDevice9* pD3DDev, bool fStaySilent)
- : m_pD3DDev(pD3DDev)
- , m_pD3DXCompileShader(NULL)
- , m_pD3DXDisassembleShader(NULL)
+ : m_pD3DDev(pD3DDev)
+ , m_pD3DXCompileShader(NULL)
+ , m_pD3DXDisassembleShader(NULL)
{
- HINSTANCE hDll;
- hDll = GetRenderersData()->GetD3X9Dll();
-
- if (hDll) {
- m_pD3DXCompileShader = (D3DXCompileShaderPtr)GetProcAddress(hDll, "D3DXCompileShader");
- m_pD3DXDisassembleShader = (D3DXDisassembleShaderPtr)GetProcAddress(hDll, "D3DXDisassembleShader");
- }
-
- if (!fStaySilent) {
- if (!hDll) {
- AfxMessageBox(IDS_PIXELSHADERCOMPILER_0, MB_ICONWARNING | MB_OK, 0);
- } else if (!m_pD3DXCompileShader || !m_pD3DXDisassembleShader) {
- AfxMessageBox(IDS_PIXELSHADERCOMPILER_1, MB_ICONWARNING | MB_OK, 0);
- }
- }
+ HINSTANCE hDll;
+ hDll = GetRenderersData()->GetD3X9Dll();
+
+ if (hDll) {
+ m_pD3DXCompileShader = (D3DXCompileShaderPtr)GetProcAddress(hDll, "D3DXCompileShader");
+ m_pD3DXDisassembleShader = (D3DXDisassembleShaderPtr)GetProcAddress(hDll, "D3DXDisassembleShader");
+ }
+
+ if (!fStaySilent) {
+ if (!hDll) {
+ AfxMessageBox(IDS_PIXELSHADERCOMPILER_0, MB_ICONWARNING | MB_OK, 0);
+ } else if (!m_pD3DXCompileShader || !m_pD3DXDisassembleShader) {
+ AfxMessageBox(IDS_PIXELSHADERCOMPILER_1, MB_ICONWARNING | MB_OK, 0);
+ }
+ }
}
CPixelShaderCompiler::~CPixelShaderCompiler()
@@ -54,54 +54,54 @@ CPixelShaderCompiler::~CPixelShaderCompiler() }
HRESULT CPixelShaderCompiler::CompileShader(
- LPCSTR pSrcData,
- LPCSTR pFunctionName,
- LPCSTR pProfile,
- DWORD Flags,
- IDirect3DPixelShader9** ppPixelShader,
- CString* disasm,
- CString* errmsg)
+ LPCSTR pSrcData,
+ LPCSTR pFunctionName,
+ LPCSTR pProfile,
+ DWORD Flags,
+ IDirect3DPixelShader9** ppPixelShader,
+ CString* disasm,
+ CString* errmsg)
{
- if (!m_pD3DXCompileShader || !m_pD3DXDisassembleShader) {
- return E_FAIL;
- }
-
- HRESULT hr;
-
- CComPtr<ID3DXBuffer> pShader, pDisAsm, pErrorMsgs;
- hr = m_pD3DXCompileShader(pSrcData, (UINT)strlen(pSrcData), NULL, NULL, pFunctionName, pProfile, Flags, &pShader, &pErrorMsgs, NULL);
-
- if (FAILED(hr)) {
- if (errmsg) {
- CStringA msg = "Unexpected compiler error";
-
- if (pErrorMsgs) {
- int len = pErrorMsgs->GetBufferSize();
- memcpy(msg.GetBufferSetLength(len), pErrorMsgs->GetBufferPointer(), len);
- }
-
- *errmsg = msg;
- }
-
- return hr;
- }
-
- if (ppPixelShader) {
- if (!m_pD3DDev) {
- return E_FAIL;
- }
- hr = m_pD3DDev->CreatePixelShader((DWORD*)pShader->GetBufferPointer(), ppPixelShader);
- if (FAILED(hr)) {
- return hr;
- }
- }
-
- if (disasm) {
- hr = m_pD3DXDisassembleShader((DWORD*)pShader->GetBufferPointer(), FALSE, NULL, &pDisAsm);
- if (SUCCEEDED(hr) && pDisAsm) {
- *disasm = CStringA((const char*)pDisAsm->GetBufferPointer());
- }
- }
-
- return S_OK;
+ if (!m_pD3DXCompileShader || !m_pD3DXDisassembleShader) {
+ return E_FAIL;
+ }
+
+ HRESULT hr;
+
+ CComPtr<ID3DXBuffer> pShader, pDisAsm, pErrorMsgs;
+ hr = m_pD3DXCompileShader(pSrcData, (UINT)strlen(pSrcData), NULL, NULL, pFunctionName, pProfile, Flags, &pShader, &pErrorMsgs, NULL);
+
+ if (FAILED(hr)) {
+ if (errmsg) {
+ CStringA msg = "Unexpected compiler error";
+
+ if (pErrorMsgs) {
+ int len = pErrorMsgs->GetBufferSize();
+ memcpy(msg.GetBufferSetLength(len), pErrorMsgs->GetBufferPointer(), len);
+ }
+
+ *errmsg = msg;
+ }
+
+ return hr;
+ }
+
+ if (ppPixelShader) {
+ if (!m_pD3DDev) {
+ return E_FAIL;
+ }
+ hr = m_pD3DDev->CreatePixelShader((DWORD*)pShader->GetBufferPointer(), ppPixelShader);
+ if (FAILED(hr)) {
+ return hr;
+ }
+ }
+
+ if (disasm) {
+ hr = m_pD3DXDisassembleShader((DWORD*)pShader->GetBufferPointer(), FALSE, NULL, &pDisAsm);
+ if (SUCCEEDED(hr) && pDisAsm) {
+ *disasm = CStringA((const char*)pDisAsm->GetBufferPointer());
+ }
+ }
+
+ return S_OK;
}
|