mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-03 08:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of more general.h includes

Browse Source
This commit is contained in:
twinaphex 2016-09-11 14:46:53 +02:00
parent 57cb83ed6f
commit 202e3e796e
16 changed files with 105 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/drivers/ctr_gfx.c
View File

@ -21,11 +21,14 @@
#include <retro_inline.h> #include <retro_inline.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "ctr_gu.h" #include "ctr_gu.h"
#include "../../configuration.h" #include "../../configuration.h"
#include "../../command.h" #include "../../command.h"
#include "../../general.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../retroarch.h" #include "../../retroarch.h"

4
gfx/drivers/dispmanx_gfx.c
View File

@ -18,13 +18,13 @@
#include <rthreads/rthreads.h> #include <rthreads/rthreads.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "../../config.h"
#endif #endif
#include "../../configuration.h" #include "../../configuration.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../general.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../runloop.h"
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../font_driver.h" #include "../font_driver.h"

8
gfx/drivers/drm_gfx.c
View File

@ -24,15 +24,15 @@
#include <string/stdstring.h> #include <string/stdstring.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "../../config.h"
#endif #endif
#include "../font_driver.h"
#include "../video_context_driver.h"
#include "../../configuration.h" #include "../../configuration.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../general.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../video_context_driver.h" #include "../../runloop.h"
#include "../font_driver.h"
#include "drm_pixformats.h" #include "drm_pixformats.h"

9
gfx/drivers/exynos_gfx.c
View File

@ -31,12 +31,15 @@
#include <retro_assert.h> #include <retro_assert.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include "../common/drm_common.h" #ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "../../general.h" #include "../common/drm_common.h"
#include "../font_driver.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../runloop.h" #include "../../runloop.h"
#include "../font_driver.h" #include "../../runloop.h"
/* TODO: Honor these properties: vsync, menu rotation, menu alpha, aspect ratio change */ /* TODO: Honor these properties: vsync, menu rotation, menu alpha, aspect ratio change */

36
gfx/drivers/gx_gfx.c
View File

@ -23,20 +23,23 @@
#include <streams/file_stream.h> #include <streams/file_stream.h>
#include "../../configuration.h" #ifdef HAVE_CONFIG_H
#include "../../driver.h" #include "../../config.h"
#include "../../general.h" #endif
#include "../drivers_font_renderer/bitmap.h"
#include "../../menu/menu_driver.h"
#include "../../menu/menu_display.h"
#ifdef HW_RVL #ifdef HW_RVL
#include "../../memory/wii/mem2_manager.h" #include "../../memory/wii/mem2_manager.h"
#endif #endif
#include "../drivers_font_renderer/bitmap.h"
#include "../../defines/gx_defines.h" #include "../../defines/gx_defines.h"
#include "../../configuration.h"
#include "../../driver.h"
#include "../../runloop.h"
#include "../../menu/menu_driver.h"
#include "../../menu/menu_display.h"
extern syssram* __SYS_LockSram(); extern syssram* __SYS_LockSram(void);
extern u32 __SYS_UnlockSram(u32 write); extern u32 __SYS_UnlockSram(u32 write);
struct gx_overlay_data struct gx_overlay_data
@ -66,13 +69,6 @@ typedef struct gx_video
void *framebuf[2]; void *framebuf[2];
} gx_video_t; } gx_video_t;
unsigned g_current_framebuf;
bool g_vsync;
OSCond g_video_cond;
volatile bool g_draw_done;
uint32_t g_orientation;
static struct static struct
{ {
uint32_t *data; /* needs to be resizable. */ uint32_t *data; /* needs to be resizable. */
@ -87,13 +83,19 @@ static struct
GXTexObj obj; GXTexObj obj;
} menu_tex ATTRIBUTE_ALIGN(32); } menu_tex ATTRIBUTE_ALIGN(32);
uint8_t gx_fifo[256 * 1024] ATTRIBUTE_ALIGN(32); static OSCond g_video_cond;
uint8_t display_list[1024] ATTRIBUTE_ALIGN(32); static unsigned g_current_framebuf;
static volatile bool g_draw_done = false;
static bool g_vsync = false;
static uint32_t g_orientation = 0;
static uint8_t gx_fifo[256 * 1024] ATTRIBUTE_ALIGN(32);
static uint8_t display_list[1024] ATTRIBUTE_ALIGN(32);
static size_t display_list_size;
uint16_t gx_xOrigin, gx_yOrigin; uint16_t gx_xOrigin, gx_yOrigin;
int8_t gx_system_xOrigin, gx_used_system_xOrigin; int8_t gx_system_xOrigin, gx_used_system_xOrigin;
int8_t gx_xOriginNeg, gx_xOriginPos; int8_t gx_xOriginNeg, gx_xOriginPos;
int8_t gx_yOriginNeg, gx_yOriginPos; int8_t gx_yOriginNeg, gx_yOriginPos;
size_t display_list_size;
GXRModeObj gx_mode; GXRModeObj gx_mode;
unsigned gx_old_width, gx_old_height; unsigned gx_old_width, gx_old_height;

1
gfx/drivers/nullgfx.c
View File

@ -16,7 +16,6 @@
#include "../../driver.h" #include "../../driver.h"
#include "../../configuration.h" #include "../../configuration.h"
#include "../../runloop.h"
#include "../../verbosity.h" #include "../../verbosity.h"
static void *null_gfx_init(const video_info_t *video, static void *null_gfx_init(const video_info_t *video,

4
gfx/drivers/omap_gfx.c
View File

@ -26,7 +26,7 @@
#include <assert.h> #include <assert.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "../../config.h"
#endif #endif
#include <sys/mman.h> #include <sys/mman.h>
@ -39,8 +39,8 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../general.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../runloop.h"
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../video_frame.h" #include "../video_frame.h"

6
gfx/drivers/psp1_gfx.c
View File

@ -24,9 +24,13 @@
#include <retro_assert.h> #include <retro_assert.h>
#include <retro_inline.h> #include <retro_inline.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "../../defines/psp_defines.h" #include "../../defines/psp_defines.h"
#include "../../general.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../runloop.h"
#ifndef SCEGU_SCR_WIDTH #ifndef SCEGU_SCR_WIDTH
#define SCEGU_SCR_WIDTH 480 #define SCEGU_SCR_WIDTH 480

25
gfx/drivers/sdl2_gfx.c
View File

@ -17,13 +17,21 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <retro_inline.h> #include <retro_inline.h>
#include <gfx/scaler/scaler.h> #include <gfx/scaler/scaler.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#ifdef HAVE_X11
#include "../common/x11_common.h"
#endif
#ifdef HAVE_MENU
#include "../../menu/menu_driver.h"
#endif
#include "SDL.h" #include "SDL.h"
#include "SDL_syswm.h" #include "SDL_syswm.h"
@ -36,15 +44,6 @@
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../font_driver.h" #include "../font_driver.h"
#ifdef HAVE_X11
#include "../common/x11_common.h"
#endif
#ifdef HAVE_MENU
#include "../../menu/menu_driver.h"
#endif
typedef struct sdl2_tex typedef struct sdl2_tex
{ {
SDL_Texture *tex; SDL_Texture *tex;

27
gfx/drivers/sdl_gfx.c
View File

@ -21,27 +21,26 @@
#include <gfx/scaler/scaler.h> #include <gfx/scaler/scaler.h>
#include <retro_assert.h> #include <retro_assert.h>
#include "SDL.h" #ifdef HAVE_CONFIG_H
#include "../../config.h"
#include "../../configuration.h" #endif
#include "../../driver.h"
#include "../../general.h"
#include "../../performance_counters.h"
#include "../video_frame.h"
#include "../video_context_driver.h"
#include "../font_driver.h"
#ifdef HAVE_X11 #ifdef HAVE_X11
#include "../common/x11_common.h" #include "../common/x11_common.h"
#endif #endif
#ifdef HAVE_CONFIG_H #include "SDL.h"
#include "config.h"
#endif
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "../../configuration.h"
#include "../../driver.h"
#include "../../runloop.h"
#include "../../performance_counters.h"
#include "../video_frame.h"
#include "../video_context_driver.h"
#include "../font_driver.h"
typedef struct sdl_menu_frame typedef struct sdl_menu_frame
{ {
bool active; bool active;

6
gfx/drivers/sunxi_gfx.c
View File

@ -24,8 +24,12 @@
#include <rthreads/rthreads.h> #include <rthreads/rthreads.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include "../../general.h" #ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../runloop.h"
#include "../font_driver.h" #include "../font_driver.h"
#define NUMPAGES 2 #define NUMPAGES 2

6
gfx/drivers/vg.c
View File

@ -26,9 +26,13 @@
#include <gfx/math/matrix_3x3.h> #include <gfx/math/matrix_3x3.h>
#include <libretro.h> #include <libretro.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../../general.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../runloop.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../performance_counters.h" #include "../../performance_counters.h"
#include "../font_driver.h" #include "../font_driver.h"

14
gfx/drivers/vita2d_gfx.c
View File

@ -19,16 +19,20 @@
#include <retro_inline.h> #include <retro_inline.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include "../../defines/psp_defines.h" #ifdef HAVE_CONFIG_H
#include "../common/vita2d_common.h" #include "../../config.h"
#include "../../general.h" #endif
#include "../../driver.h"
#include "../video_coord_array.h"
#ifdef HAVE_MENU #ifdef HAVE_MENU
#include "../../menu/menu_driver.h" #include "../../menu/menu_driver.h"
#endif #endif
#include "../../defines/psp_defines.h"
#include "../common/vita2d_common.h"
#include "../../driver.h"
#include "../../runloop.h"
#include "../video_coord_array.h"
static void vita2d_gfx_set_viewport(void *data, unsigned viewport_width, static void vita2d_gfx_set_viewport(void *data, unsigned viewport_width,
unsigned viewport_height, bool force_full, bool allow_rotate); unsigned viewport_height, bool force_full, bool allow_rotate);

16
gfx/drivers/vulkan.c
View File

@ -18,10 +18,6 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <compat/strl.h> #include <compat/strl.h>
#include <gfx/scaler/scaler.h> #include <gfx/scaler/scaler.h>
#include <formats/image.h> #include <formats/image.h>
@ -30,6 +26,14 @@
#include <retro_assert.h> #include <retro_assert.h>
#include <libretro.h> #include <libretro.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#ifdef HAVE_MENU
#include "../../menu/menu_driver.h"
#endif
#include "../common/vulkan_common.h" #include "../common/vulkan_common.h"
#include "../../driver.h" #include "../../driver.h"
@ -41,10 +45,6 @@
#include "../../runloop.h" #include "../../runloop.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#ifdef HAVE_MENU
#include "../../menu/menu_driver.h"
#endif
#include "../font_driver.h" #include "../font_driver.h"
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../video_coord_array.h" #include "../video_coord_array.h"

4
gfx/drivers/xenon360_gfx.c
View File

@ -23,12 +23,12 @@
#include <xenos/xenos.h> #include <xenos/xenos.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "../../config.h"
#endif #endif
#include "../../configuration.h" #include "../../configuration.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../general.h" #include "../../runloop.h"
#define XE_W 512 #define XE_W 512
#define XE_H 512 #define XE_H 512

19
gfx/drivers/xshm_gfx.c
View File

@ -19,21 +19,20 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "../common/x11_common.h"
#ifdef HAVE_MENU
#include "../../menu/menu_driver.h"
#endif
#include <sys/shm.h> #include <sys/shm.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#ifdef HAVE_MENU
#include "../../menu/menu_driver.h"
#endif
#include "../common/x11_common.h"
typedef struct xshm typedef struct xshm
{ {