Skip to content

Commit 8b22743

Browse files
committed
Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF
Removal of the MSAA in LCC Conflicts: GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
2 parents ae84dec + 9da8afe commit 8b22743

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,6 @@ inline QGLContext* createOpenGLContext()
3434
result->create();
3535
return result;
3636
}
37-
38-
inline QGLContext* createOpenGLMSAAContext()
39-
{
40-
QOpenGLContext *context = new QOpenGLContext();
41-
QSurfaceFormat format;
42-
format.setVersion(2,1);
43-
format.setProfile(QSurfaceFormat::CompatibilityProfile);
44-
format.setSamples(16);
45-
context->setFormat(format);
46-
QGLContext *result = QGLContext::fromOpenGLContext(context);
47-
result->create();
48-
return result;
49-
}
5037
} // namespace Qt
5138
} // namespace CGAL
5239
#endif

Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <QDebug>
2929

3030
Viewer::Viewer(QWidget* parent)
31-
: QGLViewer(CGAL::Qt::createOpenGLMSAAContext(),parent), wireframe(false),
31+
: QGLViewer(CGAL::Qt::createOpenGLContext(),parent), wireframe(false),
3232
flatShading(true), edges(true), vertices(true),
3333
m_previous_scene_empty(true), are_buffers_initialized(false)
3434
{

0 commit comments

Comments
 (0)