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

Merge branch 'master' of github.com:Themaister/RetroArch

Browse Source
This commit is contained in:
Twinaphex 2012-07-07 16:24:50 +02:00
commit d2dfe38170
4 changed files with 90 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
360/xdk360_video.cpp
View File

@ -124,7 +124,7 @@ static void xdk360_set_viewport(bool force_full)
} }
} }
D3DVIEWPORT9 vp = {0}; D3DVIEWPORT vp = {0};
vp.Width = m_viewport_width_temp; vp.Width = m_viewport_width_temp;
vp.Height = m_viewport_height_temp; vp.Height = m_viewport_height_temp;
vp.X = m_viewport_x_temp; vp.X = m_viewport_x_temp;
@ -185,15 +185,21 @@ static void xdk360_init_fbo(xdk360_video_t *d3d)
d3d->d3d_render_device->CreateTexture(512 * g_settings.video.fbo_scale_x, 512 * g_settings.video.fbo_scale_y, d3d->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, 1, 0, g_console.gamma_correction_enable ? ( D3DFORMAT )MAKESRGBFMT( D3DFMT_A8R8G8B8 ) : D3DFMT_A8R8G8B8,
0, &d3d->lpTexture_ot, NULL); 0, &d3d->lpTexture_ot
#ifdef _XBOX360
, NULL
#endif
);
d3d->d3d_render_device->CreateRenderTarget(512 * g_settings.video.fbo_scale_x, 512 * g_settings.video.fbo_scale_y, d3d->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, g_console.gamma_correction_enable ? ( D3DFORMAT )MAKESRGBFMT( D3DFMT_A8R8G8B8 ) : D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE,
0, 0, &d3d->lpSurface, NULL); 0, 0, &d3d->lpSurface, NULL);
#ifdef _XBOX360
d3d->lpTexture_ot_as16srgb = *d3d->lpTexture_ot; d3d->lpTexture_ot_as16srgb = *d3d->lpTexture_ot;
xdk360_convert_texture_to_as16_srgb(d3d->lpTexture); xdk360_convert_texture_to_as16_srgb(d3d->lpTexture);
xdk360_convert_texture_to_as16_srgb(&d3d->lpTexture_ot_as16srgb); xdk360_convert_texture_to_as16_srgb(&d3d->lpTexture_ot_as16srgb);
#endif
} }
static void *xdk360_init(const video_info_t *video, const input_driver_t **input, void **input_data) static void *xdk360_init(const video_info_t *video, const input_driver_t **input, void **input_data)
@ -205,7 +211,7 @@ static void *xdk360_init(const video_info_t *video, const input_driver_t **input
if (!d3d) if (!d3d)
return NULL; return NULL;
d3d->d3d_device = Direct3DCreate9(D3D_SDK_VERSION); d3d->d3d_device = direct3d_create_ctx(D3D_SDK_VERSION);
if (!d3d->d3d_device) if (!d3d->d3d_device)
{ {
free(d3d); free(d3d);
@ -233,26 +239,35 @@ static void *xdk360_init(const video_info_t *video, const input_driver_t **input
if(g_console.gamma_correction_enable) if(g_console.gamma_correction_enable)
{ {
d3d->d3dpp.BackBufferFormat = g_console.color_format ? (D3DFORMAT)MAKESRGBFMT(D3DFMT_A8R8G8B8) : (D3DFORMAT)MAKESRGBFMT(D3DFMT_LIN_A1R5G5B5); d3d->d3dpp.BackBufferFormat = g_console.color_format ? (D3DFORMAT)MAKESRGBFMT(D3DFMT_A8R8G8B8) : (D3DFORMAT)MAKESRGBFMT(D3DFMT_LIN_A1R5G5B5);
#ifdef _XBOX360
d3d->d3dpp.FrontBufferFormat = (D3DFORMAT)MAKESRGBFMT(D3DFMT_LE_X8R8G8B8); d3d->d3dpp.FrontBufferFormat = (D3DFORMAT)MAKESRGBFMT(D3DFMT_LE_X8R8G8B8);
#endif
} }
else else
{ {
d3d->d3dpp.BackBufferFormat = g_console.color_format ? D3DFMT_A8R8G8B8 : D3DFMT_LIN_A1R5G5B5; d3d->d3dpp.BackBufferFormat = g_console.color_format ? D3DFMT_A8R8G8B8 : D3DFMT_LIN_A1R5G5B5;
#ifdef _XBOX360
d3d->d3dpp.FrontBufferFormat = D3DFMT_LE_X8R8G8B8; d3d->d3dpp.FrontBufferFormat = D3DFMT_LE_X8R8G8B8;
#endif
} }
d3d->d3dpp.MultiSampleType = D3DMULTISAMPLE_NONE; d3d->d3dpp.MultiSampleType = D3DMULTISAMPLE_NONE;
#ifdef _XBOX360
d3d->d3dpp.MultiSampleQuality = 0; d3d->d3dpp.MultiSampleQuality = 0;
d3d->d3dpp.PresentationInterval = video->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
#else
d3d->d3dpp.FullScreen_PresentationInterval = video->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
#endif
d3d->d3dpp.BackBufferCount = 2; d3d->d3dpp.BackBufferCount = 2;
d3d->d3dpp.EnableAutoDepthStencil = FALSE; d3d->d3dpp.EnableAutoDepthStencil = FALSE;
d3d->d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3d->d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
d3d->d3dpp.PresentationInterval = video->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
// D3DCREATE_HARDWARE_VERTEXPROCESSING is ignored on 360
d3d->d3d_device->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, d3d->d3d_device->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING,
&d3d->d3dpp, &d3d->d3d_render_device); &d3d->d3dpp, &d3d->d3d_render_device);
#ifdef HAVE_HLSL
hlsl_init(g_settings.video.cg_shader_path, d3d->d3d_render_device); hlsl_init(g_settings.video.cg_shader_path, d3d->d3d_render_device);
#endif
d3d->d3d_render_device->CreateTexture(512, 512, 1, 0, D3DFMT_LIN_X1R5G5B5, d3d->d3d_render_device->CreateTexture(512, 512, 1, 0, D3DFMT_LIN_X1R5G5B5,
0, &d3d->lpTexture, NULL); 0, &d3d->lpTexture, NULL);
@ -282,7 +297,7 @@ static void *xdk360_init(const video_info_t *video, const input_driver_t **input
memcpy(verts_ptr, init_verts, sizeof(init_verts)); memcpy(verts_ptr, init_verts, sizeof(init_verts));
d3d->vertex_buf->Unlock(); d3d->vertex_buf->Unlock();
static const D3DVERTEXELEMENT9 VertexElements[] = static const D3DVERTEXELEMENT VertexElements[] =
{ {
{ 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, { 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
{ 0, 2 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 }, { 0, 2 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0 },
@ -297,7 +312,7 @@ static void *xdk360_init(const video_info_t *video, const input_driver_t **input
d3d->d3d_render_device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE); d3d->d3d_render_device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
d3d->d3d_render_device->SetRenderState(D3DRS_ZENABLE, FALSE); d3d->d3d_render_device->SetRenderState(D3DRS_ZENABLE, FALSE);
D3DVIEWPORT9 vp = {0}; D3DVIEWPORT vp = {0};
vp.Width = d3d->video_mode.fIsHiDef ? 1280 : 640; vp.Width = d3d->video_mode.fIsHiDef ? 1280 : 640;
vp.Height = d3d->video_mode.fIsHiDef ? 720 : 480; vp.Height = d3d->video_mode.fIsHiDef ? 720 : 480;
vp.MinZ = 0.0f; vp.MinZ = 0.0f;
@ -377,12 +392,17 @@ static bool xdk360_frame(void *data, const void *frame,
d3d->d3d_render_device->SetTexture(0, d3d->lpTexture); d3d->d3d_render_device->SetTexture(0, d3d->lpTexture);
#ifdef HAVE_HLSL
hlsl_use(1); hlsl_use(1);
#endif
if(d3d->fbo_enabled) if(d3d->fbo_enabled)
{ {
#ifdef HAVE_HLSL
hlsl_set_params(width, height, 512, 512, g_settings.video.fbo_scale_x * width, hlsl_set_params(width, height, 512, 512, g_settings.video.fbo_scale_x * width,
g_settings.video.fbo_scale_y * height, d3d->frame_count); g_settings.video.fbo_scale_y * height, d3d->frame_count);
D3DVIEWPORT9 vp = {0}; #endif
D3DVIEWPORT vp = {0};
vp.Width = g_settings.video.fbo_scale_x * width; vp.Width = g_settings.video.fbo_scale_x * width;
vp.Height = g_settings.video.fbo_scale_y * height; vp.Height = g_settings.video.fbo_scale_y * height;
vp.X = 0; vp.X = 0;
@ -391,11 +411,13 @@ static bool xdk360_frame(void *data, const void *frame,
vp.MaxZ = 1.0f; vp.MaxZ = 1.0f;
d3d->d3d_render_device->SetViewport(&vp); d3d->d3d_render_device->SetViewport(&vp);
} }
#ifdef HAVE_HLSL
else else
{ {
hlsl_set_params(width, height, 512, 512, d3d->d3dpp.BackBufferWidth, hlsl_set_params(width, height, 512, 512, d3d->d3dpp.BackBufferWidth,
d3d->d3dpp.BackBufferHeight, d3d->frame_count); d3d->d3dpp.BackBufferHeight, d3d->frame_count);
} }
#endif
D3DLOCKED_RECT d3dlr; D3DLOCKED_RECT d3dlr;
d3d->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); d3d->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK);
@ -413,7 +435,11 @@ static bool xdk360_frame(void *data, const void *frame,
d3d->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER); d3d->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
d3d->d3d_render_device->SetVertexDeclaration(d3d->v_decl); d3d->d3d_render_device->SetVertexDeclaration(d3d->v_decl);
d3d->d3d_render_device->SetStreamSource(0, d3d->vertex_buf, 0, sizeof(DrawVerticeFormats)); d3d->d3d_render_device->SetStreamSource(0, d3d->vertex_buf,
#ifdef _XBOX360
0,
#endif
sizeof(DrawVerticeFormats));
d3d->d3d_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2); d3d->d3d_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
@ -426,9 +452,11 @@ static bool xdk360_frame(void *data, const void *frame,
pRenderTarget0->Release(); pRenderTarget0->Release();
d3d->d3d_render_device->SetTexture(0, &d3d->lpTexture_ot_as16srgb); d3d->d3d_render_device->SetTexture(0, &d3d->lpTexture_ot_as16srgb);
#ifdef HAVE_HLSL
hlsl_use(2); hlsl_use(2);
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, d3d->d3dpp.BackBufferWidth, 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, d3d->d3dpp.BackBufferWidth,
d3d->d3dpp.BackBufferHeight, d3d->frame_count); d3d->d3dpp.BackBufferHeight, d3d->frame_count);
#endif
xdk360_set_viewport(false); xdk360_set_viewport(false);
d3d->d3d_render_device->SetSamplerState(0, D3DSAMP_MINFILTER, g_settings.video.second_pass_smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT); d3d->d3d_render_device->SetSamplerState(0, D3DSAMP_MINFILTER, g_settings.video.second_pass_smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);
@ -436,7 +464,11 @@ static bool xdk360_frame(void *data, const void *frame,
d3d->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER); d3d->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER);
d3d->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER); d3d->d3d_render_device->SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER);
d3d->d3d_render_device->SetVertexDeclaration(d3d->v_decl); d3d->d3d_render_device->SetVertexDeclaration(d3d->v_decl);
d3d->d3d_render_device->SetStreamSource(0, d3d->vertex_buf, 0, sizeof(DrawVerticeFormats)); d3d->d3d_render_device->SetStreamSource(0, d3d->vertex_buf,
#ifdef _XBOX360
0,
#endif
sizeof(DrawVerticeFormats));
d3d->d3d_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2); d3d->d3d_render_device->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2);
} }
@ -501,7 +533,7 @@ static void xdk360_start(void)
gfx_ctx_set_swap_interval(d3d->vsync ? 1 : 0, false); gfx_ctx_set_swap_interval(d3d->vsync ? 1 : 0, false);
#ifdef _XBOX360 #ifdef _XBOX360
HRESULT hr = d3d_init_font("game:\\media\\Arial_12.xpr"); HRESULT hr = d3d9_init_font("game:\\media\\Arial_12.xpr");
if(hr < 0) if(hr < 0)
{ {
@ -518,7 +550,9 @@ static void xdk360_stop(void)
{ {
void *data = driver.video_data; void *data = driver.video_data;
driver.video_data = NULL; driver.video_data = NULL;
d3d_deinit_font(); #ifdef _XBOX360
d3d9_deinit_font();
#endif
xdk360_free(data); xdk360_free(data);
} }

48
360/xdk360_video.h
View File

@ -41,6 +41,40 @@ typedef struct DrawVerticeFormats
float u, v; float u, v;
} DrawVerticeFormats; } DrawVerticeFormats;
#ifdef _XBOX1
/* Direct3D 8 */
#define LPDIRECT3D_PTR LPDIRECT3D8
#define LPDIRECT3DDEVICE_PTR LPDIRECT3DDEVICE8
#define LPDIRECT3DTEXTURE_PTR LPDIRECT3DTEXTURE8
#define LPDIRECT3DSURFACE_PTR LPDIRECT3DSURFACE8
#define D3DVIEWPORT D3DVIEWPORT8
#define D3DVERTEXELEMENT D3DVERTEXELEMENT8
#define direct3d_create_ctx Direct3DCreate8
#define IDirect3DVertexBuffer IDirect3DVertexBuffer8
#define SetSamplerState SetTextureStageState
#define D3DSAMP_ADDRESSU D3DTSS_ADDRESSU
#define D3DSAMP_ADDRESSV D3DTSS_ADDRESSV
#define D3DSAMP_MAGFILTER D3DTSS_MAGFILTER
#define D3DSAMP_MINFILTER D3DTSS_MINFILTER
#else
/* Direct3D 9 */
#define LPDIRECT3D_PTR LPDIRECT3D9
#define LPDIRECT3DDEVICE_PTR LPDIRECT3DDEVICE9
#define LPDIRECT3DTEXTURE_PTR LPDIRECT3DTEXTURE9
#define LPDIRECT3DSURFACE_PTR LPDIRECT3DSURFACE9
#define D3DVIEWPORT D3DVIEWPORT9
#define D3DVERTEXELEMENT D3DVERTEXELEMENT9
#define direct3d_create_ctx Direct3DCreate9
#define IDirect3DVertexBuffer IDirect3DVertexBuffer9
#define IDirect3DVertexDeclaration IDirect3DVertexDeclaration9
#endif
typedef struct xdk360_video typedef struct xdk360_video
{ {
bool block_swap; bool block_swap;
@ -51,16 +85,18 @@ typedef struct xdk360_video
unsigned frame_count; unsigned frame_count;
unsigned last_width; unsigned last_width;
unsigned last_height; unsigned last_height;
IDirect3D9* d3d_device; LPDIRECT3D_PTR d3d_device;
IDirect3DDevice9* d3d_render_device; LPDIRECT3DDEVICE_PTR d3d_render_device;
IDirect3DVertexBuffer9* vertex_buf; IDirect3DVertexBuffer *vertex_buf;
IDirect3DTexture9* lpTexture; LPDIRECT3DTEXTURE_PTR lpTexture;
D3DTexture lpTexture_ot_as16srgb; D3DTexture lpTexture_ot_as16srgb;
LPDIRECT3DTEXTURE9 lpTexture_ot; LPDIRECT3DTEXTURE_PTR lpTexture_ot;
#ifdef _XBOX360
IDirect3DVertexDeclaration9* v_decl; IDirect3DVertexDeclaration9* v_decl;
#endif
D3DPRESENT_PARAMETERS d3dpp; D3DPRESENT_PARAMETERS d3dpp;
XVIDEO_MODE video_mode; XVIDEO_MODE video_mode;
LPDIRECT3DSURFACE9 lpSurface; LPDIRECT3DSURFACE_PTR lpSurface;
} xdk360_video_t; } xdk360_video_t;
#endif #endif

2
console/griffin/griffin.c
View File

@ -54,7 +54,7 @@ VIDEO CONTEXT
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../gfx/context/ps3_ctx.c" #include "../../gfx/context/ps3_ctx.c"
#elif defined(_XBOX360) #elif defined(_XBOX)
#include "../../gfx/context/xdk360_ctx.c" #include "../../gfx/context/xdk360_ctx.c"
#endif #endif

2
console/griffin/hook.h
View File

@ -69,7 +69,7 @@
#define video_set_aspect_ratio_func(aspectratio_idx) gfx_ctx_set_aspect_ratio(driver.video_data, aspectratio_idx) #define video_set_aspect_ratio_func(aspectratio_idx) gfx_ctx_set_aspect_ratio(driver.video_data, aspectratio_idx)
#define gfx_ctx_window_has_focus() (true) #define gfx_ctx_window_has_focus() (true)
#define gfx_ctx_swap_buffers() (d3d9->d3d_render_device->Present(NULL, NULL, NULL, NULL)) #define gfx_ctx_swap_buffers() (d3d->d3d_render_device->Present(NULL, NULL, NULL, NULL))
#define input_init_func() xinput2_input_init() #define input_init_func() xinput2_input_init()
#define input_poll_func() xinput2_input_poll(driver.input_data) #define input_poll_func() xinput2_input_poll(driver.input_data)