From c093fc0fa4af342514a9970cb63a1f75be93f724 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 21 Dec 2015 17:58:30 +0100 Subject: [PATCH] Eliminate unnecessary glHint and glPointParametefv calls --- .../glstuff/glGraphicsStateGuardian_src.cxx | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 03dda353cf..8e3857025a 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -3066,7 +3066,6 @@ prepare_display_region(DisplayRegionPipelineReader *dr) { } report_my_gl_errors(); - do_point_size(); } //////////////////////////////////////////////////////////////////// @@ -6264,31 +6263,32 @@ do_issue_antialias() { } #ifndef OPENGLES_2 + GLenum quality; switch (target_antialias->get_mode_quality()) { case AntialiasAttrib::M_faster: - glHint(GL_LINE_SMOOTH_HINT, GL_FASTEST); - glHint(GL_POINT_SMOOTH_HINT, GL_FASTEST); -#ifndef OPENGLES - glHint(GL_POLYGON_SMOOTH_HINT, GL_FASTEST); -#endif // OPENGLES + quality = GL_FASTEST; break; case AntialiasAttrib::M_better: - glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); - glHint(GL_POINT_SMOOTH_HINT, GL_NICEST); -#ifndef OPENGLES - glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST); -#endif // OPENGLES + quality = GL_NICEST; break; default: - glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE); - glHint(GL_POINT_SMOOTH_HINT, GL_DONT_CARE); -#ifndef OPENGLES - glHint(GL_POLYGON_SMOOTH_HINT, GL_DONT_CARE); -#endif // OPENGLES + quality = GL_DONT_CARE; break; } + + if (_line_smooth_enabled) { + glHint(GL_LINE_SMOOTH_HINT, quality); + } + if (_point_smooth_enabled) { + glHint(GL_POINT_SMOOTH_HINT, quality); + } +#ifndef OPENGLES + if (_polygon_smooth_enabled) { + glHint(GL_POLYGON_SMOOTH_HINT, quality); + } +#endif #endif // !OPENGLES_2 report_my_gl_errors();