From 2dee343ec708bb989feef47e1bee2698e31ab053 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 9 Sep 2017 01:35:15 +0200 Subject: [PATCH] Rearrange variables --- gfx/drivers/d3d.h | 49 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/gfx/drivers/d3d.h b/gfx/drivers/d3d.h index 91a14167bd..decc0afcca 100644 --- a/gfx/drivers/d3d.h +++ b/gfx/drivers/d3d.h @@ -45,11 +45,11 @@ typedef struct { - float tex_coords[4]; - float vert_coords[4]; - unsigned tex_w, tex_h; bool fullscreen; bool enabled; + unsigned tex_w, tex_h; + float tex_coords[4]; + float vert_coords[4]; float alpha_mod; LPDIRECT3DTEXTURE tex; void *vert_buf; @@ -70,29 +70,17 @@ typedef struct d3d_video bool keep_aspect; bool should_resize; bool quitting; - - struct video_viewport vp; - WNDCLASSEX windowClass; - LPDIRECT3DDEVICE dev; - HRESULT d3d_err; - unsigned cur_mon_id; - unsigned dev_rotation; - D3DVIEWPORT final_viewport; - - std::string shader_path; - - struct video_shader shader; - video_info_t video_info; - bool needs_restore; - - RECT font_rect; - RECT font_rect_shifted; - #ifdef HAVE_OVERLAY bool overlays_enabled; - std::vector overlays; #endif + /* TODO - refactor this away properly. */ + bool resolution_hd_enable; + + unsigned cur_mon_id; + unsigned dev_rotation; + + HRESULT d3d_err; #if defined(HAVE_MENU) overlay_t *menu; @@ -100,8 +88,21 @@ typedef struct d3d_video const d3d_renderchain_driver_t *renderchain_driver; void *renderchain_data; - /* TODO - refactor this away properly. */ - bool resolution_hd_enable; + RECT font_rect; + RECT font_rect_shifted; + + struct video_viewport vp; + struct video_shader shader; + video_info_t video_info; + WNDCLASSEX windowClass; + LPDIRECT3DDEVICE dev; + D3DVIEWPORT final_viewport; + + std::string shader_path; + +#ifdef HAVE_OVERLAY + std::vector overlays; +#endif } d3d_video_t; void d3d_make_d3dpp(void *data,