NFC. Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu> --- src/mesa/state_tracker/st_extensions.c | 47 ++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 48ed9d2..f2bcf64 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -470,7 +470,8 @@ void st_init_extensions(struct pipe_screen *screen, static const struct st_extension_format_mapping rendertarget_mapping[] = { { { o(ARB_texture_float) }, { PIPE_FORMAT_R32G32B32A32_FLOAT, - PIPE_FORMAT_R16G16B16A16_FLOAT } }, + PIPE_FORMAT_R16G16B16A16_FLOAT }, + GL_FALSE }, { { o(ARB_texture_rgb10_a2ui) }, { PIPE_FORMAT_R10G10B10A2_UINT, @@ -483,22 +484,26 @@ void st_init_extensions(struct pipe_screen *screen, GL_TRUE }, /* at least one format must be supported */ { { o(EXT_packed_float) }, - { PIPE_FORMAT_R11G11B10_FLOAT } }, + { PIPE_FORMAT_R11G11B10_FLOAT }, + GL_FALSE }, { { o(EXT_texture_integer) }, { PIPE_FORMAT_R32G32B32A32_UINT, - PIPE_FORMAT_R32G32B32A32_SINT } }, + PIPE_FORMAT_R32G32B32A32_SINT }, + GL_FALSE }, { { o(ARB_texture_rg) }, { PIPE_FORMAT_R8_UNORM, - PIPE_FORMAT_R8G8_UNORM } }, + PIPE_FORMAT_R8G8_UNORM }, + GL_FALSE }, }; /* Required: depth stencil and sampler support */ static const struct st_extension_format_mapping depthstencil_mapping[] = { { { o(ARB_depth_buffer_float) }, { PIPE_FORMAT_Z32_FLOAT, - PIPE_FORMAT_Z32_FLOAT_S8X24_UINT } }, + PIPE_FORMAT_Z32_FLOAT_S8X24_UINT }, + GL_FALSE }, }; /* Required: sampler support */ @@ -507,32 +512,38 @@ void st_init_extensions(struct pipe_screen *screen, { PIPE_FORMAT_RGTC1_UNORM, PIPE_FORMAT_RGTC1_SNORM, PIPE_FORMAT_RGTC2_UNORM, - PIPE_FORMAT_RGTC2_SNORM } }, + PIPE_FORMAT_RGTC2_SNORM }, + GL_FALSE }, { { o(EXT_texture_compression_latc) }, { PIPE_FORMAT_LATC1_UNORM, PIPE_FORMAT_LATC1_SNORM, PIPE_FORMAT_LATC2_UNORM, - PIPE_FORMAT_LATC2_SNORM } }, + PIPE_FORMAT_LATC2_SNORM }, + GL_FALSE }, { { o(EXT_texture_compression_s3tc), o(ANGLE_texture_compression_dxt) }, { PIPE_FORMAT_DXT1_RGB, PIPE_FORMAT_DXT1_RGBA, PIPE_FORMAT_DXT3_RGBA, - PIPE_FORMAT_DXT5_RGBA } }, + PIPE_FORMAT_DXT5_RGBA }, + GL_FALSE }, { { o(ARB_texture_compression_bptc) }, { PIPE_FORMAT_BPTC_RGBA_UNORM, PIPE_FORMAT_BPTC_SRGBA, PIPE_FORMAT_BPTC_RGB_FLOAT, - PIPE_FORMAT_BPTC_RGB_UFLOAT } }, + PIPE_FORMAT_BPTC_RGB_UFLOAT }, + GL_FALSE }, { { o(EXT_texture_shared_exponent) }, - { PIPE_FORMAT_R9G9B9E5_FLOAT } }, + { PIPE_FORMAT_R9G9B9E5_FLOAT }, + GL_FALSE }, { { o(EXT_texture_snorm) }, - { PIPE_FORMAT_R8G8B8A8_SNORM } }, + { PIPE_FORMAT_R8G8B8A8_SNORM }, + GL_FALSE }, { { o(EXT_texture_sRGB), o(EXT_texture_sRGB_decode) }, @@ -541,7 +552,8 @@ void st_init_extensions(struct pipe_screen *screen, GL_TRUE }, /* at least one format must be supported */ { { o(ATI_texture_compression_3dc) }, - { PIPE_FORMAT_LATC2_UNORM } }, + { PIPE_FORMAT_LATC2_UNORM }, + GL_FALSE }, { { o(MESA_ycbcr_texture) }, { PIPE_FORMAT_UYVY, @@ -569,17 +581,20 @@ void st_init_extensions(struct pipe_screen *screen, PIPE_FORMAT_R10G10B10A2_USCALED, PIPE_FORMAT_B10G10R10A2_USCALED, PIPE_FORMAT_R10G10B10A2_SSCALED, - PIPE_FORMAT_B10G10R10A2_SSCALED } }, + PIPE_FORMAT_B10G10R10A2_SSCALED }, + GL_FALSE }, + { { o(ARB_vertex_type_10f_11f_11f_rev) }, - { PIPE_FORMAT_R11G11B10_FLOAT } }, + { PIPE_FORMAT_R11G11B10_FLOAT }, + GL_FALSE }, }; static const struct st_extension_format_mapping tbo_rgb32[] = { { {o(ARB_texture_buffer_object_rgb32) }, { PIPE_FORMAT_R32G32B32_FLOAT, PIPE_FORMAT_R32G32B32_UINT, - PIPE_FORMAT_R32G32B32_SINT, - } }, + PIPE_FORMAT_R32G32B32_SINT }, + GL_FALSE }, }; /* -- 2.1.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev