diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/OffscreenContext.cc | 4 | ||||
| -rw-r--r-- | tests/OffscreenContextWGL.cc | 5 | ||||
| -rw-r--r-- | tests/cgalpngtest.cc | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/OffscreenContext.cc b/tests/OffscreenContext.cc index c50097f..0679962 100644 --- a/tests/OffscreenContext.cc +++ b/tests/OffscreenContext.cc @@ -110,7 +110,7 @@ bool create_glx_dummy_window(OffscreenContext &ctx) GLXContext context = glXCreateNewContext( dpy, fbconfigs[0], GLX_RGBA_TYPE, NULL, True ); if ( context == NULL ) { - cerr << "glXGetVisualFromFBConfig failed\n"; + cerr << "glXCreateNewContext failed\n"; XDestroyWindow( dpy, xWin ); XFree( visinfo ); XFree( fbconfigs ); @@ -150,7 +150,7 @@ Bool create_glx_dummy_context(OffscreenContext &ctx) } // glxQueryVersion is not always reliable. Use it, but then - // also check to see if GLX 1.3 functions exist + // also check to see if GLX 1.3 functions exist glXQueryVersion(ctx.xdisplay, &major, &minor); diff --git a/tests/OffscreenContextWGL.cc b/tests/OffscreenContextWGL.cc index 844c073..7e97676 100644 --- a/tests/OffscreenContextWGL.cc +++ b/tests/OffscreenContextWGL.cc @@ -172,12 +172,13 @@ OffscreenContext *create_offscreen_context(int w, int h) bool teardown_offscreen_context(OffscreenContext *ctx) { if (ctx) { + fbo_unbind(ctx->fbo); + fbo_delete(ctx->fbo); + wglMakeCurrent( NULL, NULL ); wglDeleteContext( ctx->openGLContext ); ReleaseDC( ctx->window, ctx->dev_context ); - fbo_unbind(ctx->fbo); - fbo_delete(ctx->fbo); return true; } return false; diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc index 41e7eaf..734f6eb 100644 --- a/tests/cgalpngtest.cc +++ b/tests/cgalpngtest.cc @@ -223,7 +223,7 @@ int main(int argc, char **argv) if (cgalRenderer.polyhedron) { CGAL::Bbox_3 cgalbbox = cgalRenderer.polyhedron->bbox(); bbox = BoundingBox(Vector3d(cgalbbox.xmin(), cgalbbox.ymin(), cgalbbox.zmin()), - Vector3d(cgalbbox.xmax(), cgalbbox.ymax(), cgalbbox.zmax())); + Vector3d(cgalbbox.xmax(), cgalbbox.ymax(), cgalbbox.zmax())); } else if (cgalRenderer.polyset) { bbox = cgalRenderer.polyset->getBoundingBox(); @@ -246,4 +246,3 @@ int main(int argc, char **argv) return 0; } - |