mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up and add missing bits to 360 D3D9.

Browse Source
This commit is contained in:
Themaister 2012-01-07 14:54:55 +01:00
parent da26925118
commit 2b1344c3cf
1 changed files with 137 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
360/xdk360_video.cpp
View File

@ -25,56 +25,49 @@
#include "config.h" #include "config.h"
#endif #endif
// pixel shader static const char* g_strPixelShaderProgram =
const CHAR* g_strPixelShaderProgram = " sampler2D tex : register(s0); "
" struct PS_IN " " struct PS_IN "
" { " " { "
" float4 Color : COLOR; " // Interpolated color from " float2 coord : TEXCOORD0; "
" }; " // the vertex shader " }; "
" " " "
" float4 main( PS_IN In ) : COLOR " " float4 main(PS_IN in) : COLOR "
" { " " { "
" return In.Color; " // Output color " return tex2D(tex, in.coord); "
" } "; " } ";
// vertex shader static const char* g_strVertexShaderProgram =
const CHAR* g_strVertexShaderProgram =
" float4x4 matWVP : register(c0); "
" "
" struct VS_IN " " struct VS_IN "
" " " "
" { " " { "
" float4 ObjPos : POSITION; " // Object space position " float2 pos : POSITION; "
" float4 Color : COLOR; " // Vertex color " float2 coord : TEXCOORD0; "
" }; " " }; "
" " " "
" struct VS_OUT " " struct VS_OUT "
" { " " { "
" float4 ProjPos : POSITION; " // Projected space position " float4 pos : POSITION; "
" float4 Color : COLOR; " " float2 coord : TEXCOORD0; "
" }; " " }; "
" " " "
" VS_OUT main( VS_IN In ) " " VS_OUT main(VS_IN in) "
" { " " { "
" VS_OUT Out; " " VS_OUT out; "
" Out.ProjPos = mul( matWVP, In.ObjPos ); " // Transform vertex into " out.pos = float4(in.pos, 0.0, 1.0); "
" Out.Color = In.Color; " // Projected space and " out.coord = in.coord; "
" return Out; " // Transfer color " return out; "
" } "; " } ";
typedef struct DrawVerticeFormats typedef struct DrawVerticeFormats
{ {
float x, y, z, w; float x, y;
unsigned int color;
float u, v; float u, v;
} DrawVerticeFormats; } DrawVerticeFormats;
typedef struct xdk360_video xdk360_video_t;
static bool g_quitting; static bool g_quitting;
typedef struct gl typedef struct xdk360_video
{ {
IDirect3D9* xdk360_device; IDirect3D9* xdk360_device;
IDirect3DDevice9* xdk360_render_device; IDirect3DDevice9* xdk360_render_device;
@ -82,176 +75,153 @@ typedef struct gl
IDirect3DPixelShader9* pPixelShader; IDirect3DPixelShader9* pPixelShader;
IDirect3DVertexDeclaration9* pVertexDecl; IDirect3DVertexDeclaration9* pVertexDecl;
IDirect3DVertexBuffer9* vertex_buf; IDirect3DVertexBuffer9* vertex_buf;
LPDIRECT3DTEXTURE9 lpTexture; IDirect3DTexture9* lpTexture;
XMMATRIX matWVP;
unsigned frame_count; unsigned frame_count;
} gl_t; } xdk360_video_t;
static void xdk360_gfx_free(void *data) static void xdk360_gfx_free(void *data)
{ {
gl_t *vid = (gl_t*)data; xdk360_video_t *vid = (xdk360_video_t*)data;
if (!vid) if (!vid)
return; return;
vid->lpTexture->Release();
vid->vertex_buf->Release();
vid->pVertexDecl->Release();
vid->pPixelShader->Release();
vid->pVertexShader->Release();
vid->xdk360_render_device->Release();
vid->xdk360_device->Release();
free(vid); free(vid);
} }
static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data) static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **input, void **input_data)
{ {
gl_t * gl = (gl_t*)calloc(1, sizeof(gl_t)); xdk360_video_t *gl = (xdk360_video_t*)calloc(1, sizeof(xdk360_video_t));
if (!gl) if (!gl)
return NULL; return NULL;
gl->xdk360_device = Direct3DCreate9(D3D_SDK_VERSION); gl->xdk360_device = Direct3DCreate9(D3D_SDK_VERSION);
if (!gl->xdk360_device)
{
free(gl);
return NULL;
}
/* Set up the structure used to create the Direct3D device */
D3DPRESENT_PARAMETERS d3dpp; D3DPRESENT_PARAMETERS d3dpp;
ZeroMemory(&d3dpp, sizeof(d3dpp)); ZeroMemory(&d3dpp, sizeof(d3dpp));
d3dpp.BackBufferWidth = 1280; d3dpp.BackBufferWidth = 1280;
d3dpp.BackBufferHeight = 720; d3dpp.BackBufferHeight = 720;
d3dpp.BackBufferFormat = (D3DFORMAT)MAKESRGBFMT(D3DFMT_A8R8G8B8); d3dpp.BackBufferFormat = (D3DFORMAT)MAKESRGBFMT(D3DFMT_A8R8G8B8);
d3dpp.FrontBufferFormat = (D3DFORMAT)MAKESRGBFMT(D3DFMT_LE_X8R8G8B8); d3dpp.FrontBufferFormat = (D3DFORMAT)MAKESRGBFMT(D3DFMT_LE_X8R8G8B8);
d3dpp.MultiSampleType = D3DMULTISAMPLE_NONE; d3dpp.MultiSampleType = D3DMULTISAMPLE_NONE;
d3dpp.MultiSampleQuality = 0; d3dpp.MultiSampleQuality = 0;
d3dpp.BackBufferCount = 1; d3dpp.BackBufferCount = 2;
d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.EnableAutoDepthStencil = TRUE;
d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8;
d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE; d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
/* Create the Direct3D device */
gl->xdk360_device->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, gl->xdk360_device->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp,
&gl->xdk360_render_device); &gl->xdk360_render_device);
/* Buffers to hold compiled shaders and possible error messages */ ID3DXBuffer* pShaderCodeV = NULL;
ID3DXBuffer* pShaderCode = NULL; ID3DXBuffer* pShaderCodeP = NULL;
ID3DXBuffer* pErrorMsg = NULL; ID3DXBuffer* pErrorMsg = NULL;
/* Create texture to render into */
if( FAILED( gl->xdk360_render_device->CreateTexture( 512, 512, 1, 0, D3DFMT_LIN_X1R5G5B5,
0, &gl->lpTexture, NULL ) ) )
{
exit(1);
}
/* Create vertex buffer */
if( FAILED( gl->xdk360_render_device->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats), 0,
0, 0, &gl->vertex_buf, NULL)))
{
exit(1);
}
/* Compile vertex shader */
HRESULT hr = D3DXCompileShader(g_strVertexShaderProgram, (UINT)strlen(g_strVertexShaderProgram), HRESULT hr = D3DXCompileShader(g_strVertexShaderProgram, (UINT)strlen(g_strVertexShaderProgram),
NULL, NULL, "main", "vs_2_0", 0, &pShaderCode, &pErrorMsg, NULL); NULL, NULL, "main", "vs_2_0", 0, &pShaderCodeV, &pErrorMsg, NULL);
if (FAILED(hr)) if (SUCCEEDED(hr))
{ {
OutputDebugStringA( pErrorMsg ? (CHAR *)pErrorMsg->GetBufferPointer() : "");
exit(1);
}
/* Create vertex shader */
gl->xdk360_render_device->CreateVertexShader((DWORD*)pShaderCode->GetBufferPointer(), &gl->pVertexShader);
/* Shader code is no longer required */
pShaderCode->Release();
pShaderCode = NULL;
/* Compile pixel shader */
hr = D3DXCompileShader(g_strPixelShaderProgram, (UINT)strlen(g_strPixelShaderProgram), hr = D3DXCompileShader(g_strPixelShaderProgram, (UINT)strlen(g_strPixelShaderProgram),
NULL, NULL, "main", "ps_2_0", 0, &pShaderCode, &pErrorMsg, NULL); NULL, NULL, "main", "ps_2_0", 0, &pShaderCodeP, &pErrorMsg, NULL);
}
if (FAILED(hr)) if (FAILED(hr))
{ {
OutputDebugStringA( pErrorMsg ? (CHAR *)pErrorMsg->GetBufferPointer() : ""); OutputDebugString(pErrorMsg ? (char*)pErrorMsg->GetBufferPointer() : "");
exit(1); gl->xdk360_render_device->Release();
gl->xdk360_device->Release();
free(gl);
return NULL;
} }
/* Create pixel shader */ gl->xdk360_render_device->CreateVertexShader(pShaderCodeV->GetBufferPointer(), &gl->pVertexShader);
gl->xdk360_render_device->CreatePixelShader((DWORD*)pShaderCode->GetBufferPointer(), &gl->pPixelShader); gl->xdk360_render_device->CreatePixelShader(pShaderCodeP->GetBufferPointer(), &gl->pPixelShader);
pShaderCodeV->Release();
pShaderCodeP->Release();
/* Shader code no longer required */ gl->xdk360_render_device->CreateTexture(512, 512, 1, 0, D3DFMT_LIN_X1R5G5B5,
pShaderCode->Release(); 0, &gl->lpTexture, NULL);
pShaderCode = NULL;
/* Define the vertex elements.*/ gl->xdk360_render_device->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats), 0,
static const D3DVERTEXELEMENT9 VertexElements[3] = 0, 0, &gl->vertex_buf, NULL);
static const DrawVerticeFormats init_verts[] = {
{ 0.0f, 0.0f, 0.0f, 0.0f },
{ 1.0f, 0.0f, 1.0f, 0.0f },
{ 0.0f, 1.0f, 0.0f, 1.0f },
{ 1.0f, 1.0f, 1.0f, 1.0f },
};
void *verts_ptr;
gl->vertex_buf->Lock(0, sizeof(DrawVerticeFormats), &verts_ptr, 0);
memcpy(verts_ptr, init_verts, sizeof(init_verts));
gl->vertex_buf->Unlock();
static const D3DVERTEXELEMENT9 VertexElements[] =
{ {
{ 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, { 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
{ 0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0 }, { 0, 2 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 },
D3DDECL_END() D3DDECL_END()
}; };
/* Create a vertex declaration from the element descriptions.*/
gl->xdk360_render_device->CreateVertexDeclaration(VertexElements, &gl->pVertexDecl); gl->xdk360_render_device->CreateVertexDeclaration(VertexElements, &gl->pVertexDecl);
/* World matrix (identity in this sample)*/ gl->xdk360_render_device->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER,
XMMATRIX matWorld = XMMatrixIdentity(); 0xff000000, 1.0f, 0);
/* View matrix*/
XMVECTOR vEyePt = XMVectorSet( 0.0f, 0.0f, -4.0f, 0.0f );
XMVECTOR vLookatPt = XMVectorSet( 0.0f, 0.0f, 0.0f, 0.0f );
XMVECTOR vUp = XMVectorSet( 0.0f, 1.0f, 0.0f, 0.0f );
XMMATRIX matView = XMMatrixLookAtLH( vEyePt, vLookatPt, vUp );
/* Determine the aspect ratio*/
FLOAT fAspectRatio = ( FLOAT )d3dpp.BackBufferWidth / ( FLOAT )d3dpp.BackBufferHeight;
/* Projection matrix*/
XMMATRIX matProj = XMMatrixPerspectiveFovLH( XM_PI / 4, fAspectRatio, 1.0f, 200.0f );
/* World*view*projection*/
gl->matWVP = matWorld * matView * matProj;
/* Clear the backbuffer.*/
gl->xdk360_render_device->Clear( 0L, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER | D3DCLEAR_STENCIL,
0xff000000, 1.0f, 0L );
return gl; return gl;
} }
static bool xdk360_gfx_frame(void *data, const void *frame, unsigned width, unsigned height, unsigned pitch, const char *msg) static bool xdk360_gfx_frame(void *data, const void *frame,
unsigned width, unsigned height, unsigned pitch, const char *msg)
{ {
gl_t *vid = (gl_t*)data; xdk360_video_t *vid = (xdk360_video_t*)data;
vid->frame_count++; vid->frame_count++;
/* Clear the backbuffer.*/ vid->xdk360_render_device->Clear(0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER,
vid->xdk360_render_device->Clear( 0L, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER | D3DCLEAR_STENCIL, 0xff000000, 1.0f, 0);
0xff000000, 1.0f, 0L );
vid->xdk360_render_device->SetStreamSource(0, vid->vertex_buf, 0, sizeof(DrawVerticeFormats));
D3DLOCKED_RECT d3dlr; D3DLOCKED_RECT d3dlr;
if (SUCCEEDED(vid->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK)))
if (SUCCEEDED(vid->lpTexture->LockRect(0, &d3dlr, nullptr, D3DLOCK_NOSYSLOCK)))
{ {
for (unsigned y = 0; y < height; y++) for (unsigned y = 0; y < height; y++)
{ {
const uint8_t *in = (const uint8_t*)(frame) + y * pitch; const uint8_t *in = (const uint8_t*)frame + y * pitch;
uint8_t *out = (uint8_t*)(d3dlr.pBits) + y * d3dlr.Pitch; uint8_t *out = (uint8_t*)d3dlr.pBits + y * d3dlr.Pitch;
memcpy(out, in, width * sizeof(uint16_t)); memcpy(out, in, width * sizeof(uint16_t));
} }
vid->lpTexture->UnlockRect(0); vid->lpTexture->UnlockRect(0);
} }
/* Set shaders. */ vid->xdk360_render_device->SetTexture(0, vid->lpTexture);
vid->xdk360_render_device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
vid->xdk360_render_device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
vid->xdk360_render_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DADDRESS_BORDER);
vid->xdk360_render_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DADDRESS_BORDER);
vid->xdk360_render_device->SetVertexShader(vid->pVertexShader); vid->xdk360_render_device->SetVertexShader(vid->pVertexShader);
vid->xdk360_render_device->SetPixelShader(vid->pPixelShader); vid->xdk360_render_device->SetPixelShader(vid->pPixelShader);
// Set shader constants.
vid->xdk360_render_device->SetVertexShaderConstantF( 0, ( FLOAT* )&vid->matWVP, 4 );
// Set the vertex declaration.
vid->xdk360_render_device->SetVertexDeclaration(vid->pVertexDecl); vid->xdk360_render_device->SetVertexDeclaration(vid->pVertexDecl);
vid->xdk360_render_device->SetStreamSource(0, vid->vertex_buf, 0, sizeof(DrawVerticeFormats)); vid->xdk360_render_device->SetStreamSource(0, vid->vertex_buf, 0, sizeof(DrawVerticeFormats));
vid->xdk360_render_device->SetSampler(0, vid->lpTexture);
// Draw
vid->xdk360_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2); vid->xdk360_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
// Resolve
vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL); vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL);
return true; return true;
@ -275,7 +245,6 @@ static bool xdk360_gfx_focus(void *data)
return true; return true;
} }
const video_driver_t video_xdk360 = { const video_driver_t video_xdk360 = {
xdk360_gfx_init, xdk360_gfx_init,
xdk360_gfx_frame, xdk360_gfx_frame,