summaryrefslogtreecommitdiff
path: root/navit/graphics/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'navit/graphics/opengl')
-rw-r--r--navit/graphics/opengl/graphics_opengl.c32
-rw-r--r--navit/graphics/opengl/graphics_opengl_egl.c10
-rw-r--r--navit/graphics/opengl/graphics_opengl_x11.c18
3 files changed, 30 insertions, 30 deletions
diff --git a/navit/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c
index a0c2be2fe..c23d57204 100644
--- a/navit/graphics/opengl/graphics_opengl.c
+++ b/navit/graphics/opengl/graphics_opengl.c
@@ -527,7 +527,7 @@ image_new(struct graphics_priv *gr, struct graphics_image_methods *meth,
return gi;
}
#else
- dbg(lvl_error,"FreeImage not available - cannot load any images.\n");
+ dbg(lvl_error,"FreeImage not available - cannot load any images.");
return NULL;
#endif
}
@@ -748,7 +748,7 @@ getPrimitiveType(GLenum type)
void APIENTRY
tessBeginCB(GLenum which)
{
- dbg(lvl_debug, "glBegin( %s );\n", getPrimitiveType(which));
+ dbg(lvl_debug, "glBegin( %s );", getPrimitiveType(which));
tess_type=which;
tess_count=0;
}
@@ -758,7 +758,7 @@ tessBeginCB(GLenum which)
void APIENTRY
tessEndCB(void)
{
- dbg(lvl_debug, "glEnd();\n");
+ dbg(lvl_debug, "glEnd();");
draw_array(graphics_priv_root, tess_array, tess_count, tess_type);
}
@@ -769,14 +769,14 @@ tessVertexCB(const GLvoid * data)
{
// cast back to double type
const GLdouble *ptr = (const GLdouble *) data;
- dbg(lvl_debug, " glVertex3d();\n");
+ dbg(lvl_debug, " glVertex3d();");
tess_array[tess_count].x=ptr[0];
tess_array[tess_count].y=ptr[1];
if (tess_count < 511)
tess_count++;
else
- dbg(lvl_error,"overflow\n");
+ dbg(lvl_error,"overflow");
}
void APIENTRY
@@ -1031,7 +1031,7 @@ draw_text(struct graphics_priv *gr, struct graphics_gc_priv *fg,
int color = 1;
if (!font) {
- dbg(lvl_error, "no font, returning\n");
+ dbg(lvl_error, "no font, returning");
return;
}
@@ -1494,7 +1494,7 @@ static void
click_notify_do(struct graphics_priv *priv, int button, int state, int x, int y)
{
struct point p={x,y};
- dbg(lvl_debug,"enter state %d button %d\n",state,button);
+ dbg(lvl_debug,"enter state %d button %d",state,button);
callback_list_call_attr_3(priv->cbl, attr_button, (void *) state, (void *)button, (void *) &p);
}
#endif
@@ -1738,61 +1738,61 @@ graphics_opengl_new(struct navit *nav, struct graphics_methods *meth,
static void
event_opengl_main_loop_run(void)
{
- dbg(lvl_info, "enter\n");
+ dbg(lvl_info, "enter");
}
static void
event_opengl_main_loop_quit(void)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
}
static struct event_watch *
event_opengl_add_watch(int fd, enum event_watch_cond cond,
struct callback *cb)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
return NULL;
}
static void
event_opengl_remove_watch(struct event_watch *ev)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
}
static struct event_timeout *
event_opengl_add_timeout(int timeout, int multi, struct callback *cb)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
return NULL;
}
static void
event_opengl_remove_timeout(struct event_timeout *to)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
}
static struct event_idle *
event_opengl_add_idle(int priority, struct callback *cb)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
return NULL;
}
static void
event_opengl_remove_idle(struct event_idle *ev)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
}
static void
event_opengl_call_callback(struct callback_list *cb)
{
- dbg(lvl_debug, "enter\n");
+ dbg(lvl_debug, "enter");
}
static struct event_methods event_opengl_methods = {
diff --git a/navit/graphics/opengl/graphics_opengl_egl.c b/navit/graphics/opengl/graphics_opengl_egl.c
index cb91ac88e..64e85e700 100644
--- a/navit/graphics/opengl/graphics_opengl_egl.c
+++ b/navit/graphics/opengl/graphics_opengl_egl.c
@@ -61,21 +61,21 @@ graphics_opengl_egl_new(void *display, void *window, struct graphics_opengl_plat
*methods=&graphics_opengl_egl_methods;
ret->egldisplay = eglGetDisplay((EGLNativeDisplayType)display);
if (!ret->egldisplay) {
- dbg(lvl_error, "can't get display\n");
+ dbg(lvl_error, "can't get display");
goto error;
}
if (!eglInitialize(ret->egldisplay, &major, &minor)) {
- dbg(lvl_error, "eglInitialize failed\n");
+ dbg(lvl_error, "eglInitialize failed");
goto error;
}
- dbg(lvl_debug,"eglInitialize ok with version %d.%d\n",major,minor);
+ dbg(lvl_debug,"eglInitialize ok with version %d.%d",major,minor);
eglBindAPI(EGL_OPENGL_ES_API);
if (!eglChooseConfig(ret->egldisplay, attributeList, ret->config, sizeof(ret->config)/sizeof(EGLConfig), &nconfig)) {
- dbg(lvl_error, "eglChooseConfig failed\n");
+ dbg(lvl_error, "eglChooseConfig failed");
goto error;
}
if (nconfig != 1) {
- dbg(lvl_error, "unexpected number of configs %d\n",nconfig);
+ dbg(lvl_error, "unexpected number of configs %d",nconfig);
goto error;
}
ret->eglwindow = eglCreateWindowSurface(ret->egldisplay, ret->config[0], (NativeWindowType) window, NULL);
diff --git a/navit/graphics/opengl/graphics_opengl_x11.c b/navit/graphics/opengl/graphics_opengl_x11.c
index 8f4b02eaf..a52192406 100644
--- a/navit/graphics/opengl/graphics_opengl_x11.c
+++ b/navit/graphics/opengl/graphics_opengl_x11.c
@@ -86,29 +86,29 @@ graphics_opengl_x11_watch(struct graphics_opengl_window_system *x11)
x11->button(x11->data,event.xbutton.button,0,event.xbutton.x,event.xbutton.y);
break;
case ConfigureNotify:
- dbg(lvl_debug,"ConfigureNotify\n");
+ dbg(lvl_debug,"ConfigureNotify");
break;
case Expose:
- dbg(lvl_debug,"Expose\n");
+ dbg(lvl_debug,"Expose");
break;
case KeyPress:
- dbg(lvl_debug,"KeyPress\n");
+ dbg(lvl_debug,"KeyPress");
break;
case KeyRelease:
- dbg(lvl_debug,"KeyRelease\n");
+ dbg(lvl_debug,"KeyRelease");
break;
case MapNotify:
- dbg(lvl_debug,"MapNotify\n");
+ dbg(lvl_debug,"MapNotify");
break;
case MotionNotify:
if (x11->motion)
x11->motion(x11->data,event.xmotion.x,event.xmotion.y);
break;
case ReparentNotify:
- dbg(lvl_debug,"ReparentNotify\n");
+ dbg(lvl_debug,"ReparentNotify");
break;
default:
- dbg(lvl_debug,"type %d\n",event.type);
+ dbg(lvl_debug,"type %d",event.type);
}
}
}
@@ -126,14 +126,14 @@ graphics_opengl_x11_new(void *displayname, int w, int h, int depth, struct graph
*methods=&graphics_opengl_x11_methods;
ret->display=XOpenDisplay(displayname);
if (!ret->display) {
- dbg(lvl_error,"failed to open display\n");
+ dbg(lvl_error,"failed to open display");
goto error;
}
ret->watch=event_add_watch(ConnectionNumber(ret->display), event_watch_cond_read, ret->cb);
ret->screen=XDefaultScreen(ret->display);
ret->root_window=RootWindow(ret->display, ret->screen);
if (!XMatchVisualInfo(ret->display, ret->screen, depth, TrueColor, &ret->visual)) {
- dbg(lvl_error,"failed to find visual\n");
+ dbg(lvl_error,"failed to find visual");
goto error;
}
ret->colormap=XCreateColormap(ret->display, ret->root_window, ret->visual.visual, AllocNone);