(gfx/drivers) Style nits

This commit is contained in:
twinaphex 2015-04-11 08:39:37 +02:00
parent e76f8b9a71
commit 54b10d8eca
3 changed files with 325 additions and 325 deletions

View File

@ -1117,11 +1117,11 @@ static void update_scaler(omap_video_t *vid, struct scaler_ctx *scaler,
static void omap_gfx_set_texture_frame(void *data, const void *frame, bool rgb32,
unsigned width, unsigned height, float alpha)
{
(void) alpha;
omap_video_t *vid = (omap_video_t*)data;
enum scaler_pix_fmt format = rgb32 ? SCALER_FMT_ARGB8888 : SCALER_FMT_RGBA4444;
(void) alpha;
update_scaler(vid, &vid->menu.scaler, format, width, height,
width * (rgb32 ? sizeof(uint32_t) : sizeof(uint16_t)));
@ -1130,10 +1130,10 @@ static void omap_gfx_set_texture_frame(void *data, const void *frame, bool rgb32
static void omap_gfx_set_texture_enable(void *data, bool state, bool full_screen)
{
(void) full_screen;
omap_video_t *vid = (omap_video_t*)data;
vid->menu.active = state;
(void) full_screen;
}
static const video_poke_interface_t omap_gfx_poke_interface = {

View File

@ -154,8 +154,7 @@ typedef struct
__disp_rect_t scn_win; /* screen window */
__disp_fb_t fb; /* framebuffer */
signed char b_trd_out; /* if output 3d mode, used for scaler mode layer */
/* output 3d mode, used for scaler mode layer */
unsigned int out_trd_mode;
unsigned int out_trd_mode; /* output 3d mode, used for scaler mode layer */
} __disp_layer_info_t;
/*****************************************************************************
@ -622,10 +621,7 @@ static void *sunxi_gfx_init(const video_info_t *video,
_dispvars->pages = (struct sunxi_page*)calloc(NUMPAGES, sizeof (struct sunxi_page));
if (!_dispvars->pages)
{
free(_dispvars);
return NULL;
}
goto error;
_dispvars->dst_pitch = _dispvars->sunxi_disp->xres * _dispvars->sunxi_disp->bits_per_pixel / 8;
/* Considering 4 bytes per pixel since we will be in 32bpp on the CB/CB2/CT for hw scalers to work. */
@ -645,7 +641,7 @@ static void *sunxi_gfx_init(const video_info_t *video,
pixman_blit = pixman_composite_src_8888_8888_asm_neon;
break;
default:
return NULL;
goto error;
}
_dispvars->pending_mutex = slock_new();
@ -658,6 +654,11 @@ static void *sunxi_gfx_init(const video_info_t *video,
_dispvars->vsync_thread = sthread_create(sunxi_vsync_thread_func, _dispvars);
return _dispvars;
error:
if (_dispvars)
free(_dispvars);
return NULL;
}
static void sunxi_gfx_free(void *data)
@ -894,8 +895,7 @@ static void sunxi_set_texture_frame(void *data, const void *frame, bool rgb32,
{
uint32_t line[dst_width];
uint16_t src_pix;
uint32_t dst_pix;
uint32_t R, G, B;
uint32_t R, G, B, dst_pix;
unsigned int i, j;
struct sunxi_video *_dispvars = (struct sunxi_video*)data;