mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 10:37:41 -04:00
Fix line endings and tabs
This commit is contained in:
Branan Purvine-Riley
@ -1,149 +1,149 @@
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
#include "hsConfig.h"
|
||||
#include "hsWindows.h"
|
||||
|
||||
#include <D3d9.h>
|
||||
#include <D3dx9core.h>
|
||||
|
||||
#include "hsTypes.h"
|
||||
|
||||
#include "plDXPixelShader.h"
|
||||
|
||||
#include "plSurface/plShader.h"
|
||||
|
||||
#include "plDXPipeline.h"
|
||||
|
||||
|
||||
plDXPixelShader::plDXPixelShader(plShader* owner)
|
||||
: plDXShader(owner), fHandle(nil)
|
||||
{
|
||||
}
|
||||
|
||||
plDXPixelShader::~plDXPixelShader()
|
||||
{
|
||||
Release();
|
||||
}
|
||||
|
||||
void plDXPixelShader::Release()
|
||||
{
|
||||
ReleaseObject(fHandle);
|
||||
fHandle = nil;
|
||||
fPipe = nil;
|
||||
|
||||
ISetError(nil);
|
||||
}
|
||||
|
||||
hsBool plDXPixelShader::VerifyFormat(UInt8 format) const
|
||||
{
|
||||
return (fOwner->GetInputFormat() & format) == fOwner->GetInputFormat();
|
||||
}
|
||||
|
||||
IDirect3DPixelShader9 *plDXPixelShader::GetShader(plDXPipeline* pipe)
|
||||
{
|
||||
HRESULT hr = S_OK;
|
||||
if ( !fHandle )
|
||||
{
|
||||
if( FAILED(hr = ICreate(pipe)) )
|
||||
return nil;
|
||||
}
|
||||
|
||||
if( FAILED(hr = ISetConstants(pipe)) )
|
||||
return nil;
|
||||
|
||||
return fHandle;
|
||||
}
|
||||
|
||||
HRESULT plDXPixelShader::ICreate(plDXPipeline* pipe)
|
||||
{
|
||||
fHandle = nil; // in case something goes wrong.
|
||||
fPipe = nil;
|
||||
ISetError(nil);
|
||||
|
||||
#ifdef HS_DEBUGGING
|
||||
DWORD flags = D3DXSHADER_DEBUG | D3DXSHADER_SKIPOPTIMIZATION;
|
||||
#else // HS_DEBUGGING
|
||||
DWORD flags = 0;
|
||||
#endif // HS_DEBUGGING
|
||||
|
||||
DWORD* shaderCodes = nil;
|
||||
|
||||
HRESULT hr = S_OK;
|
||||
if( plShaderTable::LoadFromFile() || !fOwner->GetDecl()->GetCodes() )
|
||||
{
|
||||
if( fOwner->GetDecl()->GetFileName() )
|
||||
{
|
||||
LPD3DXBUFFER compiledShader = nil;
|
||||
LPD3DXBUFFER compilationErrors = nil;
|
||||
|
||||
hr = D3DXAssembleShaderFromFile(
|
||||
fOwner->GetDecl()->GetFileName(),
|
||||
NULL, NULL, flags,
|
||||
&compiledShader,
|
||||
&compilationErrors);
|
||||
|
||||
if( FAILED(hr) )
|
||||
{
|
||||
return IOnError(hr, compilationErrors ? (char*)compilationErrors->GetBufferPointer() : "File not found");
|
||||
}
|
||||
|
||||
shaderCodes = (DWORD*)(compiledShader->GetBufferPointer());
|
||||
}
|
||||
}
|
||||
if( !shaderCodes )
|
||||
{
|
||||
shaderCodes = (DWORD*)(fOwner->GetDecl()->GetCodes());
|
||||
}
|
||||
if( !shaderCodes )
|
||||
return IOnError(-1, "No file and no compiled codes");
|
||||
|
||||
hr = pipe->GetD3DDevice()->CreatePixelShader(shaderCodes, &fHandle);
|
||||
if( FAILED(hr) )
|
||||
{
|
||||
return IOnError(hr, "Error on CreatePixelShader");
|
||||
}
|
||||
|
||||
hsAssert(fHandle, "No error, but no pixel shader handle. Grrrr.");
|
||||
|
||||
fPipe = pipe;
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT plDXPixelShader::ISetConstants(plDXPipeline* pipe)
|
||||
{
|
||||
hsAssert(fHandle, "Pixel shader called to set constants without initialization");
|
||||
if( fOwner->GetNumConsts() )
|
||||
{
|
||||
HRESULT hr = pipe->GetD3DDevice()->SetPixelShaderConstantF(0,
|
||||
(float*)fOwner->GetConstBasePtr(),
|
||||
fOwner->GetNumConsts());
|
||||
if( FAILED(hr) )
|
||||
return IOnError(hr, "Error setting constants");
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
/*==LICENSE==*
|
||||
|
||||
CyanWorlds.com Engine - MMOG client, server and tools
|
||||
Copyright (C) 2011 Cyan Worlds, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
or by snail mail at:
|
||||
Cyan Worlds, Inc.
|
||||
14617 N Newport Hwy
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
#include "hsConfig.h"
|
||||
#include "hsWindows.h"
|
||||
|
||||
#include <D3d9.h>
|
||||
#include <D3dx9core.h>
|
||||
|
||||
#include "hsTypes.h"
|
||||
|
||||
#include "plDXPixelShader.h"
|
||||
|
||||
#include "plSurface/plShader.h"
|
||||
|
||||
#include "plDXPipeline.h"
|
||||
|
||||
|
||||
plDXPixelShader::plDXPixelShader(plShader* owner)
|
||||
: plDXShader(owner), fHandle(nil)
|
||||
{
|
||||
}
|
||||
|
||||
plDXPixelShader::~plDXPixelShader()
|
||||
{
|
||||
Release();
|
||||
}
|
||||
|
||||
void plDXPixelShader::Release()
|
||||
{
|
||||
ReleaseObject(fHandle);
|
||||
fHandle = nil;
|
||||
fPipe = nil;
|
||||
|
||||
ISetError(nil);
|
||||
}
|
||||
|
||||
hsBool plDXPixelShader::VerifyFormat(UInt8 format) const
|
||||
{
|
||||
return (fOwner->GetInputFormat() & format) == fOwner->GetInputFormat();
|
||||
}
|
||||
|
||||
IDirect3DPixelShader9 *plDXPixelShader::GetShader(plDXPipeline* pipe)
|
||||
{
|
||||
HRESULT hr = S_OK;
|
||||
if ( !fHandle )
|
||||
{
|
||||
if( FAILED(hr = ICreate(pipe)) )
|
||||
return nil;
|
||||
}
|
||||
|
||||
if( FAILED(hr = ISetConstants(pipe)) )
|
||||
return nil;
|
||||
|
||||
return fHandle;
|
||||
}
|
||||
|
||||
HRESULT plDXPixelShader::ICreate(plDXPipeline* pipe)
|
||||
{
|
||||
fHandle = nil; // in case something goes wrong.
|
||||
fPipe = nil;
|
||||
ISetError(nil);
|
||||
|
||||
#ifdef HS_DEBUGGING
|
||||
DWORD flags = D3DXSHADER_DEBUG | D3DXSHADER_SKIPOPTIMIZATION;
|
||||
#else // HS_DEBUGGING
|
||||
DWORD flags = 0;
|
||||
#endif // HS_DEBUGGING
|
||||
|
||||
DWORD* shaderCodes = nil;
|
||||
|
||||
HRESULT hr = S_OK;
|
||||
if( plShaderTable::LoadFromFile() || !fOwner->GetDecl()->GetCodes() )
|
||||
{
|
||||
if( fOwner->GetDecl()->GetFileName() )
|
||||
{
|
||||
LPD3DXBUFFER compiledShader = nil;
|
||||
LPD3DXBUFFER compilationErrors = nil;
|
||||
|
||||
hr = D3DXAssembleShaderFromFile(
|
||||
fOwner->GetDecl()->GetFileName(),
|
||||
NULL, NULL, flags,
|
||||
&compiledShader,
|
||||
&compilationErrors);
|
||||
|
||||
if( FAILED(hr) )
|
||||
{
|
||||
return IOnError(hr, compilationErrors ? (char*)compilationErrors->GetBufferPointer() : "File not found");
|
||||
}
|
||||
|
||||
shaderCodes = (DWORD*)(compiledShader->GetBufferPointer());
|
||||
}
|
||||
}
|
||||
if( !shaderCodes )
|
||||
{
|
||||
shaderCodes = (DWORD*)(fOwner->GetDecl()->GetCodes());
|
||||
}
|
||||
if( !shaderCodes )
|
||||
return IOnError(-1, "No file and no compiled codes");
|
||||
|
||||
hr = pipe->GetD3DDevice()->CreatePixelShader(shaderCodes, &fHandle);
|
||||
if( FAILED(hr) )
|
||||
{
|
||||
return IOnError(hr, "Error on CreatePixelShader");
|
||||
}
|
||||
|
||||
hsAssert(fHandle, "No error, but no pixel shader handle. Grrrr.");
|
||||
|
||||
fPipe = pipe;
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT plDXPixelShader::ISetConstants(plDXPipeline* pipe)
|
||||
{
|
||||
hsAssert(fHandle, "Pixel shader called to set constants without initialization");
|
||||
if( fOwner->GetNumConsts() )
|
||||
{
|
||||
HRESULT hr = pipe->GetD3DDevice()->SetPixelShaderConstantF(0,
|
||||
(float*)fOwner->GetConstBasePtr(),
|
||||
fOwner->GetNumConsts());
|
||||
if( FAILED(hr) )
|
||||
return IOnError(hr, "Error setting constants");
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user