(Drivers context) Cleanups

This commit is contained in:
twinaphex 2016-12-04 03:51:12 +01:00
parent cd8fad87fc
commit 49c78ea2ff
2 changed files with 15 additions and 14 deletions

View File

@ -40,13 +40,13 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../runloop.h" #include "../../runloop.h"
static enum gfx_ctx_api android_api; static enum gfx_ctx_api android_api = GFX_CTX_NONE;
/* forward declaration */ /* forward declaration */
int system_property_get(const char *cmd, const char *args, char *value); int system_property_get(const char *cmd, const char *args, char *value);
#ifdef HAVE_OPENGLES #ifdef HAVE_OPENGLES
static bool g_es3; static bool g_es3 = false;
#ifndef EGL_OPENGL_ES3_BIT_KHR #ifndef EGL_OPENGL_ES3_BIT_KHR
#define EGL_OPENGL_ES3_BIT_KHR 0x0040 #define EGL_OPENGL_ES3_BIT_KHR 0x0040
@ -407,6 +407,7 @@ static bool android_gfx_ctx_bind_api(void *data,
#else #else
break; break;
#endif #endif
case GFX_CTX_NONE:
default: default:
break; break;
} }
@ -416,7 +417,7 @@ static bool android_gfx_ctx_bind_api(void *data,
static bool android_gfx_ctx_has_focus(void *data) static bool android_gfx_ctx_has_focus(void *data)
{ {
bool focused; bool focused = false;
struct android_app *android_app = (struct android_app*)g_android; struct android_app *android_app = (struct android_app*)g_android;
if (!android_app) if (!android_app)
return true; return true;

View File

@ -61,14 +61,14 @@
#endif #endif
static enum gfx_ctx_api drm_api; static enum gfx_ctx_api drm_api = GFX_CTX_NONE;
static struct gbm_bo *g_bo; static struct gbm_bo *g_bo = NULL;
static struct gbm_bo *g_next_bo; static struct gbm_bo *g_next_bo = NULL;
static struct gbm_surface *g_gbm_surface; static struct gbm_surface *g_gbm_surface = NULL;
static struct gbm_device *g_gbm_dev; static struct gbm_device *g_gbm_dev = NULL;
static bool waiting_for_flip; static bool waiting_for_flip = false;
typedef struct gfx_ctx_drm_data typedef struct gfx_ctx_drm_data
{ {