From be2f6a7c614550ef0132c48892d8f1b4270431eb Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 14 Jan 2022 10:24:44 +0100 Subject: [PATCH] glgsg: Fix missing GR_adjacency geom rendering flag I don't think this flag being missing currently affects any functionality, but it is meant to be set when geometry shaders (with adjacency) are supported. --- panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 54a62e10bb..4884fb9c20 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -827,12 +827,6 @@ reset() { Geom::GR_line_strip | Geom::GR_flat_last_vertex; -#ifndef OPENGLES - if (_supports_geometry_shaders) { - _supported_geom_rendering |= Geom::GR_adjacency; - } -#endif - _supports_point_parameters = false; #ifdef OPENGLES_1 @@ -1769,6 +1763,10 @@ reset() { _supports_geometry_shaders = false; _glFramebufferTexture = nullptr; } + + if (_supports_geometry_shaders) { + _supported_geom_rendering |= Geom::GR_adjacency; + } #endif _shader_caps._supports_glsl = _supports_glsl;