mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360) Lay the groundwork for FBO mode

Browse Source
This commit is contained in:
TwinAphex51224 2012-05-06 18:53:43 +02:00
parent b69ba24a05
commit cfe5ce5286
3 changed files with 71 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
360/main.c
View File

@ -134,6 +134,8 @@ static void set_default_settings (void)
strlcpy(g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE, sizeof(g_settings.video.cg_shader_path)); strlcpy(g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE, sizeof(g_settings.video.cg_shader_path));
g_settings.video.vsync = true; g_settings.video.vsync = true;
g_settings.video.smooth = true; g_settings.video.smooth = true;
g_settings.video.fbo_scale_x = 2.0f;
g_settings.video.fbo_scale_y = 2.0f;
g_settings.video.aspect_ratio = -1.0f; g_settings.video.aspect_ratio = -1.0f;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[XDK360_DEVICE_ID_JOYPAD_A].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[XDK360_DEVICE_ID_JOYPAD_A].joykey;

74
360/xdk360_video.cpp
View File

@ -433,7 +433,16 @@ static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **i
vid->d3d_render_device->CreateTexture(512, 512, 1, 0, D3DFMT_LIN_X1R5G5B5, vid->d3d_render_device->CreateTexture(512, 512, 1, 0, D3DFMT_LIN_X1R5G5B5,
0, &vid->lpTexture, NULL); 0, &vid->lpTexture, NULL);
vid->d3d_render_device->CreateTexture(512 * g_settings.video.fbo_scale_x, 512 * g_settings.video.fbo_scale_y, 1, 0, g_console.gamma_correction_enable ? ( D3DFORMAT )MAKESRGBFMT( D3DFMT_A8R8G8B8 ) : D3DFMT_A8R8G8B8,
0, &vid->lpTexture_ot, NULL);
vid->d3d_render_device->CreateRenderTarget(512 * g_settings.video.fbo_scale_x, 512 * g_settings.video.fbo_scale_y, g_console.gamma_correction_enable ? ( D3DFORMAT )MAKESRGBFMT( D3DFMT_A8R8G8B8 ) : D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE,
0, 0, &vid->lpSurface, NULL);
vid->lpTexture_ot_as16srgb = *vid->lpTexture_ot;
xdk360_convert_texture_to_as16_srgb(vid->lpTexture); xdk360_convert_texture_to_as16_srgb(vid->lpTexture);
xdk360_convert_texture_to_as16_srgb(&vid->lpTexture_ot_as16srgb);
D3DLOCKED_RECT d3dlr; D3DLOCKED_RECT d3dlr;
vid->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); vid->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK);
@ -482,6 +491,8 @@ static void *xdk360_gfx_init(const video_info_t *video, const input_driver_t **i
xdk360_set_orientation(NULL, g_console.screen_orientation); xdk360_set_orientation(NULL, g_console.screen_orientation);
vid->fbo_enabled = 1;
return vid; return vid;
} }
@ -489,10 +500,7 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
unsigned width, unsigned height, unsigned pitch, const char *msg) unsigned width, unsigned height, unsigned pitch, const char *msg)
{ {
xdk360_video_t *vid = (xdk360_video_t*)data; xdk360_video_t *vid = (xdk360_video_t*)data;
D3DSurface* pRenderTarget0;
vid->d3d_render_device->Clear(0, NULL, D3DCLEAR_TARGET,
0xff000000, 1.0f, 0);
g_frame_count++;
if (vid->last_width != width || vid->last_height != height) if (vid->last_width != width || vid->last_height != height)
{ {
@ -521,11 +529,37 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
vid->last_height = height; vid->last_height = height;
} }
hlsl_use(0); if(vid->fbo_enabled)
hlsl_set_params(width, height, 512, 512, vid->d3dpp.BackBufferWidth, {
vid->d3dpp.BackBufferHeight, g_frame_count); vid->d3d_render_device->GetRenderTarget(0, &pRenderTarget0);
vid->d3d_render_device->SetRenderTarget(0, vid->lpSurface);
}
vid->d3d_render_device->SetTexture(0, NULL); vid->d3d_render_device->Clear(0, NULL, D3DCLEAR_TARGET,
0xff000000, 1.0f, 0);
g_frame_count++;
vid->d3d_render_device->SetTexture(0, vid->lpTexture);
hlsl_use(0);
if(vid->fbo_enabled)
{
hlsl_set_params(width, height, 512, 512, g_settings.video.fbo_scale_x * width,
g_settings.video.fbo_scale_y * height, g_frame_count);
D3DVIEWPORT9 vp = {0};
vp.Width = g_settings.video.fbo_scale_x * width;
vp.Height = g_settings.video.fbo_scale_y * height;
vp.X = 0;
vp.Y = 0;
vp.MinZ = 0.0f;
vp.MaxZ = 1.0f;
vid->d3d_render_device->SetViewport(&vp);
}
else
{
hlsl_set_params(width, height, 512, 512, vid->d3dpp.BackBufferWidth,
vid->d3dpp.BackBufferHeight, g_frame_count);
}
D3DLOCKED_RECT d3dlr; D3DLOCKED_RECT d3dlr;
vid->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); vid->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK);
@ -537,7 +571,6 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
} }
vid->lpTexture->UnlockRect(0); vid->lpTexture->UnlockRect(0);
vid->d3d_render_device->SetTexture(0, vid->lpTexture);
vid->d3d_render_device->SetSamplerState(0, D3DSAMP_MINFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT); vid->d3d_render_device->SetSamplerState(0, D3DSAMP_MINFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
vid->d3d_render_device->SetSamplerState(0, D3DSAMP_MAGFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT); vid->d3d_render_device->SetSamplerState(0, D3DSAMP_MAGFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
vid->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER); vid->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
@ -548,6 +581,29 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
vid->d3d_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2); vid->d3d_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
if(vid->fbo_enabled)
{
vid->d3d_render_device->Resolve(D3DRESOLVE_RENDERTARGET0, NULL, vid->lpTexture_ot,
NULL, 0, 0, NULL, 0, 0, NULL);
vid->d3d_render_device->SetRenderTarget(0, pRenderTarget0);
pRenderTarget0->Release();
vid->d3d_render_device->SetTexture(0, &vid->lpTexture_ot_as16srgb);
hlsl_use(0);
hlsl_set_params(g_settings.video.fbo_scale_x * width, g_settings.video.fbo_scale_y * height, g_settings.video.fbo_scale_x * 512, g_settings.video.fbo_scale_y * 512, vid->d3dpp.BackBufferWidth,
vid->d3dpp.BackBufferHeight, g_frame_count);
set_viewport(false);
vid->d3d_render_device->SetSamplerState(0, D3DSAMP_MINFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
vid->d3d_render_device->SetSamplerState(0, D3DSAMP_MAGFILTER, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
vid->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
vid->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
vid->d3d_render_device->SetVertexDeclaration(vid->v_decl);
vid->d3d_render_device->SetStreamSource(0, vid->vertex_buf, 0, sizeof(DrawVerticeFormats));
vid->d3d_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
}
/* XBox 360 specific font code */ /* XBox 360 specific font code */
if (msg) if (msg)
{ {

4
360/xdk360_video.h
View File

@ -43,6 +43,7 @@ typedef struct DrawVerticeFormats
typedef struct xdk360_video typedef struct xdk360_video
{ {
bool block_swap; bool block_swap;
bool fbo_enabled;
bool vsync; bool vsync;
unsigned last_width; unsigned last_width;
unsigned last_height; unsigned last_height;
@ -50,9 +51,12 @@ typedef struct xdk360_video
IDirect3DDevice9* d3d_render_device; IDirect3DDevice9* d3d_render_device;
IDirect3DVertexBuffer9* vertex_buf; IDirect3DVertexBuffer9* vertex_buf;
IDirect3DTexture9* lpTexture; IDirect3DTexture9* lpTexture;
D3DTexture lpTexture_ot_as16srgb;
LPDIRECT3DTEXTURE9 lpTexture_ot;
IDirect3DVertexDeclaration9* v_decl; IDirect3DVertexDeclaration9* v_decl;
D3DPRESENT_PARAMETERS d3dpp; D3DPRESENT_PARAMETERS d3dpp;
XVIDEO_MODE video_mode; XVIDEO_MODE video_mode;
LPDIRECT3DSURFACE9 lpSurface;
} xdk360_video_t; } xdk360_video_t;
void xdk360_video_init (void); void xdk360_video_init (void);