Fix references to bbctx-qnx post-rebase

This commit is contained in:
Josh Palmer 2017-01-07 22:09:14 +00:00
parent 5ed17c1ffd
commit b85e2a8897
3 changed files with 19 additions and 19 deletions

View File

@ -69,7 +69,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
&gfx_ctx_android,
#endif
#if defined(__QNX__)
&gfx_ctx_bbqnx,
&gfx_ctx_qnx,
#endif
#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
&gfx_ctx_cocoagl,
@ -124,7 +124,7 @@ bool video_context_driver_find_prev_driver(void)
settings_t *settings = config_get_ptr();
int i = find_video_context_driver_index(
settings->video.context_driver);
if (i > 0)
{
strlcpy(settings->video.context_driver,
@ -233,7 +233,7 @@ static const gfx_ctx_driver_t *video_context_driver_find_driver(void *data,
for (i = 0; gfx_ctx_drivers[i]; i++)
{
const gfx_ctx_driver_t *ctx =
const gfx_ctx_driver_t *ctx =
video_context_driver_init(data, gfx_ctx_drivers[i], ident,
api, major, minor, hw_render_ctx);
@ -268,8 +268,8 @@ const gfx_ctx_driver_t *video_context_driver_init_first(void *data,
bool video_context_driver_check_window(gfx_ctx_size_t *size_data)
{
if ( video_context_data
&& current_video_context
if ( video_context_data
&& current_video_context
&& current_video_context->check_window)
{
current_video_context->check_window(video_context_data,
@ -285,7 +285,7 @@ bool video_context_driver_check_window(gfx_ctx_size_t *size_data)
bool video_context_driver_init_image_buffer(const video_info_t *data)
{
if ( current_video_context
if ( current_video_context
&& current_video_context->image_buffer_init
&& current_video_context->image_buffer_init(video_context_data, data))
return true;
@ -305,7 +305,7 @@ bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img)
bool video_context_driver_get_video_output_prev(void)
{
if (!current_video_context
if (!current_video_context
|| !current_video_context->get_video_output_prev)
return false;
current_video_context->get_video_output_prev(video_context_data);
@ -314,7 +314,7 @@ bool video_context_driver_get_video_output_prev(void)
bool video_context_driver_get_video_output_next(void)
{
if (!current_video_context ||
if (!current_video_context ||
!current_video_context->get_video_output_next)
return false;
current_video_context->get_video_output_next(video_context_data);
@ -398,7 +398,7 @@ bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc)
bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics)
{
if ( current_video_context
if ( current_video_context
&& current_video_context->get_metrics
&& current_video_context->get_metrics(video_context_data,
metrics->type,
@ -418,7 +418,7 @@ bool video_context_driver_input_driver(gfx_ctx_input_t *inp)
bool video_context_driver_suppress_screensaver(bool *bool_data)
{
if ( video_context_data
if ( video_context_data
&& current_video_context
&& current_video_context->suppress_screensaver(
video_context_data, *bool_data))

View File

@ -39,7 +39,7 @@ enum gfx_ctx_api
GFX_CTX_OPENVG_API,
GFX_CTX_VULKAN_API
};
enum display_metric_types
{
DISPLAY_METRIC_NONE = 0,
@ -107,7 +107,7 @@ typedef struct gfx_ctx_driver
void (*check_window)(void*, bool*, bool*,
unsigned*, unsigned*, unsigned);
/* Acknowledge a resize event. This is needed for some APIs.
/* Acknowledge a resize event. This is needed for some APIs.
* Most backends will ignore this. */
bool (*set_resize)(void*, unsigned, unsigned);
@ -116,11 +116,11 @@ typedef struct gfx_ctx_driver
/* Should the screensaver be suppressed? */
bool (*suppress_screensaver)(void *data, bool enable);
/* Checks if context driver has windowed support. */
bool (*has_windowed)(void*);
/* Swaps buffers. VBlank sync depends on
/* Swaps buffers. VBlank sync depends on
* earlier calls to swap_interval. */
void (*swap_buffers)(void*, video_frame_info_t video_info);
@ -132,19 +132,19 @@ typedef struct gfx_ctx_driver
* Does not take opaque, to avoid lots of ugly wrapper code. */
gfx_ctx_proc_t (*get_proc_address)(const char*);
/* Returns true if this context supports EGLImage buffers for
/* Returns true if this context supports EGLImage buffers for
* screen drawing and was initalized correctly. */
bool (*image_buffer_init)(void*, const video_info_t*);
/* Writes the frame to the EGLImage and sets image_handle to it.
/* Writes the frame to the EGLImage and sets image_handle to it.
* Returns true if a new image handle is created.
* Always returns true the first time it's called for a new index.
* Always returns true the first time it's called for a new index.
* The graphics core must handle a change in the handle correctly. */
bool (*image_buffer_write)(void*, const void *frame, unsigned width,
unsigned height, unsigned pitch, bool rgb32,
unsigned index, void **image_handle);
/* Shows or hides mouse. Can be NULL if context doesn't
/* Shows or hides mouse. Can be NULL if context doesn't
* have a concept of mouse pointer. */
void (*show_mouse)(void *data, bool state);
@ -243,7 +243,7 @@ extern const gfx_ctx_driver_t gfx_ctx_android;
extern const gfx_ctx_driver_t gfx_ctx_ps3;
extern const gfx_ctx_driver_t gfx_ctx_wgl;
extern const gfx_ctx_driver_t gfx_ctx_videocore;
extern const gfx_ctx_driver_t gfx_ctx_bbqnx;
extern const gfx_ctx_driver_t gfx_ctx_qnx;
extern const gfx_ctx_driver_t gfx_ctx_cgl;
extern const gfx_ctx_driver_t gfx_ctx_cocoagl;
extern const gfx_ctx_driver_t gfx_ctx_emscripten;

View File