mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 01:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360) Rewrite of xdk360_video.cpp and shader_hlsl.c - use

Browse Source 
portable class-based function invocations
This commit is contained in:
TwinAphex51224 2012-04-17 05:12:03 +02:00
parent 2f693ad7f2
commit 6c5285c792
2 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
360/xdk360_video.cpp
View File

@ -189,14 +189,12 @@ static void xdk360_gfx_free(void * data)
if (!vid) if (!vid)
return; return;
D3DResource_Release((D3DResource *)vid->lpTexture); vid->lpTexture->Release();
D3DResource_Release((D3DResource *)vid->vertex_buf); vid->vertex_buf->Release();
D3DResource_Release((D3DResource *)vid->v_decl); vid->v_decl->Release();
D3DDevice_Release(vid->xdk360_render_device); hlsl_deinit();
Direct3D_Release(); vid->xdk360_render_device->Release();
vid->xdk360_device->Release();
//breaks right now
//hlsl_deinit();
free(vid); free(vid);
} }
@ -204,8 +202,8 @@ static void xdk360_gfx_free(void * data)
static void set_viewport(bool force_full) static void set_viewport(bool force_full)
{ {
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
D3DDevice_Clear(vid->xdk360_render_device, 0, NULL, D3DCLEAR_TARGET, vid->xdk360_render_device->Clear(0, NULL, D3DCLEAR_TARGET,
0xff000000, 1.0f, 0, FALSE); 0xff000000, 1.0f, 0);
int width = vid->video_mode.fIsHiDef ? 1280 : 640; int width = vid->video_mode.fIsHiDef ? 1280 : 640;
int height = vid->video_mode.fIsHiDef ? 720 : 480; int height = vid->video_mode.fIsHiDef ? 720 : 480;
@ -257,7 +255,7 @@ static void set_viewport(bool force_full)
vp.Y = m_viewport_y_temp; vp.Y = m_viewport_y_temp;
vp.MinZ = m_zNear; vp.MinZ = m_zNear;
vp.MaxZ = m_zFar; vp.MaxZ = m_zFar;
D3DDevice_SetViewport(vid->xdk360_render_device, &vp); vid->xdk360_render_device->SetViewport(&vp);
//if(gl->overscan_enable && !force_full) //if(gl->overscan_enable && !force_full)
//{ //{
@ -303,8 +301,6 @@ static void xdk360_set_aspect_ratio(void * data, uint32_t aspectratio_index)
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)
{ {
HRESULT ret;
if (g_d3d) if (g_d3d)
return g_d3d; return g_d3d;
@ -344,22 +340,24 @@ static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **i
vid->d3dpp.PresentationInterval = video->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; vid->d3dpp.PresentationInterval = video->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
// D3DCREATE_HARDWARE_VERTEXPROCESSING is ignored on 360 // D3DCREATE_HARDWARE_VERTEXPROCESSING is ignored on 360
ret = Direct3D_CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &vid->d3dpp, &vid->xdk360_render_device); vid->xdk360_device->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING,
&vid->d3dpp, &vid->xdk360_render_device);
hlsl_init(g_settings.video.cg_shader_path, vid->xdk360_render_device); hlsl_init(g_settings.video.cg_shader_path, vid->xdk360_render_device);
vid->lpTexture = (D3DTexture*) D3DDevice_CreateTexture(512, 512, 1, 1, 0, D3DFMT_LIN_X1R5G5B5, vid->xdk360_render_device->CreateTexture(512, 512, 1, 0, D3DFMT_LIN_X1R5G5B5,
0, D3DRTYPE_TEXTURE); 0, &vid->lpTexture, NULL);
D3DLOCKED_RECT d3dlr; D3DLOCKED_RECT d3dlr;
D3DTexture_LockRect(vid->lpTexture, 0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); vid->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK);
memset(d3dlr.pBits, 0, 512 * d3dlr.Pitch); memset(d3dlr.pBits, 0, 512 * d3dlr.Pitch);
D3DTexture_UnlockRect(vid->lpTexture, 0); vid->lpTexture->UnlockRect(0);
vid->last_width = 512; vid->last_width = 512;
vid->last_height = 512; vid->last_height = 512;
vid->vertex_buf = D3DDevice_CreateVertexBuffer(4 * sizeof(DrawVerticeFormats), 0, 0); vid->xdk360_render_device->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats),
0, 0, 0, &vid->vertex_buf, NULL);
static const DrawVerticeFormats init_verts[] = { static const DrawVerticeFormats init_verts[] = {
{ -1.0f, -1.0f, 0.0f, 1.0f }, { -1.0f, -1.0f, 0.0f, 1.0f },
@ -368,9 +366,10 @@ static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **i
{ 1.0f, 1.0f, 1.0f, 0.0f }, { 1.0f, 1.0f, 1.0f, 0.0f },
}; };
void *verts_ptr = (BYTE*)D3DVertexBuffer_Lock(vid->vertex_buf, 0, 0, 0); void *verts_ptr;
vid->vertex_buf->Lock(0, 0, &verts_ptr, 0);
memcpy(verts_ptr, init_verts, sizeof(init_verts)); memcpy(verts_ptr, init_verts, sizeof(init_verts));
D3DVertexBuffer_Unlock(vid->vertex_buf); vid->vertex_buf->Unlock();
static const D3DVERTEXELEMENT9 VertexElements[] = static const D3DVERTEXELEMENT9 VertexElements[] =
{ {
@ -379,20 +378,20 @@ static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **i
D3DDECL_END() D3DDECL_END()
}; };
vid->v_decl = D3DDevice_CreateVertexDeclaration(VertexElements); vid->xdk360_render_device->CreateVertexDeclaration(VertexElements, &vid->v_decl);
D3DDevice_Clear(vid->xdk360_render_device, 0, NULL, D3DCLEAR_TARGET, vid->xdk360_render_device->Clear(0, NULL, D3DCLEAR_TARGET,
0xff000000, 1.0f, 0, FALSE); 0xff000000, 1.0f, 0);
D3DDevice_SetRenderState_CullMode(vid->xdk360_render_device, D3DCULL_NONE); vid->xdk360_render_device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
D3DDevice_SetRenderState_ZEnable(vid->xdk360_render_device, FALSE); vid->xdk360_render_device->SetRenderState(D3DRS_ZENABLE, FALSE);
D3DVIEWPORT9 vp = {0}; D3DVIEWPORT9 vp = {0};
vp.Width = vid->video_mode.fIsHiDef ? 1280 : 640; vp.Width = vid->video_mode.fIsHiDef ? 1280 : 640;
vp.Height = vid->video_mode.fIsHiDef ? 720 : 480; vp.Height = vid->video_mode.fIsHiDef ? 720 : 480;
vp.MinZ = 0.0f; vp.MinZ = 0.0f;
vp.MaxZ = 1.0f; vp.MaxZ = 1.0f;
D3DDevice_SetViewport(vid->xdk360_render_device, &vp); vid->xdk360_render_device->SetViewport(&vp);
xdk360_set_orientation(NULL, g_console.screen_orientation); xdk360_set_orientation(NULL, g_console.screen_orientation);
@ -404,17 +403,17 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
{ {
xdk360_video_t *vid = (xdk360_video_t*)data; xdk360_video_t *vid = (xdk360_video_t*)data;
D3DDevice_Clear(vid->xdk360_render_device, 0, NULL, D3DCLEAR_TARGET, vid->xdk360_render_device->Clear(0, NULL, D3DCLEAR_TARGET,
0xff000000, 1.0f, 0, FALSE); 0xff000000, 1.0f, 0);
g_frame_count++; g_frame_count++;
if (vid->last_width != width || vid->last_height != height) if (vid->last_width != width || vid->last_height != height)
{ {
D3DLOCKED_RECT d3dlr; D3DLOCKED_RECT d3dlr;
D3DTexture_LockRect(vid->lpTexture, 0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); vid->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK);
memset(d3dlr.pBits, 0, 512 * d3dlr.Pitch); memset(d3dlr.pBits, 0, 512 * d3dlr.Pitch);
D3DTexture_UnlockRect(vid->lpTexture, 0); vid->lpTexture->UnlockRect(0);
float tex_w = width / 512.0f; float tex_w = width / 512.0f;
float tex_h = height / 512.0f; float tex_h = height / 512.0f;
@ -426,9 +425,10 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
{ 1.0f, 1.0f, tex_w, 0.0f }, { 1.0f, 1.0f, tex_w, 0.0f },
}; };
void *verts_ptr = (BYTE*)D3DVertexBuffer_Lock(vid->vertex_buf, 0, 0, 0); void *verts_ptr;
vid->vertex_buf->Lock(0, 0, &verts_ptr, 0);
memcpy(verts_ptr, verts, sizeof(verts)); memcpy(verts_ptr, verts, sizeof(verts));
D3DVertexBuffer_Unlock(vid->vertex_buf); vid->vertex_buf->Unlock();
vid->last_width = width; vid->last_width = width;
vid->last_height = height; vid->last_height = height;
@ -438,42 +438,42 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
hlsl_set_params(width, height, 512, 512, vid->d3dpp.BackBufferWidth, hlsl_set_params(width, height, 512, 512, vid->d3dpp.BackBufferWidth,
vid->d3dpp.BackBufferHeight, g_frame_count); vid->d3dpp.BackBufferHeight, g_frame_count);
D3DDevice_SetTexture_Inline(vid->xdk360_render_device, 0, NULL); vid->xdk360_render_device->SetTexture(0, NULL);
D3DLOCKED_RECT d3dlr; D3DLOCKED_RECT d3dlr;
D3DTexture_LockRect(vid->lpTexture, 0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); vid->lpTexture->LockRect(0, &d3dlr, NULL, 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));
} }
D3DTexture_UnlockRect(vid->lpTexture, 0); vid->lpTexture->UnlockRect(0);
D3DDevice_SetTexture_Inline(vid->xdk360_render_device, 0, vid->lpTexture); vid->xdk360_render_device->SetTexture(0, vid->lpTexture);
D3DDevice_SetSamplerState(vid->xdk360_render_device, 0, D3DSAMP_MINFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT); vid->xdk360_render_device->SetSamplerState(0, D3DSAMP_MINFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
D3DDevice_SetSamplerState(vid->xdk360_render_device, 0, D3DSAMP_MAGFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT); vid->xdk360_render_device->SetSamplerState(0, D3DSAMP_MAGFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
D3DDevice_SetSamplerState(vid->xdk360_render_device, 0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER); vid->xdk360_render_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
D3DDevice_SetSamplerState(vid->xdk360_render_device, 0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER); vid->xdk360_render_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
D3DDevice_SetVertexDeclaration(vid->xdk360_render_device, vid->v_decl); vid->xdk360_render_device->SetVertexDeclaration(vid->v_decl);
D3DDevice_SetStreamSource_Inline(vid->xdk360_render_device, 0, vid->vertex_buf, 0, vid->xdk360_render_device->SetStreamSource(0, vid->vertex_buf, 0, sizeof(DrawVerticeFormats));
sizeof(DrawVerticeFormats));
D3DDevice_DrawVertices(vid->xdk360_render_device, D3DPT_TRIANGLESTRIP, 0, D3DVERTEXCOUNT(D3DPT_TRIANGLESTRIP, 2)); vid->xdk360_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
if (msg) if (msg)
{ {
if(IS_TIMER_EXPIRED() || g_first_msg) if(IS_TIMER_EXPIRED() || g_first_msg)
{ {
xdk360_console_format(msg); xdk360_console_format(msg);
g_first_msg = 0; g_first_msg = 0;
SET_TIMER_EXPIRATION(30); SET_TIMER_EXPIRATION(30);
} }
xdk360_console_draw(); xdk360_console_draw();
} }
if(!vid->block_swap) if(!vid->block_swap)
D3DDevice_Present(vid->xdk360_render_device); vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL);
return true; return true;
} }
@ -494,7 +494,7 @@ static void xdk360_swap (void * data)
{ {
(void)data; (void)data;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
D3DDevice_Present(vid->xdk360_render_device); vid->xdk360_render_device->Present(NULL, NULL, NULL, NULL);
} }
static void xdk360_gfx_set_nonblock_state(void *data, bool state) static void xdk360_gfx_set_nonblock_state(void *data, bool state)
@ -502,9 +502,9 @@ static void xdk360_gfx_set_nonblock_state(void *data, bool state)
xdk360_video_t *vid = (xdk360_video_t*)data; xdk360_video_t *vid = (xdk360_video_t*)data;
SSNES_LOG("D3D Vsync => %s\n", state ? "off" : "on"); SSNES_LOG("D3D Vsync => %s\n", state ? "off" : "on");
if(state) if(state)
D3DDevice_SetRenderState_PresentInterval(vid->xdk360_render_device, D3DPRESENT_INTERVAL_IMMEDIATE); vid->xdk360_render_device->SetRenderState(D3DRS_PRESENTINTERVAL, D3DPRESENT_INTERVAL_IMMEDIATE);
else else
D3DDevice_SetRenderState_PresentInterval(vid->xdk360_render_device, D3DPRESENT_INTERVAL_ONE); vid->xdk360_render_device->SetRenderState(D3DRS_PRESENTINTERVAL, D3DPRESENT_INTERVAL_ONE);
} }
static bool xdk360_gfx_alive(void *data) static bool xdk360_gfx_alive(void *data)

26
gfx/shader_hlsl.c
View File

@ -127,9 +127,9 @@ static bool load_program(unsigned index, const char *prog, bool path_is_file)
ret_vp = false; ret_vp = false;
if (prg[index].f_ctable) if (prg[index].f_ctable)
D3DResource_Release((D3DResource *)prg[index].f_ctable); prg[index].f_ctable->Release();
if (prg[index].v_ctable) if (prg[index].v_ctable)
D3DResource_Release((D3DResource *)prg[0].v_ctable); prg[index].v_ctable->Release();
if (path_is_file) if (path_is_file)
{ {
@ -160,12 +160,12 @@ static bool load_program(unsigned index, const char *prog, bool path_is_file)
} }
if (prg[index].fprg) if (prg[index].fprg)
D3DResource_Release((D3DResource *)prg[0].fprg); prg[index].fprg->Release();
if (prg[index].vprg) if (prg[index].vprg)
D3DResource_Release((D3DResource *)prg[0].vprg); prg[index].vprg->Release();
prg[index].fprg = D3DDevice_CreatePixelShader((const DWORD*)code_f->GetBufferPointer()); d3d_device_ptr->CreatePixelShader((const DWORD*)code_f->GetBufferPointer(), &prg[index].fprg);
prg[index].vprg = D3DDevice_CreateVertexShader((const DWORD*)code_v->GetBufferPointer()); d3d_device_ptr->CreateVertexShader((const DWORD*)code_v->GetBufferPointer(), &prg[index].vprg);
code_f->Release(); code_f->Release();
code_v->Release(); code_v->Release();
@ -204,7 +204,15 @@ static bool load_plain(const char *path)
} }
static void hlsl_deinit_progs(void) static void hlsl_deinit_progs(void)
{} {
for(int i = 0; i < SSNES_HLSL_MAX_SHADERS; i++)
{
if (prg[i].fprg)
prg[i].fprg->Release();
if (prg[i].vprg)
prg[i].vprg->Release();
}
}
static void hlsl_deinit_state(void) static void hlsl_deinit_state(void)
{ {
@ -265,8 +273,8 @@ void hlsl_use(unsigned index)
if (hlsl_active && prg[index].vprg && prg[index].fprg) if (hlsl_active && prg[index].vprg && prg[index].fprg)
{ {
active_index = index; active_index = index;
D3DDevice_SetVertexShader(d3d_device_ptr, prg[index].vprg); d3d_device_ptr->SetVertexShader(prg[index].vprg);
D3DDevice_SetPixelShader(d3d_device_ptr, prg[index].fprg); d3d_device_ptr->SetPixelShader(prg[index].fprg);
} }
} }