mesa: don't use dummy_true for some MESA extensions
Otherwise we can't use MESA_EXTENSION_OVERRIDE, or rather: disabling one extension using dummy_true will disable all others. Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13364>
This commit is contained in:
parent
8a03e25977
commit
596597f4a4
|
@ -333,6 +333,14 @@ _mesa_init_extensions(struct gl_extensions *extensions)
|
||||||
|
|
||||||
/* Then, selectively turn default extensions on. */
|
/* Then, selectively turn default extensions on. */
|
||||||
extensions->dummy_true = GL_TRUE;
|
extensions->dummy_true = GL_TRUE;
|
||||||
|
|
||||||
|
/* Always enable these extensions for all drivers.
|
||||||
|
* We can't use dummy_true in extensions_table.h for these
|
||||||
|
* because this would make them non-disablable using
|
||||||
|
* _mesa_override_extensions.
|
||||||
|
*/
|
||||||
|
extensions->MESA_pack_invert = GL_TRUE;
|
||||||
|
extensions->MESA_window_pos = GL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -371,11 +371,11 @@ EXT(KHR_texture_compression_astc_sliced_3d , KHR_texture_compression_astc_slice
|
||||||
|
|
||||||
EXT(MESA_bgra , dummy_true , x , x , x , ES2, 2021)
|
EXT(MESA_bgra , dummy_true , x , x , x , ES2, 2021)
|
||||||
EXT(MESA_framebuffer_flip_y , MESA_framebuffer_flip_y , 43, 43, x , 30, 2018)
|
EXT(MESA_framebuffer_flip_y , MESA_framebuffer_flip_y , 43, 43, x , 30, 2018)
|
||||||
EXT(MESA_pack_invert , dummy_true , GLL, GLC, x , x , 2002)
|
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_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_texture_signed_rgba , EXT_texture_snorm , GLL, GLC, x , x , 2009)
|
||||||
EXT(MESA_tile_raster_order , MESA_tile_raster_order , GLL, GLC, x , ES2, 2017)
|
EXT(MESA_tile_raster_order , MESA_tile_raster_order , GLL, GLC, x , ES2, 2017)
|
||||||
EXT(MESA_window_pos , dummy_true , GLL, x , x , x , 2000)
|
EXT(MESA_window_pos , MESA_window_pos , GLL, x , x , x , 2000)
|
||||||
EXT(MESA_ycbcr_texture , MESA_ycbcr_texture , GLL, GLC, x , x , 2002)
|
EXT(MESA_ycbcr_texture , MESA_ycbcr_texture , GLL, GLC, x , x , 2002)
|
||||||
|
|
||||||
EXT(NVX_gpu_memory_info , NVX_gpu_memory_info , GLL, GLC, x , x , 2013)
|
EXT(NVX_gpu_memory_info , NVX_gpu_memory_info , GLL, GLC, x , x , 2013)
|
||||||
|
|
|
@ -4565,10 +4565,12 @@ struct gl_extensions
|
||||||
GLboolean KHR_texture_compression_astc_ldr;
|
GLboolean KHR_texture_compression_astc_ldr;
|
||||||
GLboolean KHR_texture_compression_astc_sliced_3d;
|
GLboolean KHR_texture_compression_astc_sliced_3d;
|
||||||
GLboolean MESA_framebuffer_flip_y;
|
GLboolean MESA_framebuffer_flip_y;
|
||||||
|
GLboolean MESA_pack_invert;
|
||||||
GLboolean MESA_tile_raster_order;
|
GLboolean MESA_tile_raster_order;
|
||||||
GLboolean EXT_shader_framebuffer_fetch;
|
GLboolean EXT_shader_framebuffer_fetch;
|
||||||
GLboolean EXT_shader_framebuffer_fetch_non_coherent;
|
GLboolean EXT_shader_framebuffer_fetch_non_coherent;
|
||||||
GLboolean MESA_shader_integer_functions;
|
GLboolean MESA_shader_integer_functions;
|
||||||
|
GLboolean MESA_window_pos;
|
||||||
GLboolean MESA_ycbcr_texture;
|
GLboolean MESA_ycbcr_texture;
|
||||||
GLboolean NV_alpha_to_coverage_dither_control;
|
GLboolean NV_alpha_to_coverage_dither_control;
|
||||||
GLboolean NV_compute_shader_derivatives;
|
GLboolean NV_compute_shader_derivatives;
|
||||||
|
|
Loading…
Reference in New Issue