Skip to content

Commit 5c0f4f4

Browse files
inactive123inactive123
committed
Cleanups
1 parent ac6362c commit 5c0f4f4

File tree

3 files changed

+62
-28
lines changed

3 files changed

+62
-28
lines changed

‎gfx/video_context_driver.c

+36-16
Original file line numberDiff line numberDiff line change
@@ -280,24 +280,32 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data)
280280
}
281281
break;
282282
case GFX_CTL_FIND_PREV_DRIVER:
283-
return gfx_ctl_find_prev_driver();
283+
if (!gfx_ctl_find_prev_driver())
284+
return false;
285+
break;
284286
case GFX_CTL_FIND_NEXT_DRIVER:
285-
return gfx_ctl_find_next_driver();
287+
if (!gfx_ctl_find_next_driver())
288+
return false;
289+
break;
286290
case GFX_CTL_IMAGE_BUFFER_INIT:
287291
if (!current_video_context || !current_video_context->image_buffer_init)
288292
return false;
289-
return current_video_context->image_buffer_init(video_context_data,
290-
(const video_info_t*)data);
293+
if (!current_video_context->image_buffer_init(video_context_data,
294+
(const video_info_t*)data))
295+
return false;
296+
break;
291297
case GFX_CTL_IMAGE_BUFFER_WRITE:
292298
{
293299
gfx_ctx_image_t *img = (gfx_ctx_image_t*)data;
294300

295301
if (!current_video_context || !current_video_context->image_buffer_write)
296302
return false;
297-
return current_video_context->image_buffer_write(video_context_data,
303+
if (!current_video_context->image_buffer_write(video_context_data,
298304
img->frame, img->width, img->height, img->pitch,
299-
img->rgb32, img->index, img->handle);
305+
img->rgb32, img->index, img->handle))
306+
return false;
300307
}
308+
break;
301309
case GFX_CTL_GET_VIDEO_OUTPUT_PREV:
302310
if (!current_video_context
303311
|| !current_video_context->get_video_output_prev)
@@ -339,11 +347,15 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data)
339347
case GFX_CTL_FOCUS:
340348
if (!video_context_data || !current_video_context->has_focus)
341349
return false;
342-
return current_video_context->has_focus(video_context_data);
350+
if (!current_video_context->has_focus(video_context_data))
351+
return false;
352+
break;
343353
case GFX_CTL_HAS_WINDOWED:
344354
if (!video_context_data)
345355
return false;
346-
return current_video_context->has_windowed(video_context_data);
356+
if (!current_video_context->has_windowed(video_context_data))
357+
return false;
358+
break;
347359
case GFX_CTL_FREE:
348360
if (current_video_context->destroy)
349361
current_video_context->destroy(video_context_data);
@@ -383,10 +395,12 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data)
383395
gfx_ctx_metrics_t *metrics = (gfx_ctx_metrics_t*)data;
384396
if (!current_video_context || !current_video_context->get_metrics)
385397
return false;
386-
return current_video_context->get_metrics(video_context_data,
398+
if (!current_video_context->get_metrics(video_context_data,
387399
metrics->type,
388-
metrics->value);
400+
metrics->value))
401+
return false;
389402
}
403+
break;
390404
case GFX_CTL_INPUT_DRIVER:
391405
{
392406
gfx_ctx_input_t *inp = (gfx_ctx_input_t*)data;
@@ -401,9 +415,11 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data)
401415
bool *bool_data = (bool*)data;
402416
if (!video_context_data || !current_video_context)
403417
return false;
404-
return current_video_context->suppress_screensaver(
405-
video_context_data, *bool_data);
418+
if (!current_video_context->suppress_screensaver(
419+
video_context_data, *bool_data))
420+
return false;
406421
}
422+
break;
407423
case GFX_CTL_IDENT_GET:
408424
{
409425
gfx_ctx_ident_t *ident = (gfx_ctx_ident_t*)data;
@@ -417,18 +433,22 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data)
417433
gfx_ctx_mode_t *mode_info = (gfx_ctx_mode_t*)data;
418434
if (!current_video_context || !current_video_context->set_video_mode)
419435
return false;
420-
return current_video_context->set_video_mode(
436+
if (!current_video_context->set_video_mode(
421437
video_context_data, mode_info->width,
422-
mode_info->height, mode_info->fullscreen);
438+
mode_info->height, mode_info->fullscreen))
439+
return false;
423440
}
441+
break;
424442
case GFX_CTL_SET_RESIZE:
425443
{
426444
gfx_ctx_mode_t *mode_info = (gfx_ctx_mode_t*)data;
427445
if (!current_video_context)
428446
return false;
429-
return current_video_context->set_resize(
430-
video_context_data, mode_info->width, mode_info->height);
447+
if (!current_video_context->set_resize(
448+
video_context_data, mode_info->width, mode_info->height))
449+
return false;
431450
}
451+
break;
432452
case GFX_CTL_GET_VIDEO_SIZE:
433453
{
434454
gfx_ctx_mode_t *mode_info = (gfx_ctx_mode_t*)data;

‎gfx/video_driver.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -1548,8 +1548,10 @@ bool video_driver_ctl(enum rarch_display_ctl_state state, void *data)
15481548
case RARCH_DISPLAY_CTL_READ_VIEWPORT:
15491549
if (!current_video->read_viewport)
15501550
return false;
1551-
return current_video->read_viewport(video_driver_data,
1552-
(uint8_t*)data);
1551+
if (!current_video->read_viewport(video_driver_data,
1552+
(uint8_t*)data))
1553+
return false;
1554+
break;
15531555
case RARCH_DISPLAY_CTL_CACHED_FRAME_HAS_VALID_FB:
15541556
if (!video_driver_state.frame_cache.data)
15551557
return false;
@@ -1735,8 +1737,10 @@ bool video_driver_ctl(enum rarch_display_ctl_state state, void *data)
17351737
!video_driver_poke ||
17361738
!video_driver_poke->get_hw_render_interface)
17371739
return false;
1738-
return video_driver_poke->get_hw_render_interface(video_driver_data,
1739-
(const struct retro_hw_render_interface**)data);
1740+
if (!video_driver_poke->get_hw_render_interface(video_driver_data,
1741+
(const struct retro_hw_render_interface**)data))
1742+
return false;
1743+
break;
17401744
case RARCH_DISPLAY_CTL_VIEWPORT_INFO:
17411745
if (!current_video || !current_video->viewport_info)
17421746
return false;

‎gfx/video_shader_driver.c

+18-8
Original file line numberDiff line numberDiff line change
@@ -151,24 +151,30 @@ bool video_shader_driver_ctl(enum video_shader_driver_ctl_state state, void *dat
151151
case SHADER_CTL_GET_FEEDBACK_PASS:
152152
if (!current_shader || !current_shader->get_feedback_pass)
153153
return false;
154-
return current_shader->get_feedback_pass(shader_data,
155-
(unsigned*)data);
154+
if (!current_shader->get_feedback_pass(shader_data,
155+
(unsigned*)data))
156+
return false;
157+
break;
156158
case SHADER_CTL_MIPMAP_INPUT:
157159
if (!current_shader)
158160
return false;
159161
{
160162
unsigned *index = (unsigned*)data;
161-
return current_shader->mipmap_input(shader_data, *index);
163+
if (!current_shader->mipmap_input(shader_data, *index))
164+
return false;
162165
}
166+
break;
163167
case SHADER_CTL_SET_COORDS:
164168
{
165169
video_shader_ctx_coords_t *coords = (video_shader_ctx_coords_t*)
166170
data;
167171
if (!current_shader || !current_shader->set_coords)
168172
return false;
169-
return current_shader->set_coords(coords->handle_data,
170-
shader_data, coords->data);
173+
if (!current_shader->set_coords(coords->handle_data,
174+
shader_data, coords->data))
175+
return false;
171176
}
177+
break;
172178
case SHADER_CTL_SCALE:
173179
{
174180
video_shader_ctx_scale_t *scaler = (video_shader_ctx_scale_t*)data;
@@ -202,17 +208,21 @@ bool video_shader_driver_ctl(enum video_shader_driver_ctl_state state, void *dat
202208
return false;
203209
if (!mvp || !mvp->matrix)
204210
return false;
205-
return current_shader->set_mvp(mvp->data, shader_data, mvp->matrix);
211+
if (!current_shader->set_mvp(mvp->data, shader_data, mvp->matrix))
212+
return false;
206213
}
214+
break;
207215
case SHADER_CTL_FILTER_TYPE:
208216
{
209217
video_shader_ctx_filter_t *filter =
210218
(video_shader_ctx_filter_t*)data;
211219
if (!current_shader || !current_shader->filter_type || !filter)
212220
return false;
213-
return current_shader->filter_type(shader_data,
214-
filter->index, filter->smooth);
221+
if (!current_shader->filter_type(shader_data,
222+
filter->index, filter->smooth))
223+
return false;
215224
}
225+
break;
216226
case SHADER_CTL_USE:
217227
{
218228
video_shader_ctx_info_t *shader_info = (video_shader_ctx_info_t*)data;

0 commit comments

Comments
 (0)