diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp index e82d6774ad..d19c9eaf4b 100644 --- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp +++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.cpp @@ -51,7 +51,7 @@ static void renderchain_set_mvp(void *data, unsigned vp_width, d3d_video_t *d3d = (d3d_video_t*)data; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; - hlsl_set_proj_matrix(XMMatrixRotationZ(rotation * (M_PI / 2.0)), rotation); + hlsl_set_proj_matrix((void*)&d3d->shader, XMMatrixRotationZ(rotation * (M_PI / 2.0))); mvp.data = d3d; mvp.matrix = NULL; diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp index 1cc1f891a3..ff03d20201 100644 --- a/menu/drivers/xui.cpp +++ b/menu/drivers/xui.cpp @@ -437,6 +437,8 @@ static void xui_frame(void *data, video_frame_info_t *video_info) XuiRenderSetViewTransform( app.GetDC(), &matOrigView ); +#if 0 + /* TODO/FIXME - update this code */ rarch_ctl(RARCH_CTL_MSG_QUEUE_PULL, &message); if (message) @@ -448,6 +450,7 @@ static void xui_frame(void *data, video_frame_info_t *video_info) if (message) xui_render_message(message); } +#endif XuiRenderEnd( app.GetDC() ); @@ -560,11 +563,18 @@ static void xui_render(void *data, bool is_idle) if (XuiHandleIsValid(m_menutitle)) { + menu_animation_ctx_ticker_t ticker; menu_entries_get_title(title, sizeof(title)); mbstowcs(strw_buffer, title, sizeof(strw_buffer) / sizeof(wchar_t)); XuiTextElementSetText(m_menutitle, strw_buffer); - menu_animation_ticker_str(title, RXUI_TERM_WIDTH(fb_width) - 3, - (unsigned int)frame_count / 15, title, true); + + ticker.s = title; + ticker.len = RXUI_TERM_WIDTH(fb_width) - 3; + ticker.idx = (unsigned int)frame_count / 15; + ticker.str = title; + ticker.selected = true; + + menu_animation_ticker(&ticker); } if (XuiHandleIsValid(m_menutitle))