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

(360) Removed g_d3d global pointer

Browse Source
This commit is contained in:
TwinAphex51224 2012-05-28 00:56:58 +02:00
parent f8ad3dcc91
commit b7fce9a98e
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
360/fonts.cpp
View File

@ -26,7 +26,7 @@ static xdk360_video_font_t m_Font;
void xdk360_console_draw(void) void xdk360_console_draw(void)
{ {
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
D3DDevice *m_pd3dDevice = vid->d3d_render_device; D3DDevice *m_pd3dDevice = vid->d3d_render_device;
// The top line // The top line
@ -54,7 +54,7 @@ void xdk360_console_draw(void)
HRESULT xdk360_console_init( LPCSTR strFontFileName, unsigned long colBackColor, HRESULT xdk360_console_init( LPCSTR strFontFileName, unsigned long colBackColor,
unsigned long colTextColor) unsigned long colTextColor)
{ {
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
D3DDevice *m_pd3dDevice = vid->d3d_render_device; D3DDevice *m_pd3dDevice = vid->d3d_render_device;
video_console.first_message = true; video_console.first_message = true;
@ -353,7 +353,7 @@ static HRESULT xdk360_video_font_create_shaders (xdk360_video_font_t * font)
}; };
// Cache this global into a register // Cache this global into a register
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
D3DDevice *pd3dDevice = vid->d3d_render_device; D3DDevice *pd3dDevice = vid->d3d_render_device;
hr = pd3dDevice->CreateVertexDeclaration( decl, &s_FontLocals.m_pFontVertexDecl ); hr = pd3dDevice->CreateVertexDeclaration( decl, &s_FontLocals.m_pFontVertexDecl );
@ -481,7 +481,7 @@ HRESULT xdk360_video_font_init(xdk360_video_font_t * font, const char * strFontF
return E_FAIL; return E_FAIL;
} }
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
D3DDevice *pd3dDevice = vid->d3d_render_device; D3DDevice *pd3dDevice = vid->d3d_render_device;
// Initialize the window // Initialize the window
@ -603,7 +603,7 @@ void xdk360_video_font_begin (xdk360_video_font_t * font)
if( font->m_dwNestedBeginCount == 0 ) if( font->m_dwNestedBeginCount == 0 )
{ {
// Cache the global pointer into a register // Cache the global pointer into a register
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
D3DDevice *pD3dDevice = vid->d3d_render_device; D3DDevice *pD3dDevice = vid->d3d_render_device;
// Save state // Save state
@ -680,7 +680,7 @@ void xdk360_video_font_end(xdk360_video_font_t * font)
if( font->m_bSaveState ) if( font->m_bSaveState )
{ {
// Cache the global pointer into a register // Cache the global pointer into a register
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
D3DDevice *pD3dDevice = vid->d3d_render_device; D3DDevice *pD3dDevice = vid->d3d_render_device;
D3DDevice_SetTexture_Inline(pD3dDevice, 0, NULL); D3DDevice_SetTexture_Inline(pD3dDevice, 0, NULL);
@ -710,7 +710,7 @@ void xdk360_video_font_draw_text(xdk360_video_font_t * font, float fOriginX, flo
if( strText == NULL || strText[0] == L'\0') if( strText == NULL || strText[0] == L'\0')
return; return;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
D3DDevice *pd3dDevice = vid->d3d_render_device; D3DDevice *pd3dDevice = vid->d3d_render_device;
// Set the color as a vertex shader constant // Set the color as a vertex shader constant

8
360/menu.cpp
View File

@ -255,7 +255,7 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
{ {
char scalefactor[128]; char scalefactor[128];
int current_index; int current_index;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
current_index = m_settingslist.GetCurSel(); current_index = m_settingslist.GetCurSel();
@ -668,7 +668,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
{ {
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
hdmenus_allowed = vid->video_mode.fIsHiDef && (g_console.aspect_ratio_index >= ASPECT_RATIO_16_9); hdmenus_allowed = vid->video_mode.fIsHiDef && (g_console.aspect_ratio_index >= ASPECT_RATIO_16_9);
@ -738,7 +738,7 @@ int menu_init (void)
{ {
HRESULT hr; HRESULT hr;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
hr = app.InitShared(vid->d3d_render_device, &vid->d3dpp, XuiPNGTextureLoader); hr = app.InitShared(vid->d3d_render_device, &vid->d3dpp, XuiPNGTextureLoader);
@ -788,7 +788,7 @@ void menu_loop(void)
g_console.menu_enable = true; g_console.menu_enable = true;
HRESULT hr; HRESULT hr;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
if(g_console.emulator_initialized) if(g_console.emulator_initialized)
video_xdk360.set_swap_block_state(NULL, true); video_xdk360.set_swap_block_state(NULL, true);

29
360/xdk360_video.cpp
View File

@ -34,7 +34,6 @@
static bool g_quitting; static bool g_quitting;
static bool g_first_msg; static bool g_first_msg;
unsigned g_frame_count; unsigned g_frame_count;
void *g_d3d;
/* Xbox 360 specific code */ /* Xbox 360 specific code */
@ -255,8 +254,10 @@ void PackedResource::Destroy()
static void xdk360_gfx_free(void * data) static void xdk360_gfx_free(void * data)
{ {
if (g_d3d) #ifdef RARCH_CONSOLE
if (driver.video_data)
return; return;
#endif
xdk360_video_t *vid = (xdk360_video_t*)data; xdk360_video_t *vid = (xdk360_video_t*)data;
@ -272,7 +273,8 @@ static void xdk360_gfx_free(void * data)
void set_viewport(bool force_full) void set_viewport(bool force_full)
{ {
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
vid->d3d_render_device->Clear(0, NULL, D3DCLEAR_TARGET, vid->d3d_render_device->Clear(0, NULL, D3DCLEAR_TARGET,
0xff000000, 1.0f, 0); 0xff000000, 1.0f, 0);
@ -340,7 +342,7 @@ void set_viewport(bool force_full)
static void xdk360_set_orientation(void * data, uint32_t orientation) static void xdk360_set_orientation(void * data, uint32_t orientation)
{ {
(void)data; (void)data;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
FLOAT angle; FLOAT angle;
switch(orientation) switch(orientation)
@ -390,7 +392,7 @@ static void xdk360_convert_texture_to_as16_srgb( D3DTexture *pTexture )
void xdk360_set_fbo_enable (bool enable) void xdk360_set_fbo_enable (bool enable)
{ {
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
vid->fbo_enabled = enable; vid->fbo_enabled = enable;
} }
@ -424,8 +426,8 @@ void xdk360_gfx_init_fbo(xdk360_video_t *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)
{ {
if (g_d3d) if (driver.video_data)
return g_d3d; return driver.video_data;
xdk360_video_t *vid = (xdk360_video_t*)calloc(1, sizeof(xdk360_video_t)); xdk360_video_t *vid = (xdk360_video_t*)calloc(1, sizeof(xdk360_video_t));
if (!vid) if (!vid)
@ -678,7 +680,7 @@ static bool xdk360_gfx_frame(void *data, const void *frame,
static void xdk360_set_swap_block_swap (void * data, bool toggle) static void xdk360_set_swap_block_swap (void * data, bool toggle)
{ {
(void)data; (void)data;
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)driver.video_data;
vid->block_swap = toggle; vid->block_swap = toggle;
if(toggle) if(toggle)
@ -690,7 +692,7 @@ static void xdk360_set_swap_block_swap (void * data, bool toggle)
static void xdk360_swap (void * data) 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*)driver.video_data;
vid->d3d_render_device->Present(NULL, NULL, NULL, NULL); vid->d3d_render_device->Present(NULL, NULL, NULL, NULL);
} }
@ -719,7 +721,7 @@ static bool xdk360_gfx_focus(void *data)
void xdk360_video_set_vsync(bool vsync) void xdk360_video_set_vsync(bool vsync)
{ {
xdk360_gfx_set_nonblock_state(g_d3d, vsync); xdk360_gfx_set_nonblock_state(driver.video_data, vsync);
} }
// 360 needs a working graphics stack before RetroArch even starts. // 360 needs a working graphics stack before RetroArch even starts.
@ -733,10 +735,11 @@ static void xdk360_start(void)
video_info.vsync = g_settings.video.vsync; video_info.vsync = g_settings.video.vsync;
video_info.force_aspect = false; video_info.force_aspect = false;
video_info.fullscreen = true;
video_info.smooth = g_settings.video.smooth; video_info.smooth = g_settings.video.smooth;
video_info.input_scale = 2; video_info.input_scale = 2;
g_d3d = xdk360_gfx_init(&video_info, NULL, NULL); driver.video_data = xdk360_gfx_init(&video_info, NULL, NULL);
g_first_msg = true; g_first_msg = true;
@ -756,8 +759,8 @@ static void xdk360_restart(void)
static void xdk360_stop(void) static void xdk360_stop(void)
{ {
void *data = g_d3d; void *data = driver.video_data;
g_d3d = NULL; driver.video_data = NULL;
xdk360_console_deinit(); xdk360_console_deinit();
xdk360_gfx_free(data); xdk360_gfx_free(data);
} }

2
360/xdk360_video.h
View File

@ -67,6 +67,4 @@ void xdk360_set_fbo_enable (bool enable);
void xdk360_gfx_init_fbo(xdk360_video_t *vid); void xdk360_gfx_init_fbo(xdk360_video_t *vid);
void set_viewport(bool force_full); void set_viewport(bool force_full);
extern void *g_d3d;
#endif #endif