Mesa (master): st/mesa: only require ESSL 3.1 for geometry shaders

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Oct 21 09:09:44 UTC 2019


Module: Mesa
Branch: master
Commit: 2d5edf2558869178515cd62b2305e01c2b3cfa35
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d5edf2558869178515cd62b2305e01c2b3cfa35

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Fri Oct 18 09:37:54 2019 +0200

st/mesa: only require ESSL 3.1 for geometry shaders

According to the OES_geometry_shader spec, section Dependencies:

   "OpenGL ES 3.1 and OpenGL ES Shading Language 3.10
    are required."

Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>

---

 src/mesa/state_tracker/st_extensions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 12a1fabe620..ba912d35be8 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1174,7 +1174,7 @@ void st_init_extensions(struct pipe_screen *screen,
     * invocations of a geometry shader. There is no separate cap for that, so
     * we check the GLSLVersion.
     */
-   if ((GLSLVersion >= 400 || ESSLVersion >= 320) &&
+   if ((GLSLVersion >= 400 || ESSLVersion >= 310) &&
        screen->get_shader_param(screen, PIPE_SHADER_GEOMETRY,
                                 PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {
       extensions->OES_geometry_shader = GL_TRUE;




More information about the mesa-commit mailing list