Mesa (main): mesa/st: move default enabled extensions into mesa.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 1adff0d0db066b00e01cf9459639dff5505b266a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1adff0d0db066b00e01cf9459639dff5505b266a

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Dec 20 11:27:23 2021 +1000

mesa/st: move default enabled extensions into mesa.

This just moves a bunch of true assignments into the core

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14261>

---

 src/mesa/main/extensions.c             | 42 +++++++++++++++++++++++++++++++
 src/mesa/state_tracker/st_extensions.c | 45 ----------------------------------
 2 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 6c9c6fd6bec..96d19c6d54b 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -264,6 +264,48 @@ _mesa_init_extensions(struct gl_extensions *extensions)
     */
    extensions->MESA_pack_invert = GL_TRUE;
    extensions->MESA_window_pos = GL_TRUE;
+
+   extensions->ARB_ES2_compatibility = GL_TRUE;
+   extensions->ARB_depth_texture = GL_TRUE;
+   extensions->ARB_draw_elements_base_vertex = GL_TRUE;
+   extensions->ARB_explicit_attrib_location = GL_TRUE;
+   extensions->ARB_explicit_uniform_location = GL_TRUE;
+   extensions->ARB_fragment_coord_conventions = GL_TRUE;
+   extensions->ARB_fragment_program = GL_TRUE;
+   extensions->ARB_fragment_shader = GL_TRUE;
+   extensions->ARB_half_float_vertex = GL_TRUE;
+   extensions->ARB_internalformat_query = GL_TRUE;
+   extensions->ARB_internalformat_query2 = GL_TRUE;
+   extensions->ARB_map_buffer_range = GL_TRUE;
+   extensions->ARB_sync = GL_TRUE;
+   extensions->ARB_texture_env_crossbar = GL_TRUE;
+   extensions->ARB_vertex_program = GL_TRUE;
+   extensions->ARB_vertex_shader = GL_TRUE;
+
+   extensions->EXT_blend_color = GL_TRUE;
+   extensions->EXT_blend_func_separate = GL_TRUE;
+   extensions->EXT_blend_minmax = GL_TRUE;
+   extensions->EXT_EGL_image_storage = GL_TRUE;
+   extensions->EXT_gpu_program_parameters = GL_TRUE;
+   extensions->EXT_pixel_buffer_object = GL_TRUE;
+   extensions->EXT_point_parameters = GL_TRUE;
+   extensions->EXT_provoking_vertex = GL_TRUE;
+   extensions->EXT_stencil_two_side = GL_TRUE;
+   extensions->EXT_texture_env_dot3 = GL_TRUE;
+
+   extensions->ATI_fragment_shader = GL_TRUE;
+   extensions->ATI_texture_env_combine3 = GL_TRUE;
+
+   extensions->MESA_framebuffer_flip_y = GL_TRUE;
+
+   extensions->NV_copy_image = GL_TRUE;
+   extensions->NV_fog_distance = GL_TRUE;
+   extensions->NV_texture_env_combine4 = GL_TRUE;
+   extensions->NV_texture_rectangle = GL_TRUE;
+
+   extensions->OES_EGL_image = GL_TRUE;
+   extensions->OES_EGL_image_external = GL_TRUE;
+   extensions->OES_draw_texture = GL_TRUE;
 }
 
 
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index aa5fe924062..adf24b93fca 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1090,51 +1090,6 @@ void st_init_extensions(struct pipe_screen *screen,
         } },
    };
 
-   /*
-    * Extensions that are supported by all Gallium drivers:
-    */
-   extensions->ARB_ES2_compatibility = GL_TRUE;
-   extensions->ARB_depth_texture = GL_TRUE;
-   extensions->ARB_draw_elements_base_vertex = GL_TRUE;
-   extensions->ARB_explicit_attrib_location = GL_TRUE;
-   extensions->ARB_explicit_uniform_location = GL_TRUE;
-   extensions->ARB_fragment_coord_conventions = GL_TRUE;
-   extensions->ARB_fragment_program = GL_TRUE;
-   extensions->ARB_fragment_shader = GL_TRUE;
-   extensions->ARB_half_float_vertex = GL_TRUE;
-   extensions->ARB_internalformat_query = GL_TRUE;
-   extensions->ARB_internalformat_query2 = GL_TRUE;
-   extensions->ARB_map_buffer_range = GL_TRUE;
-   extensions->ARB_sync = GL_TRUE;
-   extensions->ARB_texture_env_crossbar = GL_TRUE;
-   extensions->ARB_vertex_program = GL_TRUE;
-   extensions->ARB_vertex_shader = GL_TRUE;
-
-   extensions->EXT_blend_color = GL_TRUE;
-   extensions->EXT_blend_func_separate = GL_TRUE;
-   extensions->EXT_blend_minmax = GL_TRUE;
-   extensions->EXT_EGL_image_storage = GL_TRUE;
-   extensions->EXT_gpu_program_parameters = GL_TRUE;
-   extensions->EXT_pixel_buffer_object = GL_TRUE;
-   extensions->EXT_point_parameters = GL_TRUE;
-   extensions->EXT_provoking_vertex = GL_TRUE;
-   extensions->EXT_stencil_two_side = GL_TRUE;
-   extensions->EXT_texture_env_dot3 = GL_TRUE;
-
-   extensions->ATI_fragment_shader = GL_TRUE;
-   extensions->ATI_texture_env_combine3 = GL_TRUE;
-
-   extensions->MESA_framebuffer_flip_y = GL_TRUE;
-
-   extensions->NV_copy_image = GL_TRUE;
-   extensions->NV_fog_distance = GL_TRUE;
-   extensions->NV_texture_env_combine4 = GL_TRUE;
-   extensions->NV_texture_rectangle = GL_TRUE;
-
-   extensions->OES_EGL_image = GL_TRUE;
-   extensions->OES_EGL_image_external = GL_TRUE;
-   extensions->OES_draw_texture = GL_TRUE;
-
    /* Expose the extensions which directly correspond to gallium caps. */
    for (i = 0; i < ARRAY_SIZE(cap_mapping); i++) {
       if (screen->get_param(screen, cap_mapping[i].cap)) {