From 1bf436e014cb220f80c56683ee949ad93b2116a0 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 13 Nov 2013 13:17:28 -0800 Subject: [PATCH] r200: Sort list of enabled extensions Note that ARB_occlusion_query was previously enabled twice. Signed-off-by: Ian Romanick Reviewed-by: Brian Paul --- src/mesa/drivers/dri/r200/r200_context.c | 26 +++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index dadbd7778c6..331214b76e5 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -367,23 +367,30 @@ GLboolean r200CreateContext( gl_api api, ctx->Extensions.ARB_half_float_pixel = true; ctx->Extensions.ARB_occlusion_query = true; + ctx->Extensions.ARB_point_sprite = true; ctx->Extensions.ARB_texture_border_clamp = true; + ctx->Extensions.ARB_texture_cube_map = true; ctx->Extensions.ARB_texture_env_combine = true; ctx->Extensions.ARB_texture_env_dot3 = true; ctx->Extensions.ARB_texture_env_crossbar = true; ctx->Extensions.ARB_texture_mirror_clamp_to_edge = true; + ctx->Extensions.ARB_vertex_program = true; + ctx->Extensions.ATI_fragment_shader = (ctx->Const.MaxTextureUnits == 6); + ctx->Extensions.ATI_texture_env_combine3 = true; + ctx->Extensions.ATI_texture_mirror_once = true; ctx->Extensions.EXT_blend_color = true; + ctx->Extensions.EXT_blend_equation_separate = true; + ctx->Extensions.EXT_blend_func_separate = true; ctx->Extensions.EXT_blend_minmax = true; + ctx->Extensions.EXT_gpu_program_parameters = true; ctx->Extensions.EXT_packed_depth_stencil = true; + ctx->Extensions.EXT_point_parameters = true; ctx->Extensions.EXT_texture_env_dot3 = true; ctx->Extensions.EXT_texture_filter_anisotropic = true; ctx->Extensions.EXT_texture_mirror_clamp = true; - ctx->Extensions.ATI_texture_env_combine3 = true; - ctx->Extensions.ATI_texture_mirror_once = true; ctx->Extensions.MESA_pack_invert = true; ctx->Extensions.NV_texture_rectangle = true; ctx->Extensions.OES_EGL_image = true; - ctx->Extensions.ARB_occlusion_query = true; if (!(rmesa->radeon.radeonScreen->chip_flags & R200_CHIPSET_YCBCR_BROKEN)) { /* yuv textures don't work with some chips - R200 / rv280 okay so far @@ -399,19 +406,6 @@ GLboolean r200CreateContext( gl_api api, ctx->Extensions.ANGLE_texture_compression_dxt = true; } - ctx->Extensions.ARB_texture_cube_map = true; - - ctx->Extensions.EXT_blend_equation_separate = true; - ctx->Extensions.EXT_blend_func_separate = true; - - ctx->Extensions.ARB_vertex_program = true; - ctx->Extensions.EXT_gpu_program_parameters = true; - - ctx->Extensions.ATI_fragment_shader = (ctx->Const.MaxTextureUnits == 6); - - ctx->Extensions.ARB_point_sprite = true; - ctx->Extensions.EXT_point_parameters = true; - #if 0 r200InitDriverFuncs( ctx ); r200InitIoctlFuncs( ctx ); -- 2.30.2