libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-02-03 23:46:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use shaders to render primitives.

Browse Source
This commit is contained in:
Jean-Philip Desjardins 2016-07-28 19:56:42 -04:00
parent 3ef8d468ee
commit 17c6847070
2 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Source/ui_win32/GSH_Direct3D9.cpp
View File

@ -384,6 +384,10 @@ void CGSH_Direct3D9::DrawActiveFramebuffer()
assert(SUCCEEDED(result));
}
m_device->SetVertexDeclaration(nullptr);
m_device->SetVertexShader(nullptr);
m_device->SetPixelShader(nullptr);
D3DVIEWPORT9 viewport = {};
viewport.X = 0;
viewport.Y = 0;
@ -424,32 +428,26 @@ void CGSH_Direct3D9::DrawActiveFramebuffer()
}
}
void CGSH_Direct3D9::SetReadCircuitMatrix(int nWidth, int nHeight)
void CGSH_Direct3D9::SetReadCircuitMatrix(int width, int height)
{
//Setup projection matrix
{
D3DXMATRIX projMatrix;
D3DXMatrixOrthoLH(&projMatrix, static_cast<FLOAT>(nWidth), static_cast<FLOAT>(nHeight), 1.0f, 0.0f);
m_device->SetTransform(D3DTS_PROJECTION, &projMatrix);
}
D3DXMATRIX projMatrix;
D3DXMatrixOrthoLH(&projMatrix, static_cast<FLOAT>(width), static_cast<FLOAT>(height), 1.0f, 0.0f);
//Setup view matrix
{
D3DXMATRIX viewMatrix;
D3DXMatrixLookAtLH(&viewMatrix,
&D3DXVECTOR3(0.0f, 0.0f, 1.0f),
&D3DXVECTOR3(0.0f, 0.0f, 0.0f),
&D3DXVECTOR3(0.0f, -1.0f, 0.0f));
m_device->SetTransform(D3DTS_VIEW, &viewMatrix);
}
D3DXMATRIX viewMatrix;
D3DXMatrixLookAtLH(&viewMatrix,
&D3DXVECTOR3(0.0f, 0.0f, 1.0f),
&D3DXVECTOR3(0.0f, 0.0f, 0.0f),
&D3DXVECTOR3(0.0f, -1.0f, 0.0f));
//Setup world matrix
{
D3DXMATRIX worldMatrix;
D3DXMatrixTranslation(&worldMatrix, -static_cast<FLOAT>(nWidth) / 2.0f, -static_cast<FLOAT>(nHeight) / 2.0f, 0);
m_device->SetTransform(D3DTS_WORLD, &worldMatrix);
}
D3DXMATRIX worldMatrix;
D3DXMatrixTranslation(&worldMatrix, -static_cast<FLOAT>(width) / 2.0f, -static_cast<FLOAT>(height) / 2.0f, 0);
D3DXMATRIX tempMatrix;
D3DXMatrixMultiply(&tempMatrix, &worldMatrix, &viewMatrix);
D3DXMatrixMultiply(reinterpret_cast<D3DXMATRIX*>(&m_projMatrix), &tempMatrix, &projMatrix);
}
bool CGSH_Direct3D9::TestDevice()
@ -551,6 +549,17 @@ void CGSH_Direct3D9::OnDeviceReset()
result = m_device->CreateVertexBuffer(4 * sizeof(PRESENTVERTEX), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, PRESENTFVF, D3DPOOL_DEFAULT, &m_presentVb, nullptr);
assert(SUCCEEDED(result));
static const D3DVERTEXELEMENT9 vertexElements[] =
{
{ 0, offsetof(CUSTOMVERTEX, x), D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0 },
{ 0, offsetof(CUSTOMVERTEX, u), D3DDECLTYPE_FLOAT2, 0, D3DDECLUSAGE_TEXCOORD, 0 },
{ 0, offsetof(CUSTOMVERTEX, color), D3DDECLTYPE_D3DCOLOR, 0, D3DDECLUSAGE_TEXCOORD, 1 },
D3DDECL_END()
};
result = m_device->CreateVertexDeclaration(vertexElements, &m_vertexDeclaration);
assert(SUCCEEDED(result));
{
uint8* buffer = nullptr;
result = m_presentVb->Lock(0, sizeof(g_presentVertices), reinterpret_cast<void**>(&buffer), D3DLOCK_DISCARD);
@ -709,7 +718,7 @@ void CGSH_Direct3D9::Prim_Line()
assert(SUCCEEDED(result));
// select which vertex format we are using
result = m_device->SetFVF(CUSTOMFVF);
result = m_device->SetVertexDeclaration(m_vertexDeclaration);
assert(SUCCEEDED(result));
// select the vertex buffer to display
@ -850,7 +859,7 @@ void CGSH_Direct3D9::Prim_Triangle()
assert(SUCCEEDED(result));
// select which vertex format we are using
result = m_device->SetFVF(CUSTOMFVF);
result = m_device->SetVertexDeclaration(m_vertexDeclaration);
assert(SUCCEEDED(result));
// select the vertex buffer to display
@ -944,7 +953,7 @@ void CGSH_Direct3D9::Prim_Sprite()
assert(SUCCEEDED(result));
// select which vertex format we are using
result = m_device->SetFVF(CUSTOMFVF);
result = m_device->SetVertexDeclaration(m_vertexDeclaration);
assert(SUCCEEDED(result));
// select the vertex buffer to display
@ -972,6 +981,34 @@ void CGSH_Direct3D9::SetRenderingContext(uint64 primReg)
uint64 clampReg = m_nReg[GS_REG_CLAMP_1 + context];
uint64 scissorReg = m_nReg[GS_REG_SCISSOR_1 + context];
//Get shader caps
auto shaderCaps = make_convertible<SHADERCAPS>(0);
shaderCaps.hasTexture = prim.nTexture;
{
auto shaderIterator = m_vertexShaders.find(shaderCaps);
if(shaderIterator == std::end(m_vertexShaders))
{
auto shader = CreateVertexShader(shaderCaps);
m_vertexShaders.insert(std::make_pair(shaderCaps, shader));
shaderIterator = m_vertexShaders.find(shaderCaps);
}
m_device->SetVertexShader(shaderIterator->second);
}
{
auto shaderIterator = m_pixelShaders.find(shaderCaps);
if(shaderIterator == std::end(m_pixelShaders))
{
auto shader = CreatePixelShader(shaderCaps);
m_pixelShaders.insert(std::make_pair(shaderCaps, shader));
shaderIterator = m_pixelShaders.find(shaderCaps);
}
m_device->SetPixelShader(shaderIterator->second);
}
if(!m_renderState.isValid ||
(m_renderState.primReg != primReg))
{
@ -1297,6 +1334,8 @@ void CGSH_Direct3D9::SetupFramebuffer(uint64 frameReg, uint64 scissorReg)
m_device->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE);
SetReadCircuitMatrix(projWidth, projHeight);
m_device->SetVertexShaderConstantF(0, reinterpret_cast<float*>(&m_projMatrix), 4);
}
void CGSH_Direct3D9::SetupDepthBuffer(uint64 zbufReg, uint64 frameReg)

9
Source/ui_win32/GSH_Direct3D9.h
View File

@ -62,9 +62,13 @@ private:
typedef Framework::Win32::CComPtr<IDirect3DDevice9> DevicePtr;
typedef Framework::Win32::CComPtr<IDirect3DTexture9> TexturePtr;
typedef Framework::Win32::CComPtr<IDirect3DSurface9> SurfacePtr;
typedef Framework::Win32::CComPtr<IDirect3DVertexDeclaration9> VertexDeclarationPtr;
typedef Framework::Win32::CComPtr<IDirect3DVertexShader9> VertexShaderPtr;
typedef Framework::Win32::CComPtr<IDirect3DPixelShader9> PixelShaderPtr;
typedef std::map<uint32, VertexShaderPtr> VertexShaderMap;
typedef std::map<uint32, PixelShaderPtr> PixelShaderMap;
enum MAXCACHE
{
MAXCACHE = 256,
@ -250,7 +254,12 @@ private:
FramebufferList m_framebuffers;
DepthbufferList m_depthbuffers;
VertexDeclarationPtr m_vertexDeclaration;
VertexShaderMap m_vertexShaders;
PixelShaderMap m_pixelShaders;
RENDERSTATE m_renderState;
D3DMATRIX m_projMatrix;
VertexBufferPtr m_drawVb;
VertexBufferPtr m_presentVb;