isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a warning when building the SDL2 winsys

Browse Source 
The SDL2 winsys was using _cogl_set_error without including its header
so it was giving an annoying warning. This patch also fixes some
indentation issues.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 9c8433087b7573f7606dfae2bae3045803ead115)
This commit is contained in:
Neil Roberts 2012-10-03 12:03:18 +01:00 committed by Robert Bragg
parent 2582fa1519
commit 8039c2c779
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cogl/winsys/cogl-winsys-sdl2.c
View File

@ -37,6 +37,7 @@
#include "cogl-context-private.h" #include "cogl-context-private.h"
#include "cogl-onscreen-private.h" #include "cogl-onscreen-private.h"
#include "cogl-winsys-sdl-private.h" #include "cogl-winsys-sdl-private.h"
#include "cogl-error-private.h"
typedef struct _CoglContextSdl2 typedef struct _CoglContextSdl2
{ {
@ -91,9 +92,9 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
if (SDL_VideoInit (NULL) < 0) if (SDL_VideoInit (NULL) < 0)
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_INIT, COGL_WINSYS_ERROR_INIT,
"SDL_Init failed: %s", "SDL_Init failed: %s",
SDL_GetError ()); SDL_GetError ());
return FALSE; return FALSE;
} }
@ -170,9 +171,9 @@ _cogl_winsys_display_setup (CoglDisplay *display,
if (sdl_display->dummy_window == NULL) if (sdl_display->dummy_window == NULL)
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_INIT, COGL_WINSYS_ERROR_INIT,
"SDL_CreateWindow failed: %s", "SDL_CreateWindow failed: %s",
SDL_GetError ()); SDL_GetError ());
goto error; goto error;
} }
@ -181,9 +182,9 @@ _cogl_winsys_display_setup (CoglDisplay *display,
if (sdl_display->context == NULL) if (sdl_display->context == NULL)
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_INIT, COGL_WINSYS_ERROR_INIT,
"SDL_GL_CreateContext failed: %s", "SDL_GL_CreateContext failed: %s",
SDL_GetError ()); SDL_GetError ());
goto error; goto error;
} }
@ -203,8 +204,8 @@ _cogl_winsys_display_setup (CoglDisplay *display,
if (!g_ascii_isdigit (gl_version[0])) if (!g_ascii_isdigit (gl_version[0]))
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_INIT, COGL_WINSYS_ERROR_INIT,
"The GL driver was requested but SDL is using GLES"); "The GL driver was requested but SDL is using GLES");
goto error; goto error;
} }
@ -236,9 +237,9 @@ _cogl_winsys_display_setup (CoglDisplay *display,
if (!g_str_has_prefix (gl_version, "OpenGL ES 2")) if (!g_str_has_prefix (gl_version, "OpenGL ES 2"))
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_INIT, COGL_WINSYS_ERROR_INIT,
"The GLES2 driver was requested but SDL is " "The GLES2 driver was requested but SDL is "
"not using GLES2"); "not using GLES2");
goto error; goto error;
} }
break; break;
@ -247,9 +248,9 @@ _cogl_winsys_display_setup (CoglDisplay *display,
if (!g_str_has_prefix (gl_version, "OpenGL ES 1")) if (!g_str_has_prefix (gl_version, "OpenGL ES 1"))
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_INIT, COGL_WINSYS_ERROR_INIT,
"The GLES1 driver was requested but SDL is " "The GLES1 driver was requested but SDL is "
"not using GLES1"); "not using GLES1");
goto error; goto error;
} }
break; break;
@ -366,9 +367,9 @@ _cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
if (window == NULL) if (window == NULL)
{ {
_cogl_set_error (error, COGL_WINSYS_ERROR, _cogl_set_error (error, COGL_WINSYS_ERROR,
COGL_WINSYS_ERROR_CREATE_ONSCREEN, COGL_WINSYS_ERROR_CREATE_ONSCREEN,
"SDL_CreateWindow failed: %s", "SDL_CreateWindow failed: %s",
SDL_GetError ()); SDL_GetError ());
return FALSE; return FALSE;
} }