Commit 53ac57128bb35053fcfd968556de915f2cf86f72
2016-07-20T21:00:36
Pandora: Fixed compile warnings in video implementation (thanks, Bombo!). Fixes Bugzilla #2734.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
diff --git a/src/video/pandora/SDL_pandora.c b/src/video/pandora/SDL_pandora.c
index 93d834f..4bfaa23 100644
--- a/src/video/pandora/SDL_pandora.c
+++ b/src/video/pandora/SDL_pandora.c
@@ -41,8 +41,6 @@
static NativeWindowType hNativeWnd = 0; /* A handle to the window we will create. */
#endif
-static SDL_bool PND_initialized = SDL_FALSE;
-
static int
PND_available(void)
{
@@ -52,8 +50,6 @@ PND_available(void)
static void
PND_destroy(SDL_VideoDevice * device)
{
- SDL_VideoData *phdata = (SDL_VideoData *) device->driverdata;
-
if (device->driverdata != NULL) {
device->driverdata = NULL;
}
@@ -203,10 +199,6 @@ PND_createwindow(_THIS, SDL_Window * window)
SDL_WindowData *wdata;
- uint32_t winargc = 0;
- int32_t status;
-
-
/* Allocate window internal data */
wdata = (SDL_WindowData *) SDL_calloc(1, sizeof(SDL_WindowData));
if (wdata == NULL) {
@@ -291,7 +283,7 @@ PND_restorewindow(_THIS, SDL_Window * window)
{
}
void
-PND_setwindowgrab(_THIS, SDL_Window * window)
+PND_setwindowgrab(_THIS, SDL_Window * window, SDL_bool grabbed)
{
}
void
@@ -325,8 +317,6 @@ PND_getwindowwminfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
int
PND_gl_loadlibrary(_THIS, const char *path)
{
- SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
-
/* Check if OpenGL ES library is specified for GF driver */
if (path == NULL) {
path = SDL_getenv("SDL_OPENGL_LIBRARY");
@@ -364,7 +354,6 @@ PND_gl_loadlibrary(_THIS, const char *path)
void *
PND_gl_getprocaddres(_THIS, const char *proc)
{
- SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
void *function_address;
/* Try to get function address through the egl interface */
@@ -408,10 +397,7 @@ PND_gl_createcontext(_THIS, SDL_Window * window)
{
SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
- SDL_DisplayData *didata =
- (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
EGLBoolean status;
- int32_t gfstatus;
EGLint configs;
uint32_t attr_pos;
EGLint attr_value;
@@ -791,9 +777,6 @@ PND_gl_swapwindow(_THIS, SDL_Window * window)
{
SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
- SDL_DisplayData *didata =
- (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
-
if (phdata->egl_initialized != SDL_TRUE) {
SDL_SetError("PND: GLES initialization failed, no OpenGL ES support");
diff --git a/src/video/pandora/SDL_pandora.h b/src/video/pandora/SDL_pandora.h
index b95cd10..859b7ee 100644
--- a/src/video/pandora/SDL_pandora.h
+++ b/src/video/pandora/SDL_pandora.h
@@ -77,7 +77,7 @@ void PND_raisewindow(_THIS, SDL_Window * window);
void PND_maximizewindow(_THIS, SDL_Window * window);
void PND_minimizewindow(_THIS, SDL_Window * window);
void PND_restorewindow(_THIS, SDL_Window * window);
-void PND_setwindowgrab(_THIS, SDL_Window * window);
+void PND_setwindowgrab(_THIS, SDL_Window * window, SDL_bool grabbed);
void PND_destroywindow(_THIS, SDL_Window * window);
/* Window manager function */