MESA_shader_integer_functions: Boiler plate extension tracking

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y
index 2cfa6a6825ae2b3571a65caea823abcb331f110c..a1597611144dbbc1f23a1e70d31cdca12c8a2a3e 100644 (file)
--- a/src/compiler/glsl/glcpp/glcpp-parse.y
+++ b/src/compiler/glsl/glcpp/glcpp-parse.y
@@ -2479,6 +2479,9 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
 
       if (extensions->EXT_shader_samples_identical)
          add_builtin_define(parser, "GL_EXT_shader_samples_identical", 1);
+
+      if (extensions->MESA_shader_integer_functions)
+         add_builtin_define(parser, "GL_MESA_shader_integer_functions", 1);
    }
 
    if (version >= 150)

diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index 96014247e5d8adb8ec6093d45b14dd40fd6e88a6..007743497d44af070a9707162a3cb000768a0864 100644 (file)
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -652,6 +652,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
    EXT(EXT_shader_samples_identical,   true,  true,      EXT_shader_samples_identical),
    EXT(EXT_texture_array,              true,  false,     EXT_texture_array),
    EXT(EXT_texture_buffer,             false, true,      OES_texture_buffer),
+   EXT(MESA_shader_integer_functions,  true,  true,      MESA_shader_integer_functions),
 };
 
 #undef EXT

diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h
index 669b3d1b201e2040dd34726eacee9c117d8e584d..9548e62532f7005331f72aa3dfc6defdef3180f2 100644 (file)
--- a/src/compiler/glsl/glsl_parser_extras.h
+++ b/src/compiler/glsl/glsl_parser_extras.h
@@ -681,6 +681,8 @@ struct _mesa_glsl_parse_state {
    bool EXT_texture_array_warn;
    bool EXT_texture_buffer_enable;
    bool EXT_texture_buffer_warn;
+   bool MESA_shader_integer_functions_enable;
+   bool MESA_shader_integer_functions_warn;
    /*@}*/
 
    /** Extensions supported by the OpenGL implementation. */

diff --git a/src/compiler/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp
index 53729af3921b04ed28ecb53d00a1023503250975..b0fb4b726aeb0784f972c8a1b44a9fc51c2bc6f1 100644 (file)
--- a/src/compiler/glsl/standalone_scaffolding.cpp
+++ b/src/compiler/glsl/standalone_scaffolding.cpp
@@ -177,6 +177,8 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api)
    ctx->Extensions.EXT_shader_integer_mix = true;
    ctx->Extensions.EXT_texture_array = true;
 
+   ctx->Extensions.MESA_shader_integer_functions = true;
+
    ctx->Extensions.NV_texture_rectangle = true;
 
    ctx->Const.GLSLVersion = 120;

diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 6c47b3b1e793d104eadf0396689a74574f8d7bb8..cbb3fb8f56e7ecbc58372fea23d11905b6488fac 100644 (file)
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -288,6 +288,7 @@ EXT(KHR_texture_compression_astc_ldr        , KHR_texture_compression_astc_ldr
 EXT(KHR_texture_compression_astc_sliced_3d  , KHR_texture_compression_astc_sliced_3d , GLL, GLC,  x , ES2, 2015)
 
 EXT(MESA_pack_invert                        , MESA_pack_invert                       , GLL, GLC,  x ,  x , 2002)
+EXT(MESA_shader_integer_functions           , MESA_shader_integer_functions          , GLL, GLC,  x ,  30, 2016)
 EXT(MESA_texture_signed_rgba                , EXT_texture_snorm                      , GLL, GLC,  x ,  x , 2009)
 EXT(MESA_window_pos                         , dummy_true                             , GLL,  x ,  x ,  x , 2000)
 EXT(MESA_ycbcr_texture                      , MESA_ycbcr_texture                     , GLL, GLC,  x ,  x , 2002)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ecc5b49073d5848c99134ba6c5a35f6c80f10585..ad046e2a6717fd297d2a305b31cc439036feef3f 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3948,6 +3948,7 @@ struct gl_extensions
    GLboolean KHR_texture_compression_astc_ldr;
    GLboolean KHR_texture_compression_astc_sliced_3d;
    GLboolean MESA_pack_invert;
+   GLboolean MESA_shader_integer_functions;
    GLboolean MESA_ycbcr_texture;
    GLboolean NV_conditional_render;
    GLboolean NV_fog_distance;