From 85ef9930f56bf15181f9a0b238f03d55303cf411 Mon Sep 17 00:00:00 2001
From: marha
Date: Mon, 22 Nov 2010 19:42:40 +0000
Subject: Updated to mesalib 7.9
---
mesalib/Makefile | 175 +-
mesalib/bin/minstall | 21 +-
mesalib/bin/mklib | 45 +-
mesalib/configs/autoconf.in | 59 +-
mesalib/configs/beos | 3 +-
mesalib/configs/bluegene-osmesa | 1 -
mesalib/configs/bluegene-xlc-osmesa | 1 -
mesalib/configs/catamount-osmesa-pgi | 1 -
mesalib/configs/darwin | 3 +-
mesalib/configs/default | 50 +-
mesalib/configs/freebsd-dri | 4 +-
mesalib/configs/linux-cell | 5 +-
mesalib/configs/linux-debug | 2 +-
mesalib/configs/linux-dri | 8 +-
mesalib/configs/linux-dri-xcb | 5 +-
mesalib/configs/linux-egl | 5 +-
mesalib/configs/linux-fbdev | 5 +-
mesalib/configs/linux-i965 | 1 +
mesalib/configs/linux-indirect | 4 +-
mesalib/configs/linux-llvm | 10 +-
mesalib/configs/linux-opengl-es | 10 +-
mesalib/configs/linux-osmesa | 3 +-
mesalib/configs/linux-osmesa-static | 1 -
mesalib/configs/linux-osmesa16 | 3 +-
mesalib/configs/linux-osmesa16-static | 1 -
mesalib/configs/linux-osmesa32 | 3 +-
mesalib/configure | 1289 +-
mesalib/configure.ac | 536 +-
mesalib/docs/MESA_drm_image.spec | 149 +
mesalib/docs/contents.html | 1 -
mesalib/docs/developers.html | 26 +-
mesalib/docs/devinfo.html | 9 +-
mesalib/docs/egl.html | 124 +-
mesalib/docs/fbdev-dri.html | 10 +-
mesalib/docs/install.html | 2 +-
mesalib/docs/intro.html | 8 +-
mesalib/docs/news.html | 19 +-
mesalib/docs/opengles.html | 69 +-
mesalib/docs/relnotes-7.8.2.html | 87 -
mesalib/docs/relnotes-7.9.html | 137 +
mesalib/docs/relnotes.html | 1 +
mesalib/docs/repository.html | 12 +-
mesalib/docs/shading.html | 190 +-
mesalib/docs/subset-A.html | 3 +-
mesalib/include/EGL/eglext.h | 160 +-
mesalib/include/EGL/eglplatform.h | 10 +
mesalib/include/GL/glext.h | 1105 +-
mesalib/include/GL/glfbdev.h | 3 +
mesalib/include/GL/glx.h | 16 -
mesalib/include/GL/glxext.h | 49 +-
mesalib/include/GL/internal/dri_interface.h | 109 +-
mesalib/include/GL/mglmesa.h | 79 -
mesalib/include/GL/wglext.h | 244 +-
mesalib/include/GLES/egl.h | 15 +-
mesalib/include/GLES/egltypes.h | 45 -
mesalib/include/GLES/gl.h | 85 +-
mesalib/include/GLES/glext.h | 648 +-
mesalib/include/GLES/glplatform.h | 86 +-
mesalib/include/GLES2/gl2.h | 123 +-
mesalib/include/GLES2/gl2ext.h | 601 +-
mesalib/include/GLES2/gl2platform.h | 82 +-
mesalib/include/KHR/khrplatform.h | 6 +-
mesalib/include/VG/vgplatform.h | 27 +-
mesalib/progs/Makefile | 32 -
mesalib/progs/util/README | 21 -
mesalib/progs/util/dumpstate.c | 1959 --
mesalib/progs/util/errcheck.c | 27 -
mesalib/progs/util/extfuncs.h | 277 -
mesalib/progs/util/glstate.c | 502 -
mesalib/progs/util/glstate.h | 51 -
mesalib/progs/util/glutskel.c | 141 -
mesalib/progs/util/idproj.c | 26 -
mesalib/progs/util/imagesgi.h | 55 -
mesalib/progs/util/matrix.c | 181 -
mesalib/progs/util/mwmborder.c | 91 -
mesalib/progs/util/readtex.c | 495 -
mesalib/progs/util/readtex.h | 26 -
mesalib/progs/util/sampleMakefile | 47 -
mesalib/progs/util/shaderutil.c | 323 -
mesalib/progs/util/shaderutil.h | 63 -
mesalib/progs/util/showbuffer.c | 198 -
mesalib/progs/util/showbuffer.h | 36 -
mesalib/progs/util/trackball.c | 338 -
mesalib/progs/util/trackball.h | 84 -
mesalib/progs/util/winpos.c | 42 -
mesalib/src/glsl/Makefile | 185 +-
mesalib/src/glsl/README | 229 +
mesalib/src/glsl/SConscript | 121 +-
mesalib/src/glsl/apps/Makefile | 43 -
mesalib/src/glsl/apps/compile.c | 192 -
mesalib/src/glsl/apps/process.c | 383 -
mesalib/src/glsl/apps/purify.c | 108 -
mesalib/src/glsl/apps/tokenise.c | 335 -
mesalib/src/glsl/apps/version.c | 117 -
mesalib/src/glsl/ast.h | 698 +
mesalib/src/glsl/ast_expr.cpp | 96 +
mesalib/src/glsl/ast_function.cpp | 1241 +
mesalib/src/glsl/ast_to_hir.cpp | 2769 ++
mesalib/src/glsl/ast_type.cpp | 122 +
mesalib/src/glsl/builtin_function.cpp | 19203 +++++++++++
mesalib/src/glsl/builtin_types.h | 297 +
mesalib/src/glsl/builtin_variables.h | 105 +
mesalib/src/glsl/cl/Makefile | 13 -
mesalib/src/glsl/cl/sl_cl_parse.c | 3001 --
mesalib/src/glsl/cl/sl_cl_parse.h | 40 -
mesalib/src/glsl/glcpp/README | 32 +
mesalib/src/glsl/glcpp/glcpp-lex.c | 2691 ++
mesalib/src/glsl/glcpp/glcpp-lex.l | 325 +
mesalib/src/glsl/glcpp/glcpp-parse.c | 4184 +++
mesalib/src/glsl/glcpp/glcpp-parse.h | 100 +
mesalib/src/glsl/glcpp/glcpp-parse.y | 1858 ++
mesalib/src/glsl/glcpp/glcpp.c | 123 +
mesalib/src/glsl/glcpp/glcpp.h | 222 +
mesalib/src/glsl/glcpp/pp.c | 167 +
mesalib/src/glsl/glsl_lexer.cpp | 3488 ++
mesalib/src/glsl/glsl_lexer.lpp | 399 +
mesalib/src/glsl/glsl_parser.cpp | 5232 +++
mesalib/src/glsl/glsl_parser.h | 298 +
mesalib/src/glsl/glsl_parser.ypp | 1503 +
mesalib/src/glsl/glsl_parser_extras.cpp | 762 +
mesalib/src/glsl/glsl_parser_extras.h | 236 +
mesalib/src/glsl/glsl_symbol_table.cpp | 160 +
mesalib/src/glsl/glsl_symbol_table.h | 121 +
mesalib/src/glsl/glsl_types.cpp | 497 +
mesalib/src/glsl/glsl_types.h | 476 +
mesalib/src/glsl/hir_field_selection.cpp | 102 +
mesalib/src/glsl/ir.cpp | 1238 +
mesalib/src/glsl/ir.h | 1511 +
mesalib/src/glsl/ir_algebraic.cpp | 474 +
mesalib/src/glsl/ir_basic_block.cpp | 149 +
mesalib/src/glsl/ir_basic_block.h | 28 +
mesalib/src/glsl/ir_clone.cpp | 405 +
mesalib/src/glsl/ir_constant_expression.cpp | 1194 +
mesalib/src/glsl/ir_constant_folding.cpp | 147 +
mesalib/src/glsl/ir_constant_propagation.cpp | 437 +
mesalib/src/glsl/ir_constant_variable.cpp | 198 +
mesalib/src/glsl/ir_copy_propagation.cpp | 348 +
mesalib/src/glsl/ir_dead_code.cpp | 142 +
mesalib/src/glsl/ir_dead_code_local.cpp | 229 +
mesalib/src/glsl/ir_dead_functions.cpp | 151 +
mesalib/src/glsl/ir_div_to_mul_rcp.cpp | 115 +
mesalib/src/glsl/ir_explog_to_explog2.cpp | 85 +
mesalib/src/glsl/ir_expression_flattening.cpp | 92 +
mesalib/src/glsl/ir_expression_flattening.h | 38 +
mesalib/src/glsl/ir_function.cpp | 227 +
mesalib/src/glsl/ir_function_can_inline.cpp | 74 +
mesalib/src/glsl/ir_function_inlining.cpp | 417 +
mesalib/src/glsl/ir_function_inlining.h | 30 +
mesalib/src/glsl/ir_hierarchical_visitor.cpp | 297 +
mesalib/src/glsl/ir_hierarchical_visitor.h | 183 +
mesalib/src/glsl/ir_hv_accept.cpp | 378 +
mesalib/src/glsl/ir_if_simplification.cpp | 84 +
mesalib/src/glsl/ir_if_to_cond_assign.cpp | 168 +
mesalib/src/glsl/ir_import_prototypes.cpp | 138 +
mesalib/src/glsl/ir_lower_jumps.cpp | 544 +
mesalib/src/glsl/ir_mat_op_to_vec.cpp | 488 +
mesalib/src/glsl/ir_mod_to_fract.cpp | 90 +
mesalib/src/glsl/ir_noop_swizzle.cpp | 80 +
mesalib/src/glsl/ir_optimization.h | 61 +
mesalib/src/glsl/ir_print_visitor.cpp | 465 +
mesalib/src/glsl/ir_print_visitor.h | 83 +
mesalib/src/glsl/ir_reader.cpp | 1146 +
mesalib/src/glsl/ir_reader.h | 34 +
mesalib/src/glsl/ir_rvalue_visitor.cpp | 141 +
mesalib/src/glsl/ir_rvalue_visitor.h | 47 +
mesalib/src/glsl/ir_set_program_inouts.cpp | 167 +
mesalib/src/glsl/ir_structure_splitting.cpp | 361 +
mesalib/src/glsl/ir_sub_to_add_neg.cpp | 76 +
mesalib/src/glsl/ir_swizzle_swizzle.cpp | 93 +
mesalib/src/glsl/ir_tree_grafting.cpp | 367 +
mesalib/src/glsl/ir_validate.cpp | 452 +
mesalib/src/glsl/ir_variable.cpp | 493 +
mesalib/src/glsl/ir_variable_refcount.cpp | 113 +
mesalib/src/glsl/ir_variable_refcount.h | 78 +
mesalib/src/glsl/ir_vec_index_to_cond_assign.cpp | 258 +
mesalib/src/glsl/ir_vec_index_to_swizzle.cpp | 157 +
mesalib/src/glsl/ir_visitor.h | 84 +
mesalib/src/glsl/link_functions.cpp | 262 +
mesalib/src/glsl/linker.cpp | 1505 +
mesalib/src/glsl/linker.h | 35 +
mesalib/src/glsl/list.h | 505 +
mesalib/src/glsl/loop_analysis.cpp | 496 +
mesalib/src/glsl/loop_analysis.h | 230 +
mesalib/src/glsl/loop_controls.cpp | 301 +
mesalib/src/glsl/loop_unroll.cpp | 187 +
mesalib/src/glsl/lower_noise.cpp | 71 +
.../glsl/lower_variable_index_to_cond_assign.cpp | 358 +
mesalib/src/glsl/main.cpp | 330 +
mesalib/src/glsl/opt_redundant_jumps.cpp | 111 +
mesalib/src/glsl/pp/Makefile | 27 -
mesalib/src/glsl/pp/sl_pp_context.c | 182 -
mesalib/src/glsl/pp/sl_pp_context.h | 100 -
mesalib/src/glsl/pp/sl_pp_define.c | 238 -
mesalib/src/glsl/pp/sl_pp_dict.c | 85 -
mesalib/src/glsl/pp/sl_pp_dict.h | 77 -
mesalib/src/glsl/pp/sl_pp_error.c | 270 -
mesalib/src/glsl/pp/sl_pp_expression.c | 411 -
mesalib/src/glsl/pp/sl_pp_expression.h | 40 -
mesalib/src/glsl/pp/sl_pp_extension.c | 178 -
mesalib/src/glsl/pp/sl_pp_if.c | 340 -
mesalib/src/glsl/pp/sl_pp_line.c | 127 -
mesalib/src/glsl/pp/sl_pp_macro.c | 414 -
mesalib/src/glsl/pp/sl_pp_macro.h | 73 -
mesalib/src/glsl/pp/sl_pp_pragma.c | 109 -
mesalib/src/glsl/pp/sl_pp_process.c | 328 -
mesalib/src/glsl/pp/sl_pp_process.h | 116 -
mesalib/src/glsl/pp/sl_pp_public.h | 83 -
mesalib/src/glsl/pp/sl_pp_purify.c | 302 -
mesalib/src/glsl/pp/sl_pp_purify.h | 63 -
mesalib/src/glsl/pp/sl_pp_token.c | 854 -
mesalib/src/glsl/pp/sl_pp_token.h | 133 -
mesalib/src/glsl/pp/sl_pp_token_util.c | 182 -
mesalib/src/glsl/pp/sl_pp_token_util.h | 103 -
mesalib/src/glsl/pp/sl_pp_version.c | 161 -
mesalib/src/glsl/program.h | 27 +
mesalib/src/glsl/s_expression.cpp | 140 +
mesalib/src/glsl/s_expression.h | 142 +
mesalib/src/glu/sgi/libtess/geom.c | 2 +-
mesalib/src/glu/sgi/libtess/mesh.c | 4 +
mesalib/src/glu/sgi/libtess/normal.c | 4 +
mesalib/src/glu/sgi/libtess/priorityq-heap.c | 22 +-
mesalib/src/glu/sgi/libtess/priorityq.c | 2 +-
mesalib/src/glu/sgi/libtess/render.c | 8 +-
mesalib/src/glu/sgi/libtess/sweep.c | 4 +
mesalib/src/glu/sgi/libtess/tess.c | 4 +
mesalib/src/glu/sgi/libutil/mipmap.c | 4 +-
mesalib/src/mapi/glapi/Makefile | 53 +
mesalib/src/mapi/glapi/SConscript | 82 +
mesalib/src/mapi/glapi/gen-es/Makefile | 96 +
mesalib/src/mapi/glapi/gen-es/base1_API.xml | 744 +
mesalib/src/mapi/glapi/gen-es/base2_API.xml | 533 +
mesalib/src/mapi/glapi/gen-es/es1_API.xml | 1100 +
mesalib/src/mapi/glapi/gen-es/es1_COMPAT.xml | 135 +
mesalib/src/mapi/glapi/gen-es/es1_EXT.xml | 699 +
mesalib/src/mapi/glapi/gen-es/es2_API.xml | 294 +
mesalib/src/mapi/glapi/gen-es/es2_COMPAT.xml | 368 +
mesalib/src/mapi/glapi/gen-es/es2_EXT.xml | 162 +
mesalib/src/mapi/glapi/gen-es/es_COMPAT.xml | 2646 ++
mesalib/src/mapi/glapi/gen-es/es_EXT.xml | 125 +
mesalib/src/mapi/glapi/gen-es/gl_compare.py | 354 +
mesalib/src/mapi/glapi/gen-es/gl_parse_header.py | 450 +
mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml | 69 +
.../src/mapi/glapi/gen/ARB_geometry_shader4.xml | 57 +
.../src/mapi/glapi/gen/ARB_seamless_cube_map.xml | 2 +-
.../src/mapi/glapi/gen/EXT_transform_feedback.xml | 163 +
mesalib/src/mapi/glapi/gen/GL3.xml | 581 +
mesalib/src/mapi/glapi/gen/Makefile | 208 +
mesalib/src/mapi/glapi/gen/glX_proto_recv.py | 4 +-
mesalib/src/mapi/glapi/gen/glX_proto_send.py | 28 +-
mesalib/src/mapi/glapi/gen/glX_proto_size.py | 2 +-
mesalib/src/mapi/glapi/gen/gl_API.xml | 14 +-
mesalib/src/mapi/glapi/gen/gl_enums.py | 29 +-
mesalib/src/mapi/glapi/gen/remap_helper.py | 12 +-
mesalib/src/mapi/glapi/glapi.c | 335 -
mesalib/src/mapi/glapi/glapi.h | 121 +-
mesalib/src/mapi/glapi/glapi_dispatch.c | 15 +-
mesalib/src/mapi/glapi/glapi_entrypoint.c | 344 +
mesalib/src/mapi/glapi/glapi_getproc.c | 656 +-
mesalib/src/mapi/glapi/glapi_nop.c | 23 +-
mesalib/src/mapi/glapi/glapi_priv.h | 114 +
mesalib/src/mapi/glapi/glapi_sparc.S | 1412 +
mesalib/src/mapi/glapi/glapi_x86-64.S | 31648 +++++++++++++++++++
mesalib/src/mapi/glapi/glapi_x86.S | 1326 +
mesalib/src/mapi/glapi/glapidispatch.h | 893 +-
mesalib/src/mapi/glapi/glapioffsets.h | 796 +-
mesalib/src/mapi/glapi/glapitable.h | 775 +-
mesalib/src/mapi/glapi/glapitemp.h | 418 +-
mesalib/src/mapi/glapi/glprocs.h | 1556 +-
mesalib/src/mapi/glapi/glthread.c | 262 +-
mesalib/src/mapi/glapi/glthread.h | 261 +-
mesalib/src/mapi/glapi/sources.mak | 17 +
mesalib/src/mesa/Makefile | 154 +-
mesalib/src/mesa/Makefile.mgw | 4 +-
mesalib/src/mesa/drivers/common/driverfuncs.c | 33 +-
mesalib/src/mesa/drivers/common/meta.c | 33 +-
mesalib/src/mesa/drivers/dri/Makefile.template | 14 +-
mesalib/src/mesa/drivers/dri/common/dri_metaops.c | 5 +-
mesalib/src/mesa/drivers/dri/common/dri_test.c | 89 +
mesalib/src/mesa/drivers/dri/common/dri_util.c | 236 +-
mesalib/src/mesa/drivers/dri/common/dri_util.h | 45 +-
mesalib/src/mesa/drivers/dri/common/drisw_util.c | 273 +
mesalib/src/mesa/drivers/dri/common/drisw_util.h | 135 +
mesalib/src/mesa/drivers/dri/common/spantmp2.h | 32 +
mesalib/src/mesa/drivers/dri/common/utils.c | 28 +-
mesalib/src/mesa/drivers/dri/common/utils.h | 3 +
mesalib/src/mesa/drivers/dri/common/xmlconfig.c | 2 +-
mesalib/src/mesa/drivers/dri/swrast/Makefile | 5 +-
mesalib/src/mesa/drivers/dri/swrast/swrast.c | 365 +-
mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h | 75 +-
mesalib/src/mesa/drivers/dri/swrast/swrast_span.c | 6 +-
.../src/mesa/drivers/dri/swrast/swrast_spantemp.h | 16 +-
mesalib/src/mesa/main/APIspec.dtd | 52 +
mesalib/src/mesa/main/APIspec.py | 617 +
mesalib/src/mesa/main/APIspec.xml | 4332 +++
mesalib/src/mesa/main/APIspecutil.py | 272 +
mesalib/src/mesa/main/accum.h | 7 +-
mesalib/src/mesa/main/api_exec.c | 184 +-
mesalib/src/mesa/main/api_exec.h | 12 +-
mesalib/src/mesa/main/api_loopback.c | 174 +
mesalib/src/mesa/main/api_validate.c | 147 +-
mesalib/src/mesa/main/api_validate.h | 10 +
mesalib/src/mesa/main/arbprogram.c | 940 +
mesalib/src/mesa/main/arbprogram.h | 131 +
mesalib/src/mesa/main/arrayobj.h | 2 +-
mesalib/src/mesa/main/atifragshader.c | 794 +
mesalib/src/mesa/main/atifragshader.h | 149 +
mesalib/src/mesa/main/attrib.c | 2 +-
mesalib/src/mesa/main/attrib.h | 2 +
mesalib/src/mesa/main/bufferobj.c | 108 +-
mesalib/src/mesa/main/bufferobj.h | 2 +-
mesalib/src/mesa/main/clear.c | 1 +
mesalib/src/mesa/main/clear.h | 2 +-
mesalib/src/mesa/main/clip.h | 2 +-
mesalib/src/mesa/main/colormac.h | 2 +-
mesalib/src/mesa/main/colortab.h | 9 +-
mesalib/src/mesa/main/compiler.h | 28 +-
mesalib/src/mesa/main/config.h | 18 +-
mesalib/src/mesa/main/context.c | 272 +-
mesalib/src/mesa/main/context.h | 18 +-
mesalib/src/mesa/main/convolve.c | 1 +
mesalib/src/mesa/main/convolve.h | 8 +-
mesalib/src/mesa/main/core.h | 66 +
mesalib/src/mesa/main/dd.h | 165 +-
mesalib/src/mesa/main/debug.c | 7 +-
mesalib/src/mesa/main/debug.h | 3 +
mesalib/src/mesa/main/depthstencil.c | 26 +-
mesalib/src/mesa/main/depthstencil.h | 1 +
mesalib/src/mesa/main/dlist.c | 293 +-
mesalib/src/mesa/main/dlist.h | 15 +-
mesalib/src/mesa/main/dlopen.c | 15 +-
mesalib/src/mesa/main/drawpix.h | 9 -
mesalib/src/mesa/main/drawtex.c | 131 +
mesalib/src/mesa/main/drawtex.h | 60 +
mesalib/src/mesa/main/enable.c | 115 +-
mesalib/src/mesa/main/enums.c | 6651 ++--
mesalib/src/mesa/main/es_generator.py | 743 +
mesalib/src/mesa/main/extensions.c | 253 +-
mesalib/src/mesa/main/fbobject.c | 196 +-
mesalib/src/mesa/main/fbobject.h | 16 +
mesalib/src/mesa/main/feedback.h | 7 +-
mesalib/src/mesa/main/ffvertex_prog.c | 20 +-
mesalib/src/mesa/main/fog.c | 1 +
mesalib/src/mesa/main/formats.c | 186 +-
mesalib/src/mesa/main/formats.h | 38 +-
mesalib/src/mesa/main/framebuffer.c | 58 +-
mesalib/src/mesa/main/framebuffer.h | 4 +
mesalib/src/mesa/main/get.c | 9932 ++----
mesalib/src/mesa/main/get.h | 5 +-
mesalib/src/mesa/main/getstring.c | 59 +-
mesalib/src/mesa/main/glheader.h | 58 +-
mesalib/src/mesa/main/histogram.c | 1 +
mesalib/src/mesa/main/image.c | 512 +-
mesalib/src/mesa/main/image.h | 8 +
mesalib/src/mesa/main/imports.c | 46 +-
mesalib/src/mesa/main/imports.h | 106 +-
mesalib/src/mesa/main/light.c | 12 +-
mesalib/src/mesa/main/light.h | 2 +-
mesalib/src/mesa/main/macros.h | 38 +
mesalib/src/mesa/main/mfeatures.h | 128 +-
mesalib/src/mesa/main/mipmap.c | 48 +-
mesalib/src/mesa/main/mm.c | 5 +
mesalib/src/mesa/main/mm.h | 3 -
mesalib/src/mesa/main/mtypes.h | 365 +-
mesalib/src/mesa/main/multisample.h | 1 +
mesalib/src/mesa/main/nvprogram.c | 919 +
mesalib/src/mesa/main/nvprogram.h | 115 +
mesalib/src/mesa/main/pixelstore.h | 1 +
mesalib/src/mesa/main/querymatrix.c | 216 +
mesalib/src/mesa/main/queryobj.c | 130 +-
mesalib/src/mesa/main/queryobj.h | 17 +-
mesalib/src/mesa/main/rastpos.h | 7 -
mesalib/src/mesa/main/rbadaptors.c | 565 -
mesalib/src/mesa/main/rbadaptors.h | 40 -
mesalib/src/mesa/main/readpix.c | 6 +
mesalib/src/mesa/main/remap.c | 64 +-
mesalib/src/mesa/main/remap.h | 77 +-
mesalib/src/mesa/main/remap_helper.h | 3288 +-
mesalib/src/mesa/main/renderbuffer.c | 46 +-
mesalib/src/mesa/main/renderbuffer.h | 5 +
mesalib/src/mesa/main/restart.c | 68 +
mesalib/src/mesa/main/restart.h | 41 +
mesalib/src/mesa/main/shaderapi.c | 1642 +
mesalib/src/mesa/main/shaderapi.h | 169 +
mesalib/src/mesa/main/shaderobj.c | 408 +
mesalib/src/mesa/main/shaderobj.h | 134 +
mesalib/src/mesa/main/shaders.c | 741 -
mesalib/src/mesa/main/shaders.h | 236 -
mesalib/src/mesa/main/shared.c | 25 +-
mesalib/src/mesa/main/shared.h | 1 +
mesalib/src/mesa/main/state.c | 36 +-
mesalib/src/mesa/main/syncobj.c | 15 +
mesalib/src/mesa/main/syncobj.h | 47 +-
mesalib/src/mesa/main/texcompress.c | 19 +-
mesalib/src/mesa/main/texcompress_fxt1.c | 2 +-
mesalib/src/mesa/main/texcompress_fxt1.h | 4 +-
mesalib/src/mesa/main/texcompress_s3tc.c | 19 +-
mesalib/src/mesa/main/texenv.c | 119 +-
mesalib/src/mesa/main/texenvprogram.c | 33 +-
mesalib/src/mesa/main/texfetch.c | 607 +-
mesalib/src/mesa/main/texfetch_tmp.h | 374 +
mesalib/src/mesa/main/texformat.c | 95 +-
mesalib/src/mesa/main/texgen.c | 32 +
mesalib/src/mesa/main/texgen.h | 23 +-
mesalib/src/mesa/main/texgetimage.c | 2 +-
mesalib/src/mesa/main/texgetimage.h | 1 +
mesalib/src/mesa/main/teximage.c | 349 +-
mesalib/src/mesa/main/teximage.h | 8 +
mesalib/src/mesa/main/texobj.c | 6 +-
mesalib/src/mesa/main/texpal.c | 204 +
mesalib/src/mesa/main/texpal.h | 38 +
mesalib/src/mesa/main/texparam.c | 22 +-
mesalib/src/mesa/main/texrender.c | 1 +
mesalib/src/mesa/main/texrender.h | 1 +
mesalib/src/mesa/main/texstate.c | 2 +-
mesalib/src/mesa/main/texstate.h | 1 +
mesalib/src/mesa/main/texstore.c | 727 +-
mesalib/src/mesa/main/transformfeedback.c | 944 +
mesalib/src/mesa/main/transformfeedback.h | 132 +
mesalib/src/mesa/main/uniforms.c | 1382 +
mesalib/src/mesa/main/uniforms.h | 175 +
mesalib/src/mesa/main/varray.c | 290 +-
mesalib/src/mesa/main/varray.h | 44 +-
mesalib/src/mesa/main/version.c | 200 +-
mesalib/src/mesa/main/version.h | 8 +-
mesalib/src/mesa/main/viewport.h | 2 +
mesalib/src/mesa/main/vtxfmt.c | 2 +
mesalib/src/mesa/main/vtxfmt.h | 3 +
mesalib/src/mesa/main/vtxfmt_tmp.h | 21 +
mesalib/src/mesa/math/m_matrix.c | 4 +-
mesalib/src/mesa/math/m_matrix.h | 2 +
mesalib/src/mesa/math/m_translate.c | 2 +-
mesalib/src/mesa/math/m_translate.h | 3 +-
mesalib/src/mesa/math/m_xform.h | 4 +-
mesalib/src/mesa/shader/Makefile | 7 -
mesalib/src/mesa/shader/arbprogparse.c | 217 -
mesalib/src/mesa/shader/arbprogparse.h | 41 -
mesalib/src/mesa/shader/arbprogram.c | 1097 -
mesalib/src/mesa/shader/arbprogram.h | 152 -
mesalib/src/mesa/shader/atifragshader.c | 769 -
mesalib/src/mesa/shader/atifragshader.h | 123 -
mesalib/src/mesa/shader/descrip.mms | 93 -
mesalib/src/mesa/shader/hash_table.c | 159 -
mesalib/src/mesa/shader/hash_table.h | 117 -
mesalib/src/mesa/shader/lex.yy.c | 3655 ---
mesalib/src/mesa/shader/nvfragparse.c | 1588 -
mesalib/src/mesa/shader/nvfragparse.h | 43 -
mesalib/src/mesa/shader/nvprogram.c | 917 -
mesalib/src/mesa/shader/nvprogram.h | 113 -
mesalib/src/mesa/shader/nvvertparse.c | 1454 -
mesalib/src/mesa/shader/nvvertparse.h | 45 -
mesalib/src/mesa/shader/prog_cache.c | 206 -
mesalib/src/mesa/shader/prog_cache.h | 55 -
mesalib/src/mesa/shader/prog_execute.c | 1798 --
mesalib/src/mesa/shader/prog_execute.h | 85 -
mesalib/src/mesa/shader/prog_instruction.c | 352 -
mesalib/src/mesa/shader/prog_instruction.h | 437 -
mesalib/src/mesa/shader/prog_noise.c | 638 -
mesalib/src/mesa/shader/prog_noise.h | 34 -
mesalib/src/mesa/shader/prog_optimize.c | 1035 -
mesalib/src/mesa/shader/prog_optimize.h | 45 -
mesalib/src/mesa/shader/prog_parameter.c | 750 -
mesalib/src/mesa/shader/prog_parameter.h | 181 -
mesalib/src/mesa/shader/prog_parameter_layout.c | 213 -
mesalib/src/mesa/shader/prog_parameter_layout.h | 42 -
mesalib/src/mesa/shader/prog_print.c | 1065 -
mesalib/src/mesa/shader/prog_print.h | 100 -
mesalib/src/mesa/shader/prog_statevars.c | 1187 -
mesalib/src/mesa/shader/prog_statevars.h | 147 -
mesalib/src/mesa/shader/prog_uniform.c | 165 -
mesalib/src/mesa/shader/prog_uniform.h | 92 -
mesalib/src/mesa/shader/program.c | 912 -
mesalib/src/mesa/shader/program.h | 151 -
mesalib/src/mesa/shader/program_lexer.l | 495 -
mesalib/src/mesa/shader/program_parse.tab.c | 5728 ----
mesalib/src/mesa/shader/program_parse.tab.h | 209 -
mesalib/src/mesa/shader/program_parse.y | 2766 --
mesalib/src/mesa/shader/program_parse_extra.c | 255 -
mesalib/src/mesa/shader/program_parser.h | 302 -
mesalib/src/mesa/shader/programopt.c | 669 -
mesalib/src/mesa/shader/programopt.h | 52 -
mesalib/src/mesa/shader/shader_api.c | 2233 --
mesalib/src/mesa/shader/shader_api.h | 100 -
mesalib/src/mesa/shader/slang/descrip.mms | 67 -
mesalib/src/mesa/shader/slang/library/Makefile | 51 -
.../mesa/shader/slang/library/slang_120_core.gc | 1978 --
.../slang/library/slang_builtin_120_common.gc | 200 -
.../slang/library/slang_builtin_120_fragment.gc | 30 -
.../shader/slang/library/slang_common_builtin.gc | 1893 --
.../src/mesa/shader/slang/library/slang_core.gc | 2619 --
.../shader/slang/library/slang_fragment_builtin.gc | 299 -
.../shader/slang/library/slang_vertex_builtin.gc | 210 -
mesalib/src/mesa/shader/slang/slang_builtin.c | 897 -
mesalib/src/mesa/shader/slang/slang_builtin.h | 54 -
mesalib/src/mesa/shader/slang/slang_codegen.c | 5354 ----
mesalib/src/mesa/shader/slang/slang_codegen.h | 73 -
mesalib/src/mesa/shader/slang/slang_compile.c | 3032 --
mesalib/src/mesa/shader/slang/slang_compile.h | 100 -
.../src/mesa/shader/slang/slang_compile_function.c | 262 -
.../src/mesa/shader/slang/slang_compile_function.h | 92 -
.../mesa/shader/slang/slang_compile_operation.c | 334 -
.../mesa/shader/slang/slang_compile_operation.h | 225 -
.../src/mesa/shader/slang/slang_compile_struct.c | 174 -
.../src/mesa/shader/slang/slang_compile_struct.h | 66 -
.../src/mesa/shader/slang/slang_compile_variable.c | 247 -
.../src/mesa/shader/slang/slang_compile_variable.h | 90 -
mesalib/src/mesa/shader/slang/slang_emit.c | 2667 --
mesalib/src/mesa/shader/slang/slang_emit.h | 51 -
mesalib/src/mesa/shader/slang/slang_ir.c | 498 -
mesalib/src/mesa/shader/slang/slang_ir.h | 280 -
mesalib/src/mesa/shader/slang/slang_label.c | 104 -
mesalib/src/mesa/shader/slang/slang_label.h | 45 -
mesalib/src/mesa/shader/slang/slang_link.c | 933 -
mesalib/src/mesa/shader/slang/slang_link.h | 37 -
mesalib/src/mesa/shader/slang/slang_log.c | 133 -
mesalib/src/mesa/shader/slang/slang_log.h | 57 -
mesalib/src/mesa/shader/slang/slang_mem.c | 243 -
mesalib/src/mesa/shader/slang/slang_mem.h | 55 -
mesalib/src/mesa/shader/slang/slang_print.c | 883 -
mesalib/src/mesa/shader/slang/slang_print.h | 29 -
mesalib/src/mesa/shader/slang/slang_simplify.c | 527 -
mesalib/src/mesa/shader/slang/slang_simplify.h | 50 -
mesalib/src/mesa/shader/slang/slang_storage.c | 321 -
mesalib/src/mesa/shader/slang/slang_storage.h | 139 -
mesalib/src/mesa/shader/slang/slang_typeinfo.c | 1177 -
mesalib/src/mesa/shader/slang/slang_typeinfo.h | 259 -
mesalib/src/mesa/shader/slang/slang_utility.c | 228 -
mesalib/src/mesa/shader/slang/slang_utility.h | 100 -
mesalib/src/mesa/shader/slang/slang_vartable.c | 362 -
mesalib/src/mesa/shader/slang/slang_vartable.h | 42 -
mesalib/src/mesa/shader/symbol_table.c | 362 -
mesalib/src/mesa/shader/symbol_table.h | 55 -
mesalib/src/mesa/sources.mak | 142 +-
mesalib/src/mesa/swrast/s_aaline.h | 2 +-
mesalib/src/mesa/swrast/s_aatriangle.h | 2 +-
mesalib/src/mesa/swrast/s_alpha.h | 3 +-
mesalib/src/mesa/swrast/s_atifragshader.c | 4 +-
mesalib/src/mesa/swrast/s_atifragshader.h | 3 +-
mesalib/src/mesa/swrast/s_blend.h | 3 +-
mesalib/src/mesa/swrast/s_clear.c | 1 -
mesalib/src/mesa/swrast/s_context.c | 7 +-
mesalib/src/mesa/swrast/s_context.h | 3 +-
mesalib/src/mesa/swrast/s_depth.c | 1 -
mesalib/src/mesa/swrast/s_depth.h | 3 +-
mesalib/src/mesa/swrast/s_feedback.c | 1 -
mesalib/src/mesa/swrast/s_fog.c | 1 -
mesalib/src/mesa/swrast/s_fog.h | 3 +-
mesalib/src/mesa/swrast/s_fragprog.c | 4 +-
mesalib/src/mesa/swrast/s_fragprog.h | 3 +-
mesalib/src/mesa/swrast/s_logic.h | 3 +-
mesalib/src/mesa/swrast/s_masking.h | 3 +-
mesalib/src/mesa/swrast/s_points.c | 1 -
mesalib/src/mesa/swrast/s_readpix.c | 18 +-
mesalib/src/mesa/swrast/s_span.c | 24 +-
mesalib/src/mesa/swrast/s_stencil.h | 3 +-
mesalib/src/mesa/swrast/s_texcombine.c | 2 +-
mesalib/src/mesa/swrast/s_texcombine.h | 3 +-
mesalib/src/mesa/swrast/s_texfilter.c | 41 +-
mesalib/src/mesa/swrast/s_texfilter.h | 3 +-
mesalib/src/mesa/swrast/s_triangle.c | 2 +-
mesalib/src/mesa/swrast/s_zoom.h | 3 +-
mesalib/src/mesa/swrast_setup/ss_context.c | 2 +-
mesalib/src/mesa/swrast_setup/ss_context.h | 3 +-
mesalib/src/mesa/swrast_setup/ss_triangle.c | 2 +-
mesalib/src/mesa/swrast_setup/ss_triangle.h | 2 +-
mesalib/src/mesa/swrast_setup/ss_vb.h | 1 -
mesalib/src/mesa/tnl/t_context.h | 2 -
mesalib/src/mesa/tnl/t_rasterpos.c | 1 -
mesalib/src/mesa/tnl/t_vb_cull.c | 1 -
mesalib/src/mesa/tnl/t_vb_fog.c | 1 -
mesalib/src/mesa/tnl/t_vb_normals.c | 1 -
mesalib/src/mesa/tnl/t_vb_program.c | 8 +-
mesalib/src/mesa/tnl/t_vb_render.c | 1 +
mesalib/src/mesa/tnl/t_vb_texgen.c | 1 -
mesalib/src/mesa/tnl/t_vb_texmat.c | 1 -
mesalib/src/mesa/tnl/t_vb_vertex.c | 1 -
mesalib/src/mesa/vbo/vbo.h | 25 +
mesalib/src/mesa/vbo/vbo_context.c | 10 +-
mesalib/src/mesa/vbo/vbo_context.h | 2 -
mesalib/src/mesa/vbo/vbo_exec.c | 12 +-
mesalib/src/mesa/vbo/vbo_exec.h | 3 -
mesalib/src/mesa/vbo/vbo_exec_api.c | 66 +-
mesalib/src/mesa/vbo/vbo_exec_array.c | 193 +-
mesalib/src/mesa/vbo/vbo_exec_draw.c | 2 +-
mesalib/src/mesa/vbo/vbo_save.c | 3 +
mesalib/src/mesa/vbo/vbo_save.h | 17 +-
mesalib/src/mesa/vbo/vbo_save_api.c | 7 +
mesalib/src/mesa/vbo/vbo_save_draw.c | 71 +-
mesalib/src/mesa/vbo/vbo_save_loopback.c | 5 +
mesalib/windows/VC8/mesa/mesa/mesa.vcproj | 4 +
packages.txt | 2 +-
590 files changed, 148697 insertions(+), 96813 deletions(-)
create mode 100644 mesalib/docs/MESA_drm_image.spec
create mode 100644 mesalib/docs/relnotes-7.9.html
delete mode 100644 mesalib/include/GL/mglmesa.h
delete mode 100644 mesalib/include/GLES/egltypes.h
delete mode 100644 mesalib/progs/Makefile
delete mode 100644 mesalib/progs/util/README
delete mode 100644 mesalib/progs/util/dumpstate.c
delete mode 100644 mesalib/progs/util/errcheck.c
delete mode 100644 mesalib/progs/util/extfuncs.h
delete mode 100644 mesalib/progs/util/glstate.c
delete mode 100644 mesalib/progs/util/glstate.h
delete mode 100644 mesalib/progs/util/glutskel.c
delete mode 100644 mesalib/progs/util/idproj.c
delete mode 100644 mesalib/progs/util/imagesgi.h
delete mode 100644 mesalib/progs/util/matrix.c
delete mode 100644 mesalib/progs/util/mwmborder.c
delete mode 100644 mesalib/progs/util/readtex.c
delete mode 100644 mesalib/progs/util/readtex.h
delete mode 100644 mesalib/progs/util/sampleMakefile
delete mode 100644 mesalib/progs/util/shaderutil.c
delete mode 100644 mesalib/progs/util/shaderutil.h
delete mode 100644 mesalib/progs/util/showbuffer.c
delete mode 100644 mesalib/progs/util/showbuffer.h
delete mode 100644 mesalib/progs/util/trackball.c
delete mode 100644 mesalib/progs/util/trackball.h
delete mode 100644 mesalib/progs/util/winpos.c
create mode 100644 mesalib/src/glsl/README
delete mode 100644 mesalib/src/glsl/apps/Makefile
delete mode 100644 mesalib/src/glsl/apps/compile.c
delete mode 100644 mesalib/src/glsl/apps/process.c
delete mode 100644 mesalib/src/glsl/apps/purify.c
delete mode 100644 mesalib/src/glsl/apps/tokenise.c
delete mode 100644 mesalib/src/glsl/apps/version.c
create mode 100644 mesalib/src/glsl/ast.h
create mode 100644 mesalib/src/glsl/ast_expr.cpp
create mode 100644 mesalib/src/glsl/ast_function.cpp
create mode 100644 mesalib/src/glsl/ast_to_hir.cpp
create mode 100644 mesalib/src/glsl/ast_type.cpp
create mode 100644 mesalib/src/glsl/builtin_function.cpp
create mode 100644 mesalib/src/glsl/builtin_types.h
create mode 100644 mesalib/src/glsl/builtin_variables.h
delete mode 100644 mesalib/src/glsl/cl/Makefile
delete mode 100644 mesalib/src/glsl/cl/sl_cl_parse.c
delete mode 100644 mesalib/src/glsl/cl/sl_cl_parse.h
create mode 100644 mesalib/src/glsl/glcpp/README
create mode 100644 mesalib/src/glsl/glcpp/glcpp-lex.c
create mode 100644 mesalib/src/glsl/glcpp/glcpp-lex.l
create mode 100644 mesalib/src/glsl/glcpp/glcpp-parse.c
create mode 100644 mesalib/src/glsl/glcpp/glcpp-parse.h
create mode 100644 mesalib/src/glsl/glcpp/glcpp-parse.y
create mode 100644 mesalib/src/glsl/glcpp/glcpp.c
create mode 100644 mesalib/src/glsl/glcpp/glcpp.h
create mode 100644 mesalib/src/glsl/glcpp/pp.c
create mode 100644 mesalib/src/glsl/glsl_lexer.cpp
create mode 100644 mesalib/src/glsl/glsl_lexer.lpp
create mode 100644 mesalib/src/glsl/glsl_parser.cpp
create mode 100644 mesalib/src/glsl/glsl_parser.h
create mode 100644 mesalib/src/glsl/glsl_parser.ypp
create mode 100644 mesalib/src/glsl/glsl_parser_extras.cpp
create mode 100644 mesalib/src/glsl/glsl_parser_extras.h
create mode 100644 mesalib/src/glsl/glsl_symbol_table.cpp
create mode 100644 mesalib/src/glsl/glsl_symbol_table.h
create mode 100644 mesalib/src/glsl/glsl_types.cpp
create mode 100644 mesalib/src/glsl/glsl_types.h
create mode 100644 mesalib/src/glsl/hir_field_selection.cpp
create mode 100644 mesalib/src/glsl/ir.cpp
create mode 100644 mesalib/src/glsl/ir.h
create mode 100644 mesalib/src/glsl/ir_algebraic.cpp
create mode 100644 mesalib/src/glsl/ir_basic_block.cpp
create mode 100644 mesalib/src/glsl/ir_basic_block.h
create mode 100644 mesalib/src/glsl/ir_clone.cpp
create mode 100644 mesalib/src/glsl/ir_constant_expression.cpp
create mode 100644 mesalib/src/glsl/ir_constant_folding.cpp
create mode 100644 mesalib/src/glsl/ir_constant_propagation.cpp
create mode 100644 mesalib/src/glsl/ir_constant_variable.cpp
create mode 100644 mesalib/src/glsl/ir_copy_propagation.cpp
create mode 100644 mesalib/src/glsl/ir_dead_code.cpp
create mode 100644 mesalib/src/glsl/ir_dead_code_local.cpp
create mode 100644 mesalib/src/glsl/ir_dead_functions.cpp
create mode 100644 mesalib/src/glsl/ir_div_to_mul_rcp.cpp
create mode 100644 mesalib/src/glsl/ir_explog_to_explog2.cpp
create mode 100644 mesalib/src/glsl/ir_expression_flattening.cpp
create mode 100644 mesalib/src/glsl/ir_expression_flattening.h
create mode 100644 mesalib/src/glsl/ir_function.cpp
create mode 100644 mesalib/src/glsl/ir_function_can_inline.cpp
create mode 100644 mesalib/src/glsl/ir_function_inlining.cpp
create mode 100644 mesalib/src/glsl/ir_function_inlining.h
create mode 100644 mesalib/src/glsl/ir_hierarchical_visitor.cpp
create mode 100644 mesalib/src/glsl/ir_hierarchical_visitor.h
create mode 100644 mesalib/src/glsl/ir_hv_accept.cpp
create mode 100644 mesalib/src/glsl/ir_if_simplification.cpp
create mode 100644 mesalib/src/glsl/ir_if_to_cond_assign.cpp
create mode 100644 mesalib/src/glsl/ir_import_prototypes.cpp
create mode 100644 mesalib/src/glsl/ir_lower_jumps.cpp
create mode 100644 mesalib/src/glsl/ir_mat_op_to_vec.cpp
create mode 100644 mesalib/src/glsl/ir_mod_to_fract.cpp
create mode 100644 mesalib/src/glsl/ir_noop_swizzle.cpp
create mode 100644 mesalib/src/glsl/ir_optimization.h
create mode 100644 mesalib/src/glsl/ir_print_visitor.cpp
create mode 100644 mesalib/src/glsl/ir_print_visitor.h
create mode 100644 mesalib/src/glsl/ir_reader.cpp
create mode 100644 mesalib/src/glsl/ir_reader.h
create mode 100644 mesalib/src/glsl/ir_rvalue_visitor.cpp
create mode 100644 mesalib/src/glsl/ir_rvalue_visitor.h
create mode 100644 mesalib/src/glsl/ir_set_program_inouts.cpp
create mode 100644 mesalib/src/glsl/ir_structure_splitting.cpp
create mode 100644 mesalib/src/glsl/ir_sub_to_add_neg.cpp
create mode 100644 mesalib/src/glsl/ir_swizzle_swizzle.cpp
create mode 100644 mesalib/src/glsl/ir_tree_grafting.cpp
create mode 100644 mesalib/src/glsl/ir_validate.cpp
create mode 100644 mesalib/src/glsl/ir_variable.cpp
create mode 100644 mesalib/src/glsl/ir_variable_refcount.cpp
create mode 100644 mesalib/src/glsl/ir_variable_refcount.h
create mode 100644 mesalib/src/glsl/ir_vec_index_to_cond_assign.cpp
create mode 100644 mesalib/src/glsl/ir_vec_index_to_swizzle.cpp
create mode 100644 mesalib/src/glsl/ir_visitor.h
create mode 100644 mesalib/src/glsl/link_functions.cpp
create mode 100644 mesalib/src/glsl/linker.cpp
create mode 100644 mesalib/src/glsl/linker.h
create mode 100644 mesalib/src/glsl/list.h
create mode 100644 mesalib/src/glsl/loop_analysis.cpp
create mode 100644 mesalib/src/glsl/loop_analysis.h
create mode 100644 mesalib/src/glsl/loop_controls.cpp
create mode 100644 mesalib/src/glsl/loop_unroll.cpp
create mode 100644 mesalib/src/glsl/lower_noise.cpp
create mode 100644 mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp
create mode 100644 mesalib/src/glsl/main.cpp
create mode 100644 mesalib/src/glsl/opt_redundant_jumps.cpp
delete mode 100644 mesalib/src/glsl/pp/Makefile
delete mode 100644 mesalib/src/glsl/pp/sl_pp_context.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_context.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_define.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_dict.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_dict.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_error.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_expression.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_expression.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_extension.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_if.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_line.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_macro.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_macro.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_pragma.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_process.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_process.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_public.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_purify.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_purify.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_token.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_token.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_token_util.c
delete mode 100644 mesalib/src/glsl/pp/sl_pp_token_util.h
delete mode 100644 mesalib/src/glsl/pp/sl_pp_version.c
create mode 100644 mesalib/src/glsl/program.h
create mode 100644 mesalib/src/glsl/s_expression.cpp
create mode 100644 mesalib/src/glsl/s_expression.h
create mode 100644 mesalib/src/mapi/glapi/Makefile
create mode 100644 mesalib/src/mapi/glapi/SConscript
create mode 100644 mesalib/src/mapi/glapi/gen-es/Makefile
create mode 100644 mesalib/src/mapi/glapi/gen-es/base1_API.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/base2_API.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/es1_API.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/es1_COMPAT.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/es1_EXT.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/es2_API.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/es2_COMPAT.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/es2_EXT.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/es_COMPAT.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/es_EXT.xml
create mode 100644 mesalib/src/mapi/glapi/gen-es/gl_compare.py
create mode 100644 mesalib/src/mapi/glapi/gen-es/gl_parse_header.py
create mode 100644 mesalib/src/mapi/glapi/gen/ARB_draw_instanced.xml
create mode 100644 mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
create mode 100644 mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml
create mode 100644 mesalib/src/mapi/glapi/gen/GL3.xml
create mode 100644 mesalib/src/mapi/glapi/gen/Makefile
delete mode 100644 mesalib/src/mapi/glapi/glapi.c
create mode 100644 mesalib/src/mapi/glapi/glapi_entrypoint.c
create mode 100644 mesalib/src/mapi/glapi/glapi_priv.h
create mode 100644 mesalib/src/mapi/glapi/glapi_sparc.S
create mode 100644 mesalib/src/mapi/glapi/glapi_x86-64.S
create mode 100644 mesalib/src/mapi/glapi/glapi_x86.S
create mode 100644 mesalib/src/mapi/glapi/sources.mak
create mode 100644 mesalib/src/mesa/drivers/dri/common/dri_test.c
create mode 100644 mesalib/src/mesa/drivers/dri/common/drisw_util.c
create mode 100644 mesalib/src/mesa/drivers/dri/common/drisw_util.h
create mode 100644 mesalib/src/mesa/main/APIspec.dtd
create mode 100644 mesalib/src/mesa/main/APIspec.py
create mode 100644 mesalib/src/mesa/main/APIspec.xml
create mode 100644 mesalib/src/mesa/main/APIspecutil.py
create mode 100644 mesalib/src/mesa/main/arbprogram.c
create mode 100644 mesalib/src/mesa/main/arbprogram.h
create mode 100644 mesalib/src/mesa/main/atifragshader.c
create mode 100644 mesalib/src/mesa/main/atifragshader.h
create mode 100644 mesalib/src/mesa/main/core.h
create mode 100644 mesalib/src/mesa/main/drawtex.c
create mode 100644 mesalib/src/mesa/main/drawtex.h
create mode 100644 mesalib/src/mesa/main/es_generator.py
create mode 100644 mesalib/src/mesa/main/nvprogram.c
create mode 100644 mesalib/src/mesa/main/nvprogram.h
create mode 100644 mesalib/src/mesa/main/querymatrix.c
delete mode 100644 mesalib/src/mesa/main/rbadaptors.c
delete mode 100644 mesalib/src/mesa/main/rbadaptors.h
create mode 100644 mesalib/src/mesa/main/restart.c
create mode 100644 mesalib/src/mesa/main/restart.h
create mode 100644 mesalib/src/mesa/main/shaderapi.c
create mode 100644 mesalib/src/mesa/main/shaderapi.h
create mode 100644 mesalib/src/mesa/main/shaderobj.c
create mode 100644 mesalib/src/mesa/main/shaderobj.h
delete mode 100644 mesalib/src/mesa/main/shaders.c
delete mode 100644 mesalib/src/mesa/main/shaders.h
create mode 100644 mesalib/src/mesa/main/texpal.c
create mode 100644 mesalib/src/mesa/main/texpal.h
create mode 100644 mesalib/src/mesa/main/transformfeedback.c
create mode 100644 mesalib/src/mesa/main/transformfeedback.h
create mode 100644 mesalib/src/mesa/main/uniforms.c
create mode 100644 mesalib/src/mesa/main/uniforms.h
delete mode 100644 mesalib/src/mesa/shader/Makefile
delete mode 100644 mesalib/src/mesa/shader/arbprogparse.c
delete mode 100644 mesalib/src/mesa/shader/arbprogparse.h
delete mode 100644 mesalib/src/mesa/shader/arbprogram.c
delete mode 100644 mesalib/src/mesa/shader/arbprogram.h
delete mode 100644 mesalib/src/mesa/shader/atifragshader.c
delete mode 100644 mesalib/src/mesa/shader/atifragshader.h
delete mode 100644 mesalib/src/mesa/shader/descrip.mms
delete mode 100644 mesalib/src/mesa/shader/hash_table.c
delete mode 100644 mesalib/src/mesa/shader/hash_table.h
delete mode 100644 mesalib/src/mesa/shader/lex.yy.c
delete mode 100644 mesalib/src/mesa/shader/nvfragparse.c
delete mode 100644 mesalib/src/mesa/shader/nvfragparse.h
delete mode 100644 mesalib/src/mesa/shader/nvprogram.c
delete mode 100644 mesalib/src/mesa/shader/nvprogram.h
delete mode 100644 mesalib/src/mesa/shader/nvvertparse.c
delete mode 100644 mesalib/src/mesa/shader/nvvertparse.h
delete mode 100644 mesalib/src/mesa/shader/prog_cache.c
delete mode 100644 mesalib/src/mesa/shader/prog_cache.h
delete mode 100644 mesalib/src/mesa/shader/prog_execute.c
delete mode 100644 mesalib/src/mesa/shader/prog_execute.h
delete mode 100644 mesalib/src/mesa/shader/prog_instruction.c
delete mode 100644 mesalib/src/mesa/shader/prog_instruction.h
delete mode 100644 mesalib/src/mesa/shader/prog_noise.c
delete mode 100644 mesalib/src/mesa/shader/prog_noise.h
delete mode 100644 mesalib/src/mesa/shader/prog_optimize.c
delete mode 100644 mesalib/src/mesa/shader/prog_optimize.h
delete mode 100644 mesalib/src/mesa/shader/prog_parameter.c
delete mode 100644 mesalib/src/mesa/shader/prog_parameter.h
delete mode 100644 mesalib/src/mesa/shader/prog_parameter_layout.c
delete mode 100644 mesalib/src/mesa/shader/prog_parameter_layout.h
delete mode 100644 mesalib/src/mesa/shader/prog_print.c
delete mode 100644 mesalib/src/mesa/shader/prog_print.h
delete mode 100644 mesalib/src/mesa/shader/prog_statevars.c
delete mode 100644 mesalib/src/mesa/shader/prog_statevars.h
delete mode 100644 mesalib/src/mesa/shader/prog_uniform.c
delete mode 100644 mesalib/src/mesa/shader/prog_uniform.h
delete mode 100644 mesalib/src/mesa/shader/program.c
delete mode 100644 mesalib/src/mesa/shader/program.h
delete mode 100644 mesalib/src/mesa/shader/program_lexer.l
delete mode 100644 mesalib/src/mesa/shader/program_parse.tab.c
delete mode 100644 mesalib/src/mesa/shader/program_parse.tab.h
delete mode 100644 mesalib/src/mesa/shader/program_parse.y
delete mode 100644 mesalib/src/mesa/shader/program_parse_extra.c
delete mode 100644 mesalib/src/mesa/shader/program_parser.h
delete mode 100644 mesalib/src/mesa/shader/programopt.c
delete mode 100644 mesalib/src/mesa/shader/programopt.h
delete mode 100644 mesalib/src/mesa/shader/shader_api.c
delete mode 100644 mesalib/src/mesa/shader/shader_api.h
delete mode 100644 mesalib/src/mesa/shader/slang/descrip.mms
delete mode 100644 mesalib/src/mesa/shader/slang/library/Makefile
delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_120_core.gc
delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_builtin_120_common.gc
delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_builtin_120_fragment.gc
delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_common_builtin.gc
delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_core.gc
delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_fragment_builtin.gc
delete mode 100644 mesalib/src/mesa/shader/slang/library/slang_vertex_builtin.gc
delete mode 100644 mesalib/src/mesa/shader/slang/slang_builtin.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_builtin.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_codegen.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_codegen.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile_function.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile_function.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile_operation.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile_operation.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile_struct.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile_struct.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile_variable.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_compile_variable.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_emit.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_emit.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_ir.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_ir.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_label.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_label.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_link.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_link.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_log.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_log.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_mem.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_mem.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_print.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_print.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_simplify.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_simplify.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_storage.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_storage.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_typeinfo.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_typeinfo.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_utility.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_utility.h
delete mode 100644 mesalib/src/mesa/shader/slang/slang_vartable.c
delete mode 100644 mesalib/src/mesa/shader/slang/slang_vartable.h
delete mode 100644 mesalib/src/mesa/shader/symbol_table.c
delete mode 100644 mesalib/src/mesa/shader/symbol_table.h
diff --git a/mesalib/Makefile b/mesalib/Makefile
index 84d00382e..b8069f9eb 100644
--- a/mesalib/Makefile
+++ b/mesalib/Makefile
@@ -2,7 +2,7 @@
TOP = .
-SUBDIRS = src progs
+SUBDIRS = src
default: $(TOP)/configs/current
@@ -180,12 +180,17 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.8.2
+VERSION=7.9
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
-DEMO_NAME = MesaDemos-$(VERSION)
GLUT_NAME = MesaGLUT-$(VERSION)
+# This is part of MAIN_FILES
+MAIN_ES_FILES = \
+ $(DIRECTORY)/src/mesa/main/*.xml \
+ $(DIRECTORY)/src/mesa/main/*.py \
+ $(DIRECTORY)/src/mesa/main/*.dtd
+
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/configure \
@@ -215,18 +220,18 @@ MAIN_FILES = \
$(DIRECTORY)/include/GL/glx_mangle.h \
$(DIRECTORY)/include/GL/glfbdev.h \
$(DIRECTORY)/include/GL/mesa_wgl.h \
- $(DIRECTORY)/include/GL/mglmesa.h \
$(DIRECTORY)/include/GL/osmesa.h \
$(DIRECTORY)/include/GL/vms_x_fix.h \
$(DIRECTORY)/include/GL/wglext.h \
$(DIRECTORY)/include/GL/wmesa.h \
- $(DIRECTORY)/include/VG/*.h \
- $(DIRECTORY)/include/KHR/*.h \
$(DIRECTORY)/src/glsl/Makefile \
$(DIRECTORY)/src/glsl/Makefile.template \
$(DIRECTORY)/src/glsl/SConscript \
- $(DIRECTORY)/src/glsl/*/Makefile \
- $(DIRECTORY)/src/glsl/*/*.[ch] \
+ $(DIRECTORY)/src/glsl/*.[ch] \
+ $(DIRECTORY)/src/glsl/*.[cly]pp \
+ $(DIRECTORY)/src/glsl/README \
+ $(DIRECTORY)/src/glsl/glcpp/*.[chly] \
+ $(DIRECTORY)/src/glsl/glcpp/README \
$(DIRECTORY)/src/Makefile \
$(DIRECTORY)/src/mesa/Makefile* \
$(DIRECTORY)/src/mesa/sources.mak \
@@ -234,18 +239,15 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/gl.pc.in \
$(DIRECTORY)/src/mesa/osmesa.pc.in \
$(DIRECTORY)/src/mesa/depend \
+ $(MAIN_ES_FILES) \
$(DIRECTORY)/src/mesa/main/*.[chS] \
$(DIRECTORY)/src/mesa/main/descrip.mms \
- $(DIRECTORY)/src/mesa/glapi/*.[chS] \
$(DIRECTORY)/src/mesa/math/*.[ch] \
$(DIRECTORY)/src/mesa/math/descrip.mms \
- $(DIRECTORY)/src/mesa/shader/*.[chly] \
- $(DIRECTORY)/src/mesa/shader/Makefile \
- $(DIRECTORY)/src/mesa/shader/descrip.mms \
- $(DIRECTORY)/src/mesa/shader/slang/*.[ch] \
- $(DIRECTORY)/src/mesa/shader/slang/descrip.mms \
- $(DIRECTORY)/src/mesa/shader/slang/library/*.gc \
- $(DIRECTORY)/src/mesa/shader/slang/library/Makefile \
+ $(DIRECTORY)/src/mesa/program/*.[chly] \
+ $(DIRECTORY)/src/mesa/program/*.cpp \
+ $(DIRECTORY)/src/mesa/program/Makefile \
+ $(DIRECTORY)/src/mesa/program/descrip.mms \
$(DIRECTORY)/src/mesa/swrast/*.[ch] \
$(DIRECTORY)/src/mesa/swrast/descrip.mms \
$(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \
@@ -274,8 +276,6 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/drivers/x11/Makefile \
$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \
- $(DIRECTORY)/src/mesa/drivers/glslcompiler/Makefile \
- $(DIRECTORY)/src/mesa/drivers/glslcompiler/glslcompiler.c \
$(DIRECTORY)/src/mesa/ppc/*.[ch] \
$(DIRECTORY)/src/mesa/sparc/*.[chS] \
$(DIRECTORY)/src/mesa/x86/Makefile \
@@ -284,30 +284,35 @@ MAIN_FILES = \
$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch] \
$(DIRECTORY)/src/mesa/x86-64/*.[chS] \
$(DIRECTORY)/src/mesa/x86-64/Makefile \
- $(DIRECTORY)/progs/Makefile \
- $(DIRECTORY)/progs/util/README \
- $(DIRECTORY)/progs/util/*.[ch] \
- $(DIRECTORY)/progs/util/sampleMakefile \
$(DIRECTORY)/windows/VC8/
-ES_FILES = \
+MAPI_FILES = \
$(DIRECTORY)/include/GLES/*.h \
$(DIRECTORY)/include/GLES2/*.h \
- $(DIRECTORY)/src/mesa/glapi/gen/*.xml \
- $(DIRECTORY)/src/mesa/glapi/gen/*.py \
- $(DIRECTORY)/src/mesa/glapi/gen/*.dtd \
- $(DIRECTORY)/src/mesa/es/glapi/Makefile \
- $(DIRECTORY)/src/mesa/es/glapi/*.xml \
- $(DIRECTORY)/src/mesa/es/glapi/*.py \
- $(DIRECTORY)/src/mesa/es/state_tracker/*.[ch] \
- $(DIRECTORY)/src/mesa/es/main/*.[ch] \
- $(DIRECTORY)/src/mesa/es/main/*.xml \
- $(DIRECTORY)/src/mesa/es/main/*.py \
- $(DIRECTORY)/src/mesa/es/main/*.dtd \
- $(DIRECTORY)/src/mesa/es/Makefile \
- $(DIRECTORY)/src/mesa/es/sources.mak \
+ $(DIRECTORY)/include/VG/*.h \
+ $(DIRECTORY)/src/mapi/es?api/Makefile \
+ $(DIRECTORY)/src/mapi/es?api/*.pc.in \
+ $(DIRECTORY)/src/mapi/glapi/gen/Makefile \
+ $(DIRECTORY)/src/mapi/glapi/gen/*.xml \
+ $(DIRECTORY)/src/mapi/glapi/gen/*.py \
+ $(DIRECTORY)/src/mapi/glapi/gen/*.dtd \
+ $(DIRECTORY)/src/mapi/glapi/gen-es/Makefile \
+ $(DIRECTORY)/src/mapi/glapi/gen-es/*.xml \
+ $(DIRECTORY)/src/mapi/glapi/gen-es/*.py \
+ $(DIRECTORY)/src/mapi/glapi/Makefile \
+ $(DIRECTORY)/src/mapi/glapi/SConscript \
+ $(DIRECTORY)/src/mapi/glapi/sources.mak \
+ $(DIRECTORY)/src/mapi/glapi/*.[chS] \
+ $(DIRECTORY)/src/mapi/mapi/mapi_abi.py \
+ $(DIRECTORY)/src/mapi/mapi/sources.mak \
+ $(DIRECTORY)/src/mapi/mapi/*.[ch] \
+ $(DIRECTORY)/src/mapi/vgapi/Makefile \
+ $(DIRECTORY)/src/mapi/vgapi/vgapi.csv \
+ $(DIRECTORY)/src/mapi/vgapi/vg.pc.in \
+ $(DIRECTORY)/src/mapi/vgapi/*.h
EGL_FILES = \
+ $(DIRECTORY)/include/KHR/*.h \
$(DIRECTORY)/include/EGL/*.h \
$(DIRECTORY)/src/egl/Makefile \
$(DIRECTORY)/src/egl/*/Makefile \
@@ -315,27 +320,29 @@ EGL_FILES = \
$(DIRECTORY)/src/egl/*/*.[ch] \
$(DIRECTORY)/src/egl/*/*/Makefile \
$(DIRECTORY)/src/egl/*/*/*.[ch] \
+ $(DIRECTORY)/src/egl/main/*.pc.in \
+ $(DIRECTORY)/src/egl/main/*.def
GALLIUM_FILES = \
$(DIRECTORY)/src/mesa/state_tracker/*[ch] \
$(DIRECTORY)/src/gallium/Makefile \
$(DIRECTORY)/src/gallium/Makefile.template \
$(DIRECTORY)/src/gallium/SConscript \
+ $(DIRECTORY)/src/gallium/targets/Makefile.dri \
+ $(DIRECTORY)/src/gallium/targets/Makefile.xorg \
+ $(DIRECTORY)/src/gallium/targets/SConscript.dri \
$(DIRECTORY)/src/gallium/*/Makefile \
$(DIRECTORY)/src/gallium/*/SConscript \
$(DIRECTORY)/src/gallium/*/*/Makefile \
- $(DIRECTORY)/src/gallium/*/*/Makefile.egl \
- $(DIRECTORY)/src/gallium/*/*/Makefile.template \
$(DIRECTORY)/src/gallium/*/*/SConscript \
$(DIRECTORY)/src/gallium/*/*/*.[ch] \
+ $(DIRECTORY)/src/gallium/auxiliary/gallivm/*.cpp \
$(DIRECTORY)/src/gallium/*/*/*.py \
$(DIRECTORY)/src/gallium/*/*/*.csv \
$(DIRECTORY)/src/gallium/*/*/*/Makefile \
$(DIRECTORY)/src/gallium/*/*/*/SConscript \
$(DIRECTORY)/src/gallium/*/*/*/*.[ch] \
- $(DIRECTORY)/src/gallium/*/*/*/*.py \
- $(DIRECTORY)/src/gallium/*/*/*/*/Makefile \
- $(DIRECTORY)/src/gallium/*/*/*/*/*.[ch] \
+ $(DIRECTORY)/src/gallium/*/*/*/*.py
DRI_FILES = \
@@ -351,6 +358,7 @@ DRI_FILES = \
$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \
$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \
+ $(DIRECTORY)/src/mesa/drivers/dri/*/*.cpp \
$(DIRECTORY)/src/mesa/drivers/dri/*/*/*.[chS] \
$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \
$(DIRECTORY)/src/mesa/drivers/dri/*/*/Makefile \
@@ -387,59 +395,6 @@ GLW_FILES = \
$(DIRECTORY)/src/glw/glw.pc.in \
$(DIRECTORY)/src/glw/depend
-GLEW_FILES = \
- $(DIRECTORY)/include/GL/glew.h \
- $(DIRECTORY)/include/GL/glxew.h \
- $(DIRECTORY)/include/GL/wglew.h \
- $(DIRECTORY)/src/glew/*.c \
- $(DIRECTORY)/src/glew/Makefile \
- $(DIRECTORY)/src/glew/SConscript \
- $(DIRECTORY)/src/glew/LICENSE.txt
-
-DEMO_FILES = \
- $(GLEW_FILES) \
- $(DIRECTORY)/progs/beos/*.cpp \
- $(DIRECTORY)/progs/beos/Makefile \
- $(DIRECTORY)/progs/images/*.rgb \
- $(DIRECTORY)/progs/images/*.rgba \
- $(DIRECTORY)/progs/demos/Makefile* \
- $(DIRECTORY)/progs/demos/descrip.mms \
- $(DIRECTORY)/progs/demos/*.[ch] \
- $(DIRECTORY)/progs/demos/*.cxx \
- $(DIRECTORY)/progs/demos/*.dat \
- $(DIRECTORY)/progs/demos/README \
- $(DIRECTORY)/progs/egl/Makefile \
- $(DIRECTORY)/progs/egl/*.[ch] \
- $(DIRECTORY)/progs/es1/*/Makefile \
- $(DIRECTORY)/progs/es1/*/*.[ch] \
- $(DIRECTORY)/progs/es2/*/Makefile \
- $(DIRECTORY)/progs/es2/*/*.[ch] \
- $(DIRECTORY)/progs/openvg/*/Makefile \
- $(DIRECTORY)/progs/openvg/*/*.[ch] \
- $(DIRECTORY)/progs/fbdev/Makefile \
- $(DIRECTORY)/progs/fbdev/glfbdevtest.c \
- $(DIRECTORY)/progs/objviewer/*.[ch] \
- $(DIRECTORY)/progs/objviewer/*.obj \
- $(DIRECTORY)/progs/objviewer/*.mtl \
- $(DIRECTORY)/progs/objviewer/*.rgb \
- $(DIRECTORY)/progs/objviewer/Makefile \
- $(DIRECTORY)/progs/objviewer/README.txt \
- $(DIRECTORY)/progs/osdemos/Makefile \
- $(DIRECTORY)/progs/osdemos/*.c \
- $(DIRECTORY)/progs/xdemos/Makefile* \
- $(DIRECTORY)/progs/xdemos/*.[chf] \
- $(DIRECTORY)/progs/redbook/Makefile* \
- $(DIRECTORY)/progs/redbook/README \
- $(DIRECTORY)/progs/redbook/*.[ch] \
- $(DIRECTORY)/progs/samples/Makefile* \
- $(DIRECTORY)/progs/samples/README \
- $(DIRECTORY)/progs/samples/*.c \
- $(DIRECTORY)/progs/glsl/Makefile* \
- $(DIRECTORY)/progs/glsl/*.c \
- $(DIRECTORY)/progs/glsl/*.frag \
- $(DIRECTORY)/progs/glsl/*.vert \
- $(DIRECTORY)/progs/glsl/*.shtest
-
GLUT_FILES = \
$(DIRECTORY)/include/GL/glut.h \
$(DIRECTORY)/include/GL/glutf90.h \
@@ -462,6 +417,7 @@ DEPEND_FILES = \
LIB_FILES = \
$(MAIN_FILES) \
+ $(MAPI_FILES) \
$(ES_FILES) \
$(EGL_FILES) \
$(GALLIUM_FILES) \
@@ -471,8 +427,8 @@ LIB_FILES = \
# Everything for new a Mesa release:
-tarballs: rm_depend configure aclocal.m4 lib_gz demo_gz glut_gz \
- lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
+tarballs: rm_depend configure aclocal.m4 lib_gz glut_gz \
+ lib_bz2 glut_bz2 lib_zip glut_zip md5
# Helper for autoconf builds
@@ -501,12 +457,6 @@ lib_gz: rm_config
gzip $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.gz $(DIRECTORY)
-demo_gz:
- cd .. ; \
- tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
- gzip $(DEMO_NAME).tar ; \
- mv $(DEMO_NAME).tar.gz $(DIRECTORY)
-
glut_gz:
cd .. ; \
tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
@@ -519,12 +469,6 @@ lib_bz2: rm_config
bzip2 $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
-demo_bz2:
- cd .. ; \
- tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
- bzip2 $(DEMO_NAME).tar ; \
- mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
-
glut_bz2:
cd .. ; \
tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
@@ -537,12 +481,6 @@ lib_zip: rm_config
zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
mv $(LIB_NAME).zip $(DIRECTORY)
-demo_zip:
- rm -f $(DEMO_NAME).zip ; \
- cd .. ; \
- zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \
- mv $(DEMO_NAME).zip $(DIRECTORY)
-
glut_zip:
rm -f $(GLUT_NAME).zip ; \
cd .. ; \
@@ -553,14 +491,11 @@ md5:
@-md5sum $(LIB_NAME).tar.gz
@-md5sum $(LIB_NAME).tar.bz2
@-md5sum $(LIB_NAME).zip
- @-md5sum $(DEMO_NAME).tar.gz
- @-md5sum $(DEMO_NAME).tar.bz2
- @-md5sum $(DEMO_NAME).zip
@-md5sum $(GLUT_NAME).tar.gz
@-md5sum $(GLUT_NAME).tar.bz2
@-md5sum $(GLUT_NAME).zip
.PHONY: tarballs rm_depend rm_config md5 \
- lib_gz demo_gz glut_gz \
- lib_bz2 demo_bz2 glut_bz2 \
- lib_zip demo_zip glut_zip
+ lib_gz glut_gz \
+ lib_bz2 glut_bz2 \
+ lib_zip glut_zip
diff --git a/mesalib/bin/minstall b/mesalib/bin/minstall
index 130025829..094ec0c2b 100644
--- a/mesalib/bin/minstall
+++ b/mesalib/bin/minstall
@@ -31,7 +31,7 @@ if [ $# -ge 2 ] ; then
# Last cmd line arg is the dest dir
for FILE in $@ ; do
- DEST="$FILE"
+ DESTDIR="$FILE"
done
# Loop over args, moving them to DEST directory
@@ -42,6 +42,25 @@ if [ $# -ge 2 ] ; then
exit 0
fi
+ DEST=$DESTDIR
+
+ # On CYGWIN, because DLLs are loaded by the native Win32 loader,
+ # they are installed in the executable path. Stub libraries used
+ # only for linking are installed in the library path
+ case `uname` in
+ CYGWIN*)
+ case $FILE in
+ *.dll)
+ DEST="$DEST/../bin"
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ *)
+ ;;
+ esac
+
PWDSAVE=`pwd`
# determine file's type
diff --git a/mesalib/bin/mklib b/mesalib/bin/mklib
index 08ef99ec1..2f9223ff3 100644
--- a/mesalib/bin/mklib
+++ b/mesalib/bin/mklib
@@ -494,13 +494,16 @@ case $ARCH in
OPTS="${OPTS} -Wl,-Mmapfile.scope"
fi
- # Check if objects are SPARC v9
+ # Check if objects are 64-bit
# file says: ELF 64-bit MSB relocatable SPARCV9 Version 1
set ${OBJECTS}
if [ ${LINK} = "cc" -o ${LINK} = "CC" ] ; then
- SPARCV9=`file $1 | grep SPARCV9`
- if [ "${SPARCV9}" ] ; then
- OPTS="${OPTS} -xarch=v9"
+ ABI64=`file $1 | grep "ELF 64-bit"`
+ if [ "${ABI64}" ] ; then
+ case `uname -p` in
+ sparc) OPTS="${OPTS} -xarch=v9" ;;
+ i386) OPTS="${OPTS} -xarch=amd64" ;;
+ esac
fi
fi
if [ "${ALTOPTS}" ] ; then
@@ -927,6 +930,16 @@ case $ARCH in
CYGWIN*)
# GCC-based environment
+
+ if [ "x$LINK" = "x" ] ; then
+ # -linker was not specified so set default link command now
+ if [ $CPLUSPLUS = 1 ] ; then
+ LINK=g++
+ else
+ LINK=gcc
+ fi
+ fi
+
if [ $NOPREFIX = 1 ] ; then
# No "lib" or ".so" part
echo "mklib: Making CYGWIN shared library: " ${LIBNAME}
@@ -935,7 +948,7 @@ case $ARCH in
OPTS=${ALTOPTS}
fi
rm -f ${LIBNAME}
- ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} || exit $?
FINAL_LIBS=${LIBNAME}
else
CYGNAME="cyg${LIBNAME}" # prefix with "cyg"
@@ -943,7 +956,7 @@ case $ARCH in
if [ $STATIC = 1 ] ; then
LIBNAME=${LIBNAME}.a
- echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
+ echo "mklib: Making CYGWIN static library: " ${LIBNAME}
OPTS="-ru"
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
@@ -961,13 +974,7 @@ case $ARCH in
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
fi
- echo "mklib: Making" $ARCH "shared library: " ${CYGNAME}-${MAJOR}.dll
-
- if [ $CPLUSPLUS = 1 ] ; then
- LINK="g++"
- else
- LINK="gcc"
- fi
+ echo "mklib: Making CYGWIN shared library: " ${CYGNAME}-${MAJOR}.dll
# rm any old libs
rm -f ${CYGNAME}-${MAJOR}.dll
@@ -976,12 +983,7 @@ case $ARCH in
rm -f ${LIBNAME}.a
# make lib
- ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
- # make build fail if link failed
- es=$?
- if [ "$es" -ne "0" ]; then
- exit $es
- fi
+ ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS} || exit $?
# make usual symlinks
ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
# finish up
@@ -1021,4 +1023,9 @@ if [ ${INSTALLDIR} != "." ] ; then
echo "mklib: Installing" ${FINAL_LIBS} "in" ${INSTALLDIR}
test -d ${INSTALLDIR} || mkdir -p ${INSTALLDIR}
mv ${FINAL_LIBS} ${INSTALLDIR}/
+
+ if [ "x${FINAL_BINS}" != "x" ] ; then
+ echo "mklib: Installing" ${FINAL_BINS} "in" ${INSTALLDIR}
+ mv ${FINAL_BINS} ${INSTALLDIR}/
+ fi
fi
diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index fbd5faa5f..9bdbefebd 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -14,6 +14,8 @@ ARCH_FLAGS = @ARCH_FLAGS@
ASM_FLAGS = @ASM_FLAGS@
PIC_FLAGS = @PIC_FLAGS@
DEFINES = @DEFINES@
+API_DEFINES = @API_DEFINES@
+GLES_OVERLAY = @GLES_OVERLAY@
CFLAGS = @CPPFLAGS@ @CFLAGS@ \
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \
@@ -26,8 +28,19 @@ INTEL_LIBS = @INTEL_LIBS@
INTEL_CFLAGS = @INTEL_CFLAGS@
X11_LIBS = @X11_LIBS@
X11_CFLAGS = @X11_CFLAGS@
+LLVM_CFLAGS = @LLVM_CFLAGS@
+LLVM_LDFLAGS = @LLVM_LDFLAGS@
+LLVM_LIBS = @LLVM_LIBS@
+GLW_CFLAGS = @GLW_CFLAGS@
+GLUT_CFLAGS = @GLUT_CFLAGS@
-# Assembler
+TALLOC_LIBS = @TALLOC_LIBS@
+TALLOC_CFLAGS = @TALLOC_CFLAGS@
+
+# dlopen
+DLOPEN_LIBS = @DLOPEN_LIBS@
+
+# Source selection
MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@
@@ -49,6 +62,9 @@ GLU_LIB = GLU
GLUT_LIB = glut
GLW_LIB = GLw
OSMESA_LIB = @OSMESA_LIB@
+GLESv1_CM_LIB = GLESv1_CM
+GLESv2_LIB = GLESv2
+VG_LIB = OpenVG
# Library names (actual file names)
GL_LIB_NAME = @GL_LIB_NAME@
@@ -57,6 +73,9 @@ GLUT_LIB_NAME = @GLUT_LIB_NAME@
GLW_LIB_NAME = @GLW_LIB_NAME@
OSMESA_LIB_NAME = @OSMESA_LIB_NAME@
EGL_LIB_NAME = @EGL_LIB_NAME@
+GLESv1_CM_LIB_NAME = @GLESv1_CM_LIB_NAME@
+GLESv2_LIB_NAME = @GLESv2_LIB_NAME@
+VG_LIB_NAME = @VG_LIB_NAME@
# Globs used to install the lib and all symlinks
GL_LIB_GLOB = @GL_LIB_GLOB@
@@ -65,6 +84,9 @@ GLUT_LIB_GLOB = @GLUT_LIB_GLOB@
GLW_LIB_GLOB = @GLW_LIB_GLOB@
OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@
EGL_LIB_GLOB = @EGL_LIB_GLOB@
+GLESv1_CM_LIB_GLOB = @GLESv1_CM_LIB_GLOB@
+GLESv2_LIB_GLOB = @GLESv2_LIB_GLOB@
+VG_LIB_GLOB = @VG_LIB_GLOB@
# Directories to build
LIB_DIR = @LIB_DIR@
@@ -75,18 +97,15 @@ EGL_DRIVERS_DIRS = @EGL_DRIVERS_DIRS@
GALLIUM_DIRS = @GALLIUM_DIRS@
GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@
GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@
-GALLIUM_WINSYS_DRM_DIRS = @GALLIUM_WINSYS_DRM_DIRS@
+GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@
GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-# Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = @PROGRAM_DIRS@
-
# Driver specific build vars
DRI_DIRS = @DRI_DIRS@
-WINDOW_SYSTEM = @WINDOW_SYSTEM@
-EGL_DISPLAYS = @EGL_DISPLAYS@
+EGL_PLATFORMS = @EGL_PLATFORMS@
+EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
# Dependencies
X11_INCLUDES = @X11_INCLUDES@
@@ -107,6 +126,9 @@ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLUT_MESA_DEPS@ \
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @GLW_MESA_DEPS@ \
$(EXTRA_LIB_PATH) @GLW_LIB_DEPS@
APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@
+GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv1_CM_LIB_DEPS@
+GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) @GLESv2_LIB_DEPS@
+VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@
# DRI dependencies
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
@@ -155,6 +177,23 @@ GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@
GLW_PC_CFLAGS = @GLW_PC_CFLAGS@
OSMESA_PC_REQ = @OSMESA_PC_REQ@
OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
-
-EGL_DRI2_CFLAGS = @EGL_DRI2_CFLAGS@
-EGL_DRI2_LIBS = @EGL_DRI2_LIBS@
+GLESv1_CM_PC_LIB_PRIV = @GLESv1_CM_PC_LIB_PRIV@
+GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
+EGL_PC_REQ_PRIV = @GL_PC_REQ_PRIV@
+EGL_PC_LIB_PRIV = @GL_PC_LIB_PRIV@
+EGL_PC_CFLAGS = @GL_PC_CFLAGS@
+
+XCB_DRI2_CFLAGS = @XCB_DRI2_CFLAGS@
+XCB_DRI2_LIBS = @XCB_DRI2_LIBS@
+LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
+LIBUDEV_LIBS = @LIBUDEV_LIBS@
+
+MESA_LLVM = @MESA_LLVM@
+
+LLVM_VERSION = @LLVM_VERSION@
+ifneq ($(LLVM_VERSION),)
+ HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
+ DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
+endif
+
+HAVE_XF86VIDMODE = @HAVE_XF86VIDMODE@
diff --git a/mesalib/configs/beos b/mesalib/configs/beos
index 69a8fd426..ac8d6fc6f 100644
--- a/mesalib/configs/beos
+++ b/mesalib/configs/beos
@@ -90,10 +90,9 @@ else
endif
# Directories
-SRC_DIRS = gallium mesa glu glut/beos glew
+SRC_DIRS = gallium mesa glu glut/beos
GLU_DIRS = sgi
DRIVER_DIRS = beos
-PROGRAM_DIRS = beos samples redbook demos tests
# Library/program dependencies
GL_LIB_DEPS =
diff --git a/mesalib/configs/bluegene-osmesa b/mesalib/configs/bluegene-osmesa
index d22454fa2..88511109d 100644
--- a/mesalib/configs/bluegene-osmesa
+++ b/mesalib/configs/bluegene-osmesa
@@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/mesalib/configs/bluegene-xlc-osmesa b/mesalib/configs/bluegene-xlc-osmesa
index b0c762de9..292199a61 100644
--- a/mesalib/configs/bluegene-xlc-osmesa
+++ b/mesalib/configs/bluegene-xlc-osmesa
@@ -20,7 +20,6 @@ OSMESA_LIB_NAME = libOSMesa.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/mesalib/configs/catamount-osmesa-pgi b/mesalib/configs/catamount-osmesa-pgi
index 835f6eb7d..74fd53ab8 100644
--- a/mesalib/configs/catamount-osmesa-pgi
+++ b/mesalib/configs/catamount-osmesa-pgi
@@ -23,7 +23,6 @@ OSMESA_LIB_NAME = libOSMesa.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin
index e51968487..990610724 100644
--- a/mesalib/configs/darwin
+++ b/mesalib/configs/darwin
@@ -52,9 +52,8 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
# omit glw lib for now:
-SRC_DIRS = glsl glx/apple mesa gallium glu glut/glx glew
+SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx
GLU_DIRS = sgi
DRIVER_DIRS = osmesa
#DRIVER_DIRS = dri
DRI_DIRS = swrast
-PROGRAM_DIRS = xdemos
diff --git a/mesalib/configs/default b/mesalib/configs/default
index f12bec8fa..f2aedefc0 100644
--- a/mesalib/configs/default
+++ b/mesalib/configs/default
@@ -9,8 +9,8 @@ CONFIG_NAME = default
# Version info
MESA_MAJOR=7
-MESA_MINOR=8
-MESA_TINY=2
+MESA_MINOR=9
+MESA_TINY=0
MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
# external projects. This should be useless now that we use libdrm.
@@ -52,20 +52,24 @@ INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
GL_LIB = GL
GLU_LIB = GLU
GLUT_LIB = glut
-GLEW_LIB = GLEW
GLW_LIB = GLw
OSMESA_LIB = OSMesa
EGL_LIB = EGL
+GLESv1_CM_LIB = GLESv1_CM
+GLESv2_LIB = GLESv2
+VG_LIB = OpenVG
# Library names (actual file names)
GL_LIB_NAME = lib$(GL_LIB).so
GLU_LIB_NAME = lib$(GLU_LIB).so
GLUT_LIB_NAME = lib$(GLUT_LIB).so
-GLEW_LIB_NAME = lib$(GLEW_LIB).a
GLW_LIB_NAME = lib$(GLW_LIB).so
OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
EGL_LIB_NAME = lib$(EGL_LIB).so
+GLESv1_CM_LIB_NAME = lib$(GLESv1_CM_LIB).so
+GLESv2_LIB_NAME = lib$(GLESv2_LIB).so
+VG_LIB_NAME = lib$(VG_LIB).so
# globs used to install the lib and all symlinks
GL_LIB_GLOB = $(GL_LIB_NAME)*
@@ -74,6 +78,12 @@ GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*
GLW_LIB_GLOB = $(GLW_LIB_NAME)*
OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
EGL_LIB_GLOB = $(EGL_LIB_NAME)*
+GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)*
+GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
+VG_LIB_GLOB = $(VG_LIB_NAME)*
+
+TALLOC_LIBS = `pkg-config --libs talloc`
+TALLOC_CFLAGS = `pkg-config --cflags talloc`
# Optional assembly language optimization files for libGL
MESA_ASM_SOURCES =
@@ -86,11 +96,10 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
# Directories to build
LIB_DIR = lib
-SRC_DIRS = glsl mesa gallium egl gallium/winsys glu glut/glx glew glw
+SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
+ gallium egl gallium/winsys gallium/targets glu glut/glx glw
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
-# Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = demos redbook samples glsl objviewer xdemos
# EGL drivers to build
EGL_DRIVERS_DIRS = glx
@@ -98,29 +107,35 @@ EGL_DRIVERS_DIRS = glx
# Gallium directories and
GALLIUM_DIRS = auxiliary drivers state_trackers
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
-GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 r300 trace identity
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug identity galahad i915 i965 svga r300 nvfx nv50 failover
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-GALLIUM_WINSYS_DIRS = drm xlib
-GALLIUM_WINSYS_DRM_DIRS = swrast
+GALLIUM_WINSYS_DIRS = sw sw/xlib
+GALLIUM_TARGET_DIRS = libgl-xlib
GALLIUM_STATE_TRACKERS_DIRS = glx vega
-# native displays EGL should support
-EGL_DISPLAYS = x11
+# native platforms EGL should support
+EGL_PLATFORMS = x11
+EGL_CLIENT_APIS = $(GL_LIB)
# Library dependencies
#EXTRA_LIB_PATH ?=
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS)
EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread
OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm
GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+GLESv1_CM_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
+GLESv2_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
+VG_LIB_DEPS = $(EXTRA_LIB_PATH) -lpthread
# Program dependencies - specific GL/glut libraries added in Makefiles
APP_LIB_DEPS = -lm
X11_LIBS = -lX11
+DLOPEN_LIBS = -ldl
+
# Installation directories (for make install)
INSTALL_DIR = /usr/local
INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
@@ -153,3 +168,12 @@ GLW_PC_LIB_PRIV =
GLW_PC_CFLAGS =
OSMESA_PC_REQ =
OSMESA_PC_LIB_PRIV =
+GLESv1_CM_PC_REQ_PRIV =
+GLESv1_CM_PC_LIB_PRIV =
+GLESv1_CM_PC_CFLAGS =
+GLESv2_PC_REQ_PRIV =
+GLESv2_PC_LIB_PRIV =
+GLESv2_PC_CFLAGS =
+VG_PC_REQ_PRIV =
+VG_PC_LIB_PRIV =
+VG_PC_CFLAGS =
diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri
index 0b91cfc37..a4aa82e96 100644
--- a/mesalib/configs/freebsd-dri
+++ b/mesalib/configs/freebsd-dri
@@ -41,10 +41,8 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
# Directories
-SRC_DIRS = glx gallium mesa glu glut/glx glew glw
+SRC_DIRS = glx gallium mesa glu glut/glx glw
DRIVER_DIRS = dri
-PROGRAM_DIRS =
-WINDOW_SYSTEM=dri
DRM_SOURCE_PATH=$(TOP)/../drm
diff --git a/mesalib/configs/linux-cell b/mesalib/configs/linux-cell
index e89a08cd9..606a11a8c 100644
--- a/mesalib/configs/linux-cell
+++ b/mesalib/configs/linux-cell
@@ -6,7 +6,7 @@ CONFIG_NAME = linux-cell
# Omiting other gallium drivers:
-GALLIUM_DRIVERS_DIRS = cell softpipe trace
+GALLIUM_DRIVERS_DIRS = cell softpipe trace rbug identity
# Compiler and flags
@@ -37,7 +37,8 @@ CXXFLAGS = $(COMMON_C_CPP_FLAGS)
# Omitting glw here:
-SRC_DIRS = glsl mesa gallium gallium/winsys glu glut/glx glew
+SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
+ gallium gallium/winsys gallium/targets glu glut/glx
# Build no traditional Mesa drivers:
DRIVER_DIRS =
diff --git a/mesalib/configs/linux-debug b/mesalib/configs/linux-debug
index 01763b1a3..60e0b9769 100644
--- a/mesalib/configs/linux-debug
+++ b/mesalib/configs/linux-debug
@@ -5,5 +5,5 @@ include $(TOP)/configs/linux
CONFIG_NAME = linux-debug
OPT_FLAGS = -g
-CFLAGS += -pedantic
+#CFLAGS += -pedantic
DEFINES += -DDEBUG -DDEBUG_MATH
diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri
index e8e8ccfcf..6f86277c4 100644
--- a/mesalib/configs/linux-dri
+++ b/mesalib/configs/linux-dri
@@ -45,22 +45,20 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib
LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
LIBDRM_LIB = $(shell pkg-config --libs libdrm)
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -lpthread -ldl $(LIBDRM_LIB)
# Directories
SRC_DIRS := glx egl $(SRC_DIRS)
-PROGRAM_DIRS := egl $(PROGRAM_DIRS)
# EGL directories
EGL_DRIVERS_DIRS = glx
DRIVER_DIRS = dri
-WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm
-GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
+GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
+GALLIUM_TARGET_DIRS = egl-swrast
GALLIUM_STATE_TRACKERS_DIRS = egl
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
diff --git a/mesalib/configs/linux-dri-xcb b/mesalib/configs/linux-dri-xcb
index c5ed89c4b..8092a048d 100644
--- a/mesalib/configs/linux-dri-xcb
+++ b/mesalib/configs/linux-dri-xcb
@@ -47,11 +47,8 @@ DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
$(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx)
-SRC_DIRS = glx gallium mesa glu glut/glx glew glw
-PROGRAM_DIRS = xdemos
+SRC_DIRS = glx gallium mesa glu glut/glx glw
DRIVER_DIRS = dri
-WINDOW_SYSTEM=dri
-
DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \
savage sis tdfx unichrome
diff --git a/mesalib/configs/linux-egl b/mesalib/configs/linux-egl
index 2c2834b81..6393e942c 100644
--- a/mesalib/configs/linux-egl
+++ b/mesalib/configs/linux-egl
@@ -47,11 +47,10 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
# Directories
-SRC_DIRS = gallium mesa gallium/winsys glu egl
-PROGRAM_DIRS = egl
+SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
DRIVER_DIRS = dri
-WINDOW_SYSTEM = dri
GALLIUM_WINSYS_DIRS = egl_drm
+GALLIUM_TARGET_DIRS =
DRI_DIRS = intel
diff --git a/mesalib/configs/linux-fbdev b/mesalib/configs/linux-fbdev
index 0b03c33af..4fc638404 100644
--- a/mesalib/configs/linux-fbdev
+++ b/mesalib/configs/linux-fbdev
@@ -4,14 +4,13 @@ include $(TOP)/configs/linux
CONFIG_NAME = linux-fbdev
-CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
+CFLAGS += -DUSE_GLFBDEV_DRIVER
# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
-SRC_DIRS = gallium mesa glu glut/fbdev glew
+SRC_DIRS += glut/fbdev
DRIVER_DIRS = fbdev osmesa
-PROGRAM_DIRS = fbdev demos redbook samples
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
OSMESA_LIB_DEPS = -lm -lpthread
diff --git a/mesalib/configs/linux-i965 b/mesalib/configs/linux-i965
index e66abc347..7656a2adc 100644
--- a/mesalib/configs/linux-i965
+++ b/mesalib/configs/linux-i965
@@ -6,3 +6,4 @@ CONFIG_NAME = linux-i965
GALLIUM_DRIVER_DIRS = i965
GALLIUM_WINSYS_DIRS = drm/i965/xlib
+GALLIUM_TARGET_DIRS =
diff --git a/mesalib/configs/linux-indirect b/mesalib/configs/linux-indirect
index 0914fba19..272d34e84 100644
--- a/mesalib/configs/linux-indirect
+++ b/mesalib/configs/linux-indirect
@@ -47,7 +47,5 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
# Directories
-SRC_DIRS = glx glu glut/glx glew glw
+SRC_DIRS = glx glu glut/glx glw
DRIVER_DIRS =
-PROGRAM_DIRS =
-WINDOW_SYSTEM=dri
diff --git a/mesalib/configs/linux-llvm b/mesalib/configs/linux-llvm
index 27e082ebf..6aa434032 100644
--- a/mesalib/configs/linux-llvm
+++ b/mesalib/configs/linux-llvm
@@ -10,12 +10,12 @@ CONFIG_NAME = linux-llvm
GALLIUM_DRIVERS_DIRS += llvmpipe
OPT_FLAGS = -O3 -ansi -pedantic
-ARCH_FLAGS = -m32 -mmmx -msse -msse2 -mstackrealign
+ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign
-DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DDRAW_LLVM -DHAVE_UDIS86
+DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DHAVE_UDIS86
# override -std=c99
-CFLAGS += -std=gnu99
+CFLAGS += -std=gnu99 -D__STDC_CONSTANT_MACROS
LLVM_VERSION := $(shell llvm-config --version)
@@ -24,6 +24,8 @@ ifeq ($(LLVM_VERSION),)
MESA_LLVM=0
else
MESA_LLVM=1
+ HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
+ DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
# $(info Using LLVM version: $(LLVM_VERSION))
endif
@@ -39,4 +41,4 @@ else
endif
LD = g++
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ -ludis86
+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -ltalloc -lstdc++ -ludis86
diff --git a/mesalib/configs/linux-opengl-es b/mesalib/configs/linux-opengl-es
index 259c26a93..93c0d4770 100644
--- a/mesalib/configs/linux-opengl-es
+++ b/mesalib/configs/linux-opengl-es
@@ -6,8 +6,8 @@ CONFIG_NAME = linux-opengl-es
# Directories to build
LIB_DIR = lib
-SRC_DIRS = egl glsl mesa/es gallium gallium/winsys
-PROGRAM_DIRS = es1/screen es1/xegl es2/xegl
+SRC_DIRS = egl glsl mapi/es1api mapi/es2api mesa/es \
+ gallium gallium/winsys gallium/targets
# egl st needs this
DEFINES += -DGLX_DIRECT_RENDERING
@@ -22,7 +22,7 @@ GALLIUM_DRIVERS_DIRS = softpipe
GALLIUM_STATE_TRACKERS_DIRS = es
# build egl_x11_{swrast,i915}.so
-GALLIUM_DRIVERS_DIRS += trace i915
+GALLIUM_DRIVERS_DIRS += trace rbug i915
GALLIUM_STATE_TRACKERS_DIRS += egl
-GALLIUM_WINSYS_DIRS += drm
-GALLIUM_WINSYS_DRM_DIRS += intel swrast
+GALLIUM_WINSYS_DIRS += drm/intel
+GALLIUM_TARGET_DIRS += egl-swrast egl-i915
diff --git a/mesalib/configs/linux-osmesa b/mesalib/configs/linux-osmesa
index 3015f5fcb..4cc5e51f1 100644
--- a/mesalib/configs/linux-osmesa
+++ b/mesalib/configs/linux-osmesa
@@ -17,9 +17,8 @@ CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
# Directories
-SRC_DIRS = glsl mesa glu
+SRC_DIRS = mapi/glapi glsl mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/mesalib/configs/linux-osmesa-static b/mesalib/configs/linux-osmesa-static
index a03e63eb7..722079463 100644
--- a/mesalib/configs/linux-osmesa-static
+++ b/mesalib/configs/linux-osmesa-static
@@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS = osdemos
# Dependencies
diff --git a/mesalib/configs/linux-osmesa16 b/mesalib/configs/linux-osmesa16
index 090ca2730..e6c26a286 100644
--- a/mesalib/configs/linux-osmesa16
+++ b/mesalib/configs/linux-osmesa16
@@ -20,9 +20,8 @@ OSMESA_LIB_NAME = libOSMesa16.so
# Directories
-SRC_DIRS = glsl mesa glu
+SRC_DIRS = mapi/glapi glsl mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
# Dependencies
diff --git a/mesalib/configs/linux-osmesa16-static b/mesalib/configs/linux-osmesa16-static
index 146aeb85a..a6c0cab1b 100644
--- a/mesalib/configs/linux-osmesa16-static
+++ b/mesalib/configs/linux-osmesa16-static
@@ -24,7 +24,6 @@ OSMESA_LIB_NAME = libOSMesa16.a
# Directories
SRC_DIRS = gallium mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
# Dependencies
diff --git a/mesalib/configs/linux-osmesa32 b/mesalib/configs/linux-osmesa32
index 63de7f9a4..dafa31b2e 100644
--- a/mesalib/configs/linux-osmesa32
+++ b/mesalib/configs/linux-osmesa32
@@ -20,9 +20,8 @@ OSMESA_LIB_NAME = libOSMesa32.so
# Directories
-SRC_DIRS = glsl mesa glu
+SRC_DIRS = mapi/glapi glsl mesa glu
DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
# Dependencies
diff --git a/mesalib/configure b/mesalib/configure
index 25b438d15..4e4431d00 100644
--- a/mesalib/configure
+++ b/mesalib/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for Mesa 7.8.2.
+# Generated by GNU Autoconf 2.65 for Mesa 7.9.0.
#
# Report bugs to .
#
@@ -553,8 +553,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Mesa'
PACKAGE_TARNAME='mesa'
-PACKAGE_VERSION='7.8.2'
-PACKAGE_STRING='Mesa 7.8.2'
+PACKAGE_VERSION='7.9.0'
+PACKAGE_STRING='Mesa 7.9.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa'
PACKAGE_URL=''
@@ -598,15 +598,22 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
XORG_DRIVER_INSTALL_DIR
EGL_DRIVER_INSTALL_DIR
-EGL_DISPLAYS
+EGL_PLATFORMS
XEXT_LIBS
XEXT_CFLAGS
+EGL_CLIENT_APIS
+VG_LIB_DEPS
LIBKMS_XORG_LIBS
LIBKMS_XORG_CFLAGS
LIBDRM_XORG_LIBS
LIBDRM_XORG_CFLAGS
XORG_LIBS
XORG_CFLAGS
+LLVM_VERSION
+LLVM_LDFLAGS
+LLVM_LIBS
+LLVM_CFLAGS
+LLVM_CONFIG
PROGRAM_DIRS
APP_LIB_DEPS
GLUT_PC_CFLAGS
@@ -634,8 +641,10 @@ GLU_MESA_DEPS
GLU_LIB_DEPS
EGL_DRIVERS_DIRS
EGL_LIB_DEPS
-EGL_DRI2_LIBS
-EGL_DRI2_CFLAGS
+LIBUDEV_LIBS
+LIBUDEV_CFLAGS
+XCB_DRI2_LIBS
+XCB_DRI2_CFLAGS
OSMESA_PC_LIB_PRIV
OSMESA_PC_REQ
OSMESA_MESA_DEPS
@@ -643,15 +652,22 @@ OSMESA_LIB_DEPS
OSMESA_LIB
RADEON_LDFLAGS
RADEON_CFLAGS
-LIBDRM_RADEON_LIBS
-LIBDRM_RADEON_CFLAGS
INTEL_LIBS
INTEL_CFLAGS
DRI_LIB_DEPS
EXPAT_INCLUDES
DRI_DIRS
+GLES_OVERLAY
+API_DEFINES
DRI_DRIVER_SEARCH_DIR
DRI_DRIVER_INSTALL_DIR
+LIBDRM_RADEON_LIBS
+LIBDRM_RADEON_CFLAGS
+HAVE_XF86VIDMODE
+GLESv2_PC_LIB_PRIV
+GLESv2_LIB_DEPS
+GLESv1_CM_PC_LIB_PRIV
+GLESv1_CM_LIB_DEPS
DRI_PC_REQ_PRIV
GL_PC_CFLAGS
GL_PC_LIB_PRIV
@@ -661,6 +677,8 @@ XCB_LIBS
XCB_CFLAGS
DRIGL_LIBS
DRIGL_CFLAGS
+XF86VIDMODE_LIBS
+XF86VIDMODE_CFLAGS
GLPROTO_LIBS
GLPROTO_CFLAGS
DRI2PROTO_LIBS
@@ -676,27 +694,36 @@ X_CFLAGS
XMKMF
X11_LIBS
X11_CFLAGS
+MESA_LLVM
GALLIUM_STATE_TRACKERS_DIRS
GALLIUM_DRIVERS_DIRS
-GALLIUM_WINSYS_DRM_DIRS
GALLIUM_WINSYS_DIRS
+GALLIUM_TARGET_DIRS
GALLIUM_DIRS
-WINDOW_SYSTEM
DRIVER_DIRS
GLU_DIRS
SRC_DIRS
+TALLOC_LIBS
+TALLOC_CFLAGS
EGREP
GREP
+DLOPEN_LIBS
PIC_FLAGS
GLAPI_ASM_SOURCES
MESA_ASM_SOURCES
ASM_FLAGS
+VG_LIB_GLOB
+GLESv2_LIB_GLOB
+GLESv1_CM_LIB_GLOB
EGL_LIB_GLOB
OSMESA_LIB_GLOB
GLW_LIB_GLOB
GLUT_LIB_GLOB
GLU_LIB_GLOB
GL_LIB_GLOB
+VG_LIB_NAME
+GLESv2_LIB_NAME
+GLESv1_CM_LIB_NAME
EGL_LIB_NAME
OSMESA_LIB_NAME
GLW_LIB_NAME
@@ -788,7 +815,6 @@ enable_asm
enable_pic
enable_selinux
with_driver
-with_demos
with_x
enable_xcb
enable_glx_tls
@@ -796,6 +822,10 @@ with_dri_driverdir
with_dri_searchpath
enable_driglx_direct
with_dri_drivers
+enable_opengl
+enable_gles1
+enable_gles2
+enable_gles_overlay
with_expat
enable_gl_osmesa
with_osmesa_bits
@@ -806,14 +836,18 @@ enable_motif
enable_glut
enable_gallium
with_state_trackers
+with_egl_platforms
with_egl_displays
with_egl_driver_dir
with_xorg_driver_dir
with_max_width
with_max_height
+enable_gallium_llvm
enable_gallium_svga
-enable_gallium_intel
+enable_gallium_i915
+enable_gallium_i965
enable_gallium_radeon
+enable_gallium_r600
enable_gallium_nouveau
enable_gallium_swrast
'
@@ -836,6 +870,8 @@ OPT_FLAGS
ARCH_FLAGS
MKLIB_OPTIONS
PIC_FLAGS
+TALLOC_CFLAGS
+TALLOC_LIBS
X11_CFLAGS
X11_LIBS
XMKMF
@@ -847,16 +883,20 @@ DRI2PROTO_CFLAGS
DRI2PROTO_LIBS
GLPROTO_CFLAGS
GLPROTO_LIBS
+XF86VIDMODE_CFLAGS
+XF86VIDMODE_LIBS
DRIGL_CFLAGS
DRIGL_LIBS
XCB_CFLAGS
XCB_LIBS
-INTEL_CFLAGS
-INTEL_LIBS
LIBDRM_RADEON_CFLAGS
LIBDRM_RADEON_LIBS
-EGL_DRI2_CFLAGS
-EGL_DRI2_LIBS
+INTEL_CFLAGS
+INTEL_LIBS
+XCB_DRI2_CFLAGS
+XCB_DRI2_LIBS
+LIBUDEV_CFLAGS
+LIBUDEV_LIBS
GLW_CFLAGS
GLW_LIBS
GLUT_CFLAGS
@@ -1410,7 +1450,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Mesa 7.8.2 to adapt to many kinds of systems.
+\`configure' configures Mesa 7.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1481,7 +1521,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Mesa 7.8.2:";;
+ short | recursive ) echo "Configuration of Mesa 7.9.0:";;
esac
cat <<\_ACEOF
@@ -1502,8 +1542,12 @@ Optional Features:
--enable-selinux Build SELinux-aware Mesa [default=disabled]
--enable-xcb use XCB for GLX [default=disabled]
--enable-glx-tls enable TLS support in GLX [default=disabled]
- --disable-driglx-direct enable direct rendering in GLX for DRI
+ --disable-driglx-direct enable direct rendering in GLX and EGL for DRI
[default=enabled]
+ --disable-opengl disable support for standard OpenGL API [default=no]
+ --enable-gles1 enable support for OpenGL ES 1.x API [default=no]
+ --enable-gles2 enable support for OpenGL ES 2.x API [default=no]
+ --enable-gles-overlay build separate OpenGL ES only libraries [default=no]
--enable-gl-osmesa enable OSMesa with libGL [default=enabled for xlib
driver]
--disable-egl disable EGL library [default=enabled]
@@ -1513,20 +1557,21 @@ Optional Features:
--disable-glut enable GLUT library [default=enabled if source
available]
--disable-gallium build gallium [default=enabled]
+ --enable-gallium-llvm build gallium LLVM support [default=disabled]
--enable-gallium-svga build gallium SVGA [default=disabled]
- --enable-gallium-intel build gallium intel [default=disabled]
+ --enable-gallium-i915 build gallium i915 [default=disabled]
+ --enable-gallium-i965 build gallium i965 [default=disabled]
--enable-gallium-radeon build gallium radeon [default=disabled]
+ --enable-gallium-r600 build gallium radeon [default=disabled]
--enable-gallium-nouveau
build gallium nouveau [default=disabled]
- --enable-gallium-swrast build gallium swrast [default=disabled]
+ --enable-gallium-swrast build gallium swrast [default=auto]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-driver=DRIVER driver for Mesa: xlib,dri,osmesa [default=dri when
available, or xlib]
- --with-demos[=DIRS...] optional comma delimited demo directories to build
- [default=auto if source available]
--with-x use the X Window System
--with-dri-driverdir=DIR
directory for the DRI drivers [${libdir}/dri]
@@ -1542,9 +1587,11 @@ Optional Packages:
--with-state-trackers[=DIRS...]
comma delimited state_trackers list, e.g. "egl,glx"
[default=auto]
+ --with-egl-platforms[=DIRS...]
+ comma delimited native platforms libEGL supports,
+ e.g. "x11,drm" [default=auto]
--with-egl-displays[=DIRS...]
- comma delimited native displays libEGL supports,
- e.g. "x11,kms" [default=auto]
+ DEPRECATED. Use --with-egl-platforms instead
--with-egl-driver-dir=DIR
directory for EGL drivers [[default=${libdir}/egl]]
--with-xorg-driver-dir=DIR
@@ -1576,6 +1623,9 @@ Some influential environment variables:
MKLIB_OPTIONS
Options for the Mesa library script, mklib
PIC_FLAGS compiler flags for PIC code
+ TALLOC_CFLAGS
+ C compiler flags for TALLOC, overriding pkg-config
+ TALLOC_LIBS linker flags for TALLOC, overriding pkg-config
X11_CFLAGS C compiler flags for X11, overriding pkg-config
X11_LIBS linker flags for X11, overriding pkg-config
XMKMF Path to xmkmf, Makefile generator for X Window System
@@ -1593,22 +1643,30 @@ Some influential environment variables:
C compiler flags for GLPROTO, overriding pkg-config
GLPROTO_LIBS
linker flags for GLPROTO, overriding pkg-config
+ XF86VIDMODE_CFLAGS
+ C compiler flags for XF86VIDMODE, overriding pkg-config
+ XF86VIDMODE_LIBS
+ linker flags for XF86VIDMODE, overriding pkg-config
DRIGL_CFLAGS
C compiler flags for DRIGL, overriding pkg-config
DRIGL_LIBS linker flags for DRIGL, overriding pkg-config
XCB_CFLAGS C compiler flags for XCB, overriding pkg-config
XCB_LIBS linker flags for XCB, overriding pkg-config
- INTEL_CFLAGS
- C compiler flags for INTEL, overriding pkg-config
- INTEL_LIBS linker flags for INTEL, overriding pkg-config
LIBDRM_RADEON_CFLAGS
C compiler flags for LIBDRM_RADEON, overriding pkg-config
LIBDRM_RADEON_LIBS
linker flags for LIBDRM_RADEON, overriding pkg-config
- EGL_DRI2_CFLAGS
- C compiler flags for EGL_DRI2, overriding pkg-config
- EGL_DRI2_LIBS
- linker flags for EGL_DRI2, overriding pkg-config
+ INTEL_CFLAGS
+ C compiler flags for INTEL, overriding pkg-config
+ INTEL_LIBS linker flags for INTEL, overriding pkg-config
+ XCB_DRI2_CFLAGS
+ C compiler flags for XCB_DRI2, overriding pkg-config
+ XCB_DRI2_LIBS
+ linker flags for XCB_DRI2, overriding pkg-config
+ LIBUDEV_CFLAGS
+ C compiler flags for LIBUDEV, overriding pkg-config
+ LIBUDEV_LIBS
+ linker flags for LIBUDEV, overriding pkg-config
GLW_CFLAGS C compiler flags for GLW, overriding pkg-config
GLW_LIBS linker flags for GLW, overriding pkg-config
GLUT_CFLAGS C compiler flags for GLUT, overriding pkg-config
@@ -1694,7 +1752,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Mesa configure 7.8.2
+Mesa configure 7.9.0
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2103,7 +2161,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Mesa $as_me 7.8.2, which was
+It was created by Mesa $as_me 7.9.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -4547,7 +4605,36 @@ done
;;
esac
-if test "x$GCC" = xyes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiling with clang" >&5
+$as_echo_n "checking if compiling with clang... " >&6; }
+
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+#ifndef __clang__
+ not clang
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ CLANG=yes
+else
+ CLANG=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG" >&5
+$as_echo "$CLANG" >&6; }
+
+if test "x$GCC" = xyes -a "x$CLANG" = xno; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc version is sufficient" >&5
$as_echo_n "checking whether gcc version is sufficient... " >&6; }
major=0
@@ -4727,15 +4814,17 @@ cygwin*)
esac
if test "x$GCC" = xyes; then
- CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99 -ffast-math"
+ CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99"
+ if test "x$CLANG" = "xno"; then
+ CFLAGS="$CFLAGS -ffast-math"
+ fi
# Enable -fvisibility=hidden if using a gcc that supports it
save_CFLAGS="$CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
$as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
CFLAGS="$CFLAGS -fvisibility=hidden"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4762,6 +4851,32 @@ fi
if test "x$GXX" = xyes; then
CXXFLAGS="$CXXFLAGS -Wall"
+ # Enable -fvisibility=hidden if using a gcc that supports it
+ save_CXXFLAGS="$CXXFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -fvisibility=hidden" >&5
+$as_echo_n "checking whether $CXX supports -fvisibility=hidden... " >&6; }
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ CXXFLAGS="$save_CXXFLAGS" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext;
+
# Work around aliasing bugs - developers should comment this out
CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
fi
@@ -4873,6 +4988,8 @@ if test "x$enable_debug" = xyes; then
fi
fi
+LIB_PREFIX_GLOB='lib'
+LIB_VERSION_SEPARATOR='.'
if test "$enable_static" = yes; then
LIB_EXTENSION='a'
else
@@ -4880,6 +4997,8 @@ else
darwin* )
LIB_EXTENSION='dylib' ;;
cygwin* )
+ LIB_PREFIX_GLOB='???'
+ LIB_VERSION_SEPARATOR='-'
LIB_EXTENSION='dll' ;;
aix* )
LIB_EXTENSION='a' ;;
@@ -4894,13 +5013,26 @@ GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}
GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}
OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}
EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION}
+GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}
+GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}
+VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}
+
+GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLUT_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLUT_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLW_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLW_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+
+
+
+
+
-GL_LIB_GLOB='lib$(GL_LIB).*'${LIB_EXTENSION}'*'
-GLU_LIB_GLOB='lib$(GLU_LIB).*'${LIB_EXTENSION}'*'
-GLUT_LIB_GLOB='lib$(GLUT_LIB).*'${LIB_EXTENSION}'*'
-GLW_LIB_GLOB='lib$(GLW_LIB).*'${LIB_EXTENSION}'*'
-OSMESA_LIB_GLOB='lib$(OSMESA_LIB).*'${LIB_EXTENSION}'*'
-EGL_LIB_GLOB='lib$(EGL_LIB).*'${LIB_EXTENSION}'*'
@@ -5167,6 +5299,7 @@ fi
fi
+
ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign"
if test "x$ac_cv_func_posix_memalign" = x""yes; then :
DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"
@@ -5533,27 +5666,119 @@ xxlib|xdri|xosmesa)
esac
-CORE_DIRS="glsl mesa"
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TALLOC" >&5
+$as_echo_n "checking for TALLOC... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TALLOC_CFLAGS"; then
+ pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "talloc") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TALLOC_LIBS"; then
+ pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "talloc") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc"`
+ else
+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$TALLOC_PKG_ERRORS" >&5
+
+ as_fn_error "Package requirements (talloc) were not met:
+
+$TALLOC_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables TALLOC_CFLAGS
+and TALLOC_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables TALLOC_CFLAGS
+and TALLOC_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see .
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
+ TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+
+
-SRC_DIRS="glew"
+
+CORE_DIRS="mapi/glapi glsl mesa"
+
+SRC_DIRS=""
GLU_DIRS="sgi"
-WINDOW_SYSTEM=""
GALLIUM_DIRS="auxiliary drivers state_trackers"
-GALLIUM_WINSYS_DIRS=""
-GALLIUM_WINSYS_DRM_DIRS=""
-GALLIUM_DRIVERS_DIRS="softpipe failover trace identity"
+GALLIUM_TARGET_DIRS=""
+GALLIUM_WINSYS_DIRS="sw"
+GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug identity"
GALLIUM_STATE_TRACKERS_DIRS=""
case "$mesa_driver" in
xlib)
DRIVER_DIRS="x11"
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"
;;
dri)
SRC_DIRS="$SRC_DIRS glx"
DRIVER_DIRS="dri"
- WINDOW_SYSTEM="dri"
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"
;;
osmesa)
DRIVER_DIRS="osmesa"
@@ -5569,43 +5794,6 @@ esac
-if test -d "$srcdir/progs/demos"; then
- default_demos=yes
-else
- default_demos=no
-fi
-
-# Check whether --with-demos was given.
-if test "${with_demos+set}" = set; then :
- withval=$with_demos; with_demos="$withval"
-else
- with_demos="$default_demos"
-fi
-
-if test "x$with_demos" = x; then
- with_demos=no
-fi
-
-PROGRAM_DIRS=""
-case "$with_demos" in
-no) ;;
-yes)
- # If the driver isn't osmesa, we have libGL and can build xdemos
- if test "$mesa_driver" != osmesa; then
- PROGRAM_DIRS="xdemos"
- fi
- ;;
-*)
- # verify the requested demos directories exist
- demos=`IFS=,; echo $with_demos`
- for demo in $demos; do
- test -d "$srcdir/progs/$demo" || \
- as_fn_error "Program directory '$demo' doesn't exist" "$LINENO" 5
- done
- PROGRAM_DIRS="$demos"
- ;;
-esac
-
if test -n "$PKG_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config files for X11 are available" >&5
$as_echo_n "checking pkg-config files for X11 are available... " >&6; }
@@ -6536,8 +6724,8 @@ fi
GL_PC_LIB_PRIV="$GL_LIB_DEPS"
GL_PC_CFLAGS="$X11_INCLUDES"
fi
- GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
- GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"
+ GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS"
+ GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS"
# if static, move the external libraries to the programs
# and empty the libraries for libGL
@@ -6828,8 +7016,85 @@ fi
# find the DRI deps for libGL
if test "$x11_pkgconfig" = yes; then
+ dri_modules="x11 xext xdamage xfixes"
+
+ # add xf86vidmode if available
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5
+$as_echo_n "checking for XF86VIDMODE... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XF86VIDMODE_CFLAGS"; then
+ pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xxf86vm\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xxf86vm") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XF86VIDMODE_CFLAGS=`$PKG_CONFIG --cflags "xxf86vm" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XF86VIDMODE_LIBS"; then
+ pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xxf86vm\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xxf86vm") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XF86VIDMODE_LIBS=`$PKG_CONFIG --libs "xxf86vm" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xxf86vm"`
+ else
+ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xxf86vm"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XF86VIDMODE_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_XF86VIDMODE=no
+elif test $pkg_failed = untried; then
+ HAVE_XF86VIDMODE=no
+else
+ XF86VIDMODE_CFLAGS=$pkg_cv_XF86VIDMODE_CFLAGS
+ XF86VIDMODE_LIBS=$pkg_cv_XF86VIDMODE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_XF86VIDMODE=yes
+fi
+ if test "$HAVE_XF86VIDMODE" = yes ; then
+ dri_modules="$dri_modules xxf86vm"
+ fi
+
# add xcb modules if necessary
- dri_modules="x11 xext xxf86vm xdamage xfixes"
if test "$enable_xcb" = yes; then
dri_modules="$dri_modules x11-xcb xcb-glx"
fi
@@ -7035,6 +7300,10 @@ fi
# need DRM libs, -lpthread, etc.
GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+ GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+ GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+ GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+ GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
;;
osmesa)
# No libGL for osmesa
@@ -7047,54 +7316,185 @@ esac
-if test "$mesa_driver" = xlib; then
- DEFINES="$DEFINES -DUSE_XSHM"
-fi
-
-# Check whether --enable-glx-tls was given.
-if test "${enable_glx_tls+set}" = set; then :
- enableval=$enable_glx_tls; GLX_USE_TLS="$enableval"
-else
- GLX_USE_TLS=no
-fi
-# Check whether --with-dri-driverdir was given.
-if test "${with_dri_driverdir+set}" = set; then :
- withval=$with_dri_driverdir; DRI_DRIVER_INSTALL_DIR="$withval"
-else
- DRI_DRIVER_INSTALL_DIR='${libdir}/dri'
-fi
-# Check whether --with-dri-searchpath was given.
-if test "${with_dri_searchpath+set}" = set; then :
- withval=$with_dri_searchpath; DRI_DRIVER_SEARCH_DIR="$withval"
-else
- DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'
-fi
-# Check whether --enable-driglx-direct was given.
-if test "${enable_driglx_direct+set}" = set; then :
- enableval=$enable_driglx_direct; driglx_direct="$enableval"
-else
- driglx_direct="yes"
-fi
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM_RADEON" >&5
+$as_echo_n "checking for LIBDRM_RADEON... " >&6; }
-# Check whether --with-dri-drivers was given.
-if test "${with_dri_drivers+set}" = set; then :
- withval=$with_dri_drivers; with_dri_drivers="$withval"
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBDRM_RADEON_CFLAGS"; then
+ pkg_cv_LIBDRM_RADEON_CFLAGS="$LIBDRM_RADEON_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_radeon libdrm >= \$LIBDRM_RADEON_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBDRM_RADEON_CFLAGS=`$PKG_CONFIG --cflags "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED" 2>/dev/null`
else
- with_dri_drivers=yes
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBDRM_RADEON_LIBS"; then
+ pkg_cv_LIBDRM_RADEON_LIBS="$LIBDRM_RADEON_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_radeon libdrm >= \$LIBDRM_RADEON_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBDRM_RADEON_LIBS=`$PKG_CONFIG --libs "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBDRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED"`
+ else
+ LIBDRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBDRM_RADEON_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_LIBDRM_RADEON=no
+elif test $pkg_failed = untried; then
+ HAVE_LIBDRM_RADEON=no
+else
+ LIBDRM_RADEON_CFLAGS=$pkg_cv_LIBDRM_RADEON_CFLAGS
+ LIBDRM_RADEON_LIBS=$pkg_cv_LIBDRM_RADEON_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_LIBDRM_RADEON=yes
+fi
+
+if test "$mesa_driver" = xlib; then
+ DEFINES="$DEFINES -DUSE_XSHM"
+fi
+
+# Check whether --enable-glx-tls was given.
+if test "${enable_glx_tls+set}" = set; then :
+ enableval=$enable_glx_tls; GLX_USE_TLS="$enableval"
+else
+ GLX_USE_TLS=no
+fi
+
+
+# Check whether --with-dri-driverdir was given.
+if test "${with_dri_driverdir+set}" = set; then :
+ withval=$with_dri_driverdir; DRI_DRIVER_INSTALL_DIR="$withval"
+else
+ DRI_DRIVER_INSTALL_DIR='${libdir}/dri'
+fi
+
+
+
+# Check whether --with-dri-searchpath was given.
+if test "${with_dri_searchpath+set}" = set; then :
+ withval=$with_dri_searchpath; DRI_DRIVER_SEARCH_DIR="$withval"
+else
+ DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'
+fi
+
+
+# Check whether --enable-driglx-direct was given.
+if test "${enable_driglx_direct+set}" = set; then :
+ enableval=$enable_driglx_direct; driglx_direct="$enableval"
+else
+ driglx_direct="yes"
+fi
+
+
+# Check whether --with-dri-drivers was given.
+if test "${with_dri_drivers+set}" = set; then :
+ withval=$with_dri_drivers; with_dri_drivers="$withval"
+else
+ with_dri_drivers=yes
fi
if test "x$with_dri_drivers" = x; then
with_dri_drivers=no
fi
+# Check whether --enable-opengl was given.
+if test "${enable_opengl+set}" = set; then :
+ enableval=$enable_opengl; enable_opengl="$enableval"
+else
+ enable_opengl=yes
+fi
+
+# Check whether --enable-gles1 was given.
+if test "${enable_gles1+set}" = set; then :
+ enableval=$enable_gles1; enable_gles1="$enableval"
+else
+ enable_gles1=no
+fi
+
+# Check whether --enable-gles2 was given.
+if test "${enable_gles2+set}" = set; then :
+ enableval=$enable_gles2; enable_gles2="$enableval"
+else
+ enable_gles2=no
+fi
+
+# Check whether --enable-gles-overlay was given.
+if test "${enable_gles_overlay+set}" = set; then :
+ enableval=$enable_gles_overlay; enable_gles_overlay="$enableval"
+else
+ enable_gles_overlay=no
+fi
+
+
+API_DEFINES=""
+GLES_OVERLAY=0
+if test "x$enable_opengl" = xno; then
+ API_DEFINES="$API_DEFINES -DFEATURE_GL=0"
+else
+ API_DEFINES="$API_DEFINES -DFEATURE_GL=1"
+fi
+if test "x$enable_gles1" = xyes; then
+ API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"
+fi
+if test "x$enable_gles2" = xyes; then
+ API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"
+fi
+if test "x$enable_gles_overlay" = xyes -o \
+ "x$enable_gles1" = xyes -o "x$enable_gles2" = xyes; then
+ CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
+ if test "x$enable_gles_overlay" = xyes; then
+ GLES_OVERLAY=1
+ fi
+fi
+
+
+
DRI_DIRS=""
case "$with_dri_drivers" in
no) ;;
@@ -7260,7 +7660,7 @@ fi
# put all the necessary libs together
- DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
+ DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS $TALLOC_LIBS"
fi
@@ -7278,12 +7678,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_INTEL_CFLAGS="$INTEL_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_intel >= 2.4.19\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm_intel >= 2.4.19") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_intel >= 2.4.21\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm_intel >= 2.4.21") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_INTEL_CFLAGS=`$PKG_CONFIG --cflags "libdrm_intel >= 2.4.19" 2>/dev/null`
+ pkg_cv_INTEL_CFLAGS=`$PKG_CONFIG --cflags "libdrm_intel >= 2.4.21" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7296,12 +7696,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_INTEL_LIBS="$INTEL_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_intel >= 2.4.19\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm_intel >= 2.4.19") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_intel >= 2.4.21\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm_intel >= 2.4.21") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_INTEL_LIBS=`$PKG_CONFIG --libs "libdrm_intel >= 2.4.19" 2>/dev/null`
+ pkg_cv_INTEL_LIBS=`$PKG_CONFIG --libs "libdrm_intel >= 2.4.21" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7320,14 +7720,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- INTEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm_intel >= 2.4.19"`
+ INTEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm_intel >= 2.4.21"`
else
- INTEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm_intel >= 2.4.19"`
+ INTEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm_intel >= 2.4.21"`
fi
# Put the nasty error message in config.log where it belongs
echo "$INTEL_PKG_ERRORS" >&5
- as_fn_error "Package requirements (libdrm_intel >= 2.4.19) were not met:
+ as_fn_error "Package requirements (libdrm_intel >= 2.4.21) were not met:
$INTEL_PKG_ERRORS
@@ -7363,79 +7763,7 @@ esac
case $DRI_DIRS in
*radeon*|*r200*|*r300*|*r600*)
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM_RADEON" >&5
-$as_echo_n "checking for LIBDRM_RADEON... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBDRM_RADEON_CFLAGS"; then
- pkg_cv_LIBDRM_RADEON_CFLAGS="$LIBDRM_RADEON_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_radeon libdrm >= \$LIBDRM_RADEON_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBDRM_RADEON_CFLAGS=`$PKG_CONFIG --cflags "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBDRM_RADEON_LIBS"; then
- pkg_cv_LIBDRM_RADEON_LIBS="$LIBDRM_RADEON_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_radeon libdrm >= \$LIBDRM_RADEON_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBDRM_RADEON_LIBS=`$PKG_CONFIG --libs "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- LIBDRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED"`
- else
- LIBDRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBDRM_RADEON_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- HAVE_LIBDRM_RADEON=no
-elif test $pkg_failed = untried; then
- HAVE_LIBDRM_RADEON=no
-else
- LIBDRM_RADEON_CFLAGS=$pkg_cv_LIBDRM_RADEON_CFLAGS
- LIBDRM_RADEON_LIBS=$pkg_cv_LIBDRM_RADEON_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- HAVE_LIBDRM_RADEON=yes
-fi
-
- if test "$HAVE_LIBDRM_RADEON" = yes; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
fi
@@ -7496,12 +7824,12 @@ case "$DRIVER_DIRS" in
*osmesa*)
# only link libraries with osmesa if shared
if test "$enable_static" = no; then
- OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+ OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS"
else
OSMESA_LIB_DEPS=""
fi
OSMESA_MESA_DEPS=""
- OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+ OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS"
;;
esac
@@ -7526,23 +7854,24 @@ if test "x$enable_egl" = xyes; then
EGL_DRIVERS_DIRS="glx"
fi
- # build egl_dri2 when xcb-dri2 is available
+ if test "$mesa_driver" = dri; then
+ # build egl_dri2 when xcb-dri2 is available
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGL_DRI2" >&5
-$as_echo_n "checking for EGL_DRI2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_DRI2" >&5
+$as_echo_n "checking for XCB_DRI2... " >&6; }
if test -n "$PKG_CONFIG"; then
- if test -n "$EGL_DRI2_CFLAGS"; then
- pkg_cv_EGL_DRI2_CFLAGS="$EGL_DRI2_CFLAGS"
+ if test -n "$XCB_DRI2_CFLAGS"; then
+ pkg_cv_XCB_DRI2_CFLAGS="$XCB_DRI2_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-xfixes libdrm\""; } >&5
- ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-xfixes libdrm") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-xfixes\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-xfixes") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_EGL_DRI2_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb-dri2 xcb-xfixes libdrm" 2>/dev/null`
+ pkg_cv_XCB_DRI2_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb-dri2 xcb-xfixes" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7551,16 +7880,16 @@ else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
- if test -n "$EGL_DRI2_LIBS"; then
- pkg_cv_EGL_DRI2_LIBS="$EGL_DRI2_LIBS"
+ if test -n "$XCB_DRI2_LIBS"; then
+ pkg_cv_XCB_DRI2_LIBS="$XCB_DRI2_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-xfixes libdrm\""; } >&5
- ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-xfixes libdrm") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-xfixes\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-xfixes") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_EGL_DRI2_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb-dri2 xcb-xfixes libdrm" 2>/dev/null`
+ pkg_cv_XCB_DRI2_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb-dri2 xcb-xfixes" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7579,12 +7908,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- EGL_DRI2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb-dri2 xcb-xfixes libdrm"`
+ XCB_DRI2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb-dri2 xcb-xfixes"`
else
- EGL_DRI2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb-dri2 xcb-xfixes libdrm"`
+ XCB_DRI2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb-dri2 xcb-xfixes"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$EGL_DRI2_PKG_ERRORS" >&5
+ echo "$XCB_DRI2_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7592,19 +7921,94 @@ $as_echo "no" >&6; }
elif test $pkg_failed = untried; then
have_xcb_dri2=no
else
- EGL_DRI2_CFLAGS=$pkg_cv_EGL_DRI2_CFLAGS
- EGL_DRI2_LIBS=$pkg_cv_EGL_DRI2_LIBS
+ XCB_DRI2_CFLAGS=$pkg_cv_XCB_DRI2_CFLAGS
+ XCB_DRI2_LIBS=$pkg_cv_XCB_DRI2_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
have_xcb_dri2=yes
fi
- if test "$have_xcb_dri2" = yes; then
- EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
- fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5
+$as_echo_n "checking for LIBUDEV... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBUDEV_CFLAGS"; then
+ pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev > 150\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libudev > 150") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev > 150" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBUDEV_LIBS"; then
+ pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev > 150\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libudev > 150") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev > 150" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libudev > 150"`
+ else
+ LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libudev > 150"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBUDEV_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_libudev=no
+elif test $pkg_failed = untried; then
+ have_libudev=no
+else
+ LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS
+ LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_libudev=yes
+fi
+
+ if test "$have_xcb_dri2" = yes; then
+ EGL_DRIVER_DRI2=dri2
+ DEFINES="$DEFINES -DHAVE_XCB_DRI2"
+ if test "$have_libudev" = yes; then
+ DEFINES="$DEFINES -DHAVE_LIBUDEV"
+ fi
+ fi
+ fi
- if test "$with_demos" = yes; then
- PROGRAM_DIRS="$PROGRAM_DIRS egl"
+ EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"
fi
fi
@@ -7622,12 +8026,6 @@ if test "x$enable_glu" = xyes; then
case "$mesa_driver" in
osmesa)
- # If GLU is available and we have libOSMesa (not 16 or 32),
- # we can build the osdemos
- if test "$with_demos" = yes && test "$osmesa_bits" = 8; then
- PROGRAM_DIRS="$PROGRAM_DIRS osdemos"
- fi
-
# Link libGLU to libOSMesa instead of libGL
GLU_LIB_DEPS=""
GLU_PC_REQ="osmesa"
@@ -7936,10 +8334,6 @@ fi
if test "x$enable_glut" = xyes; then
SRC_DIRS="$SRC_DIRS glut/glx"
- GLUT_CFLAGS=""
- if test "x$GCC" = xyes; then
- GLUT_CFLAGS="-fexceptions"
- fi
if test "$x11_pkgconfig" = yes; then
pkg_failed=no
@@ -8039,14 +8433,12 @@ fi
GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"
GLUT_PC_CFLAGS="$X11_INCLUDES"
fi
+ if test "x$GCC" = xyes; then
+ GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions"
+ fi
GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"
GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"
- # If glut is available, we can build most programs
- if test "$with_demos" = yes; then
- PROGRAM_DIRS="$PROGRAM_DIRS demos redbook samples glsl"
- fi
-
# If static, empty GLUT_LIB_DEPS and add libs for programs to link
if test "$enable_static" = no; then
GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)'
@@ -8087,7 +8479,67 @@ else
fi
if test "x$enable_gallium" = xyes; then
- SRC_DIRS="$SRC_DIRS gallium gallium/winsys"
+ SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
+ ac_fn_c_check_header_mongrel "$LINENO" "udis86.h" "ac_cv_header_udis86_h" "$ac_includes_default"
+if test "x$ac_cv_header_udis86_h" = x""yes; then :
+ HAS_UDIS86="yes"
+else
+ HAS_UDIS86="no"
+fi
+
+
+ # Extract the first word of "llvm-config", so it can be a program name with args.
+set dummy llvm-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LLVM_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $LLVM_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_LLVM_CONFIG="$LLVM_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_LLVM_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_LLVM_CONFIG" && ac_cv_path_LLVM_CONFIG="no"
+ ;;
+esac
+fi
+LLVM_CONFIG=$ac_cv_path_LLVM_CONFIG
+if test -n "$LLVM_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5
+$as_echo "$LLVM_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+
+
+
+
+
+
+VG_LIB_DEPS=""
+EGL_CLIENT_APIS='$(GL_LIB)'
+if test "x$enable_gles_overlay" = xyes; then
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)'
fi
@@ -8111,8 +8563,10 @@ yes)
;;
dri)
GALLIUM_STATE_TRACKERS_DIRS="dri"
+ HAVE_ST_DRI="yes"
if test "x$enable_egl" = xyes; then
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
+ HAVE_ST_EGL="yes"
fi
# Have only tested st/xorg on 1.6.0 servers
@@ -8176,34 +8630,129 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_XORG="no"
+ HAVE_ST_XORG="no"
elif test $pkg_failed = untried; then
- HAVE_XORG="no"
+ HAVE_ST_XORG="no"
else
XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
XORG_LIBS=$pkg_cv_XORG_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg"
+ HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg"
fi
;;
esac
;;
*)
# verify the requested state tracker exist
- state_trackers=`IFS=', '; echo $with_state_trackers`
- for tracker in $state_trackers; do
- test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
- as_fn_error "state tracker '$tracker' doesn't exist" "$LINENO" 5
-
+ state_trackers=""
+ _state_trackers=`IFS=', '; echo $with_state_trackers`
+ for tracker in $_state_trackers; do
case "$tracker" in
+ dri)
+ if test "x$mesa_driver" != xdri; then
+ as_fn_error "cannot build dri state tracker without mesa driver set to dri" "$LINENO" 5
+ fi
+ HAVE_ST_DRI="yes"
+ ;;
egl)
if test "x$enable_egl" != xyes; then
as_fn_error "cannot build egl state tracker without EGL library" "$LINENO" 5
fi
+ HAVE_ST_EGL="yes"
;;
xorg)
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5
+$as_echo_n "checking for XORG... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XORG_CFLAGS"; then
+ pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.6.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.6.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XORG_LIBS"; then
+ pkg_cv_XORG_LIBS="$XORG_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.6.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.6.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.6.0"`
+ else
+ XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.6.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XORG_PKG_ERRORS" >&5
+
+ as_fn_error "Package requirements (xorg-server >= 1.6.0) were not met:
+
+$XORG_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see .
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
+ XORG_LIBS=$pkg_cv_XORG_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM_XORG" >&5
$as_echo_n "checking for LIBDRM_XORG... " >&6; }
@@ -8383,19 +8932,54 @@ else
$as_echo "yes" >&6; }
:
fi
- HAVE_XORG="yes"
+ HAVE_ST_XORG="yes"
;;
es)
- # mesa/es is required to build es state tracker
- CORE_DIRS="$CORE_DIRS mesa/es"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: state tracker 'es' has been replaced by --enable-gles-overlay" >&5
+$as_echo "$as_me: WARNING: state tracker 'es' has been replaced by --enable-gles-overlay" >&2;}
+
+ if test "x$enable_gles_overlay" != xyes; then
+ if test "x$enable_gles1" != xyes -a "x$enable_gles2" != xyes; then
+ CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
+ fi
+ GLES_OVERLAY=1
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)'
+ fi
+ tracker=""
+ ;;
+ vega)
+ CORE_DIRS="$CORE_DIRS mapi/vgapi"
+ VG_LIB_DEPS="$VG_LIB_DEPS -lpthread"
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'
;;
esac
+
+ if test -n "$tracker"; then
+ test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
+ as_fn_error "state tracker '$tracker' doesn't exist" "$LINENO" 5
+ if test -n "$state_trackers"; then
+ state_trackers="$state_trackers $tracker"
+ else
+ state_trackers="$tracker"
+ fi
+ fi
done
GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
;;
esac
-if test "x$HAVE_XORG" = xyes; then
+
+
+
+if test "x$HAVE_ST_EGL" = xyes; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"
+ # define GLX_DIRECT_RENDERING even when the driver is not dri
+ if test "x$mesa_driver" != xdri -a "x$driglx_direct" = xyes; then
+ DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+ fi
+fi
+
+if test "x$HAVE_ST_XORG" = xyes; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5
@@ -8470,19 +9054,28 @@ fi
fi
+# Check whether --with-egl-platforms was given.
+if test "${with_egl_platforms+set}" = set; then :
+ withval=$with_egl_platforms; with_egl_platforms="$withval"
+else
+ with_egl_platforms=yes
+fi
+
+
# Check whether --with-egl-displays was given.
if test "${with_egl_displays+set}" = set; then :
- withval=$with_egl_displays; with_egl_displays="$withval"
-else
- with_egl_displays=yes
+ withval=$with_egl_displays; with_egl_platforms="$withval"
fi
-EGL_DISPLAYS=""
-case "$with_egl_displays" in
+EGL_PLATFORMS=""
+case "$with_egl_platforms" in
yes)
if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then
- EGL_DISPLAYS="x11"
+ EGL_PLATFORMS="x11"
+ if test "$mesa_driver" = dri; then
+ EGL_PLATFORMS="$EGL_PLATFORMS drm"
+ fi
fi
;;
*)
@@ -8490,12 +9083,15 @@ yes)
as_fn_error "cannot build egl state tracker without EGL library" "$LINENO" 5
fi
# verify the requested driver directories exist
- egl_displays=`IFS=', '; echo $with_egl_displays`
- for dpy in $egl_displays; do
- test -d "$srcdir/src/gallium/state_trackers/egl/$dpy" || \
- as_fn_error "EGL display '$dpy' does't exist" "$LINENO" 5
+ egl_platforms=`IFS=', '; echo $with_egl_platforms`
+ for plat in $egl_platforms; do
+ test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \
+ as_fn_error "EGL platform '$plat' does't exist" "$LINENO" 5
+ if test "$plat" = "fbdev"; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"
+ fi
done
- EGL_DISPLAYS="$egl_displays"
+ EGL_PLATFORMS="$egl_platforms"
;;
esac
@@ -8543,6 +9139,47 @@ fi
fi
+# Check whether --enable-gallium-llvm was given.
+if test "${enable_gallium_llvm+set}" = set; then :
+ enableval=$enable_gallium_llvm; enable_gallium_llvm="$enableval"
+else
+ enable_gallium_llvm=auto
+fi
+
+if test "x$enable_gallium_llvm" = xyes; then
+ if test "x$LLVM_CONFIG" != xno; then
+ LLVM_VERSION=`$LLVM_CONFIG --version`
+ LLVM_CFLAGS=`$LLVM_CONFIG --cflags`
+ LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
+
+ if test "x$HAS_UDIS86" != xno; then
+ LLVM_LIBS="$LLVM_LIBS -ludis86"
+ DEFINES="$DEFINES -DHAVE_UDIS86"
+ fi
+ LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+ DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
+ MESA_LLVM=1
+ else
+ MESA_LLVM=0
+ fi
+else
+ MESA_LLVM=0
+fi
+
+gallium_check_st() {
+ if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1"
+ fi
+ if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"
+ fi
+ if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"
+ fi
+}
+
+
# Check whether --enable-gallium-svga was given.
if test "${enable_gallium_svga+set}" = set; then :
enableval=$enable_gallium_svga; enable_gallium_svga="$enableval"
@@ -8551,24 +9188,40 @@ else
fi
if test "x$enable_gallium_svga" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS vmware"
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
+ gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"
elif test "x$enable_gallium_svga" = xauto; then
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
fi
-# Check whether --enable-gallium-intel was given.
-if test "${enable_gallium_intel+set}" = set; then :
- enableval=$enable_gallium_intel; enable_gallium_intel="$enableval"
+# Check whether --enable-gallium-i915 was given.
+if test "${enable_gallium_i915+set}" = set; then :
+ enableval=$enable_gallium_i915; enable_gallium_i915="$enableval"
else
- enable_gallium_intel=auto
+ enable_gallium_i915=auto
+fi
+
+if test "x$enable_gallium_i915" = xyes; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+ gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
+elif test "x$enable_gallium_i915" = xauto; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
fi
-if test "x$enable_gallium_intel" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel i965"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
-elif test "x$enable_gallium_intel" = xauto; then
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
+# Check whether --enable-gallium-i965 was given.
+if test "${enable_gallium_i965+set}" = set; then :
+ enableval=$enable_gallium_i965; enable_gallium_i965="$enableval"
+else
+ enable_gallium_i965=auto
+fi
+
+if test "x$enable_gallium_i965" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
+ gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
+elif test "x$enable_gallium_i965" = xauto; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
fi
# Check whether --enable-gallium-radeon was given.
@@ -8578,11 +9231,38 @@ else
enable_gallium_radeon=auto
fi
+if test "x$enable_gallium_radeon" = xauto; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ gallium_check_st "radeon/drm" "dri-r300"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdrm_radeon is missing, not building gallium-radeon (r300)" >&5
+$as_echo "$as_me: WARNING: libdrm_radeon is missing, not building gallium-radeon (r300)" >&2;}
+ fi
+fi
if test "x$enable_gallium_radeon" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS radeon"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-elif test "x$enable_gallium_radeon" = xauto; then
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+ else
+ as_fn_error "libdrm_radeon is missing, cannot build gallium-radeon (r300)" "$LINENO" 5
+ fi
+fi
+
+# Check whether --enable-gallium-r600 was given.
+if test "${enable_gallium_r600+set}" = set; then :
+ enableval=$enable_gallium_r600; enable_gallium_r600="$enableval"
+else
+ enable_gallium_r600=auto
+fi
+
+if test "x$enable_gallium_r600" = xyes; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+ gallium_check_st "r600/drm" "dri-r600"
+ else
+ as_fn_error "libdrm_radeon is missing, cannot build gallium-r600" "$LINENO" 5
+ fi
fi
# Check whether --enable-gallium-nouveau was given.
@@ -8593,8 +9273,8 @@ else
fi
if test "x$enable_gallium_nouveau" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS nouveau"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv30 nv40 nv50"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50"
+ gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
fi
# Check whether --enable-gallium-swrast was given.
@@ -8604,8 +9284,10 @@ else
enable_gallium_swrast=auto
fi
-if test "x$enable_gallium_swrast" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS swrast"
+if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xauto; then
+ if test "x$HAVE_ST_DRI" = xyes; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
+ fi
fi
SRC_DIRS="$CORE_DIRS $SRC_DIRS"
@@ -9160,7 +9842,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Mesa $as_me 7.8.2, which was
+This file was extended by Mesa $as_me 7.9.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9217,7 +9899,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Mesa config.status 7.8.2
+Mesa config.status 7.9.0
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
@@ -9806,14 +10488,26 @@ fi
fi
echo " Use XCB: $enable_xcb"
+echo ""
+if test "x$MESA_LLVM" = x1; then
+ echo " llvm: yes"
+ echo " llvm-config: $LLVM_CONFIG"
+ echo " llvm-version: $LLVM_VERSION"
+else
+ echo " llvm: no"
+fi
+
echo ""
if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
echo " Gallium: yes"
echo " Gallium dirs: $GALLIUM_DIRS"
+ echo " Target dirs: $GALLIUM_TARGET_DIRS"
echo " Winsys dirs: $GALLIUM_WINSYS_DIRS"
- echo " Winsys drm dirs:$GALLIUM_WINSYS_DRM_DIRS"
echo " Driver dirs: $GALLIUM_DRIVERS_DIRS"
echo " Trackers dirs: $GALLIUM_STATE_TRACKERS_DIRS"
+ if test "x$HAVE_ST_EGL" = xyes; then
+ echo " EGL client APIs: $EGL_CLIENT_APIS"
+ fi
else
echo " Gallium: no"
fi
@@ -9823,6 +10517,7 @@ echo " Shared libs: $enable_shared"
echo " Static libs: $enable_static"
if test "$enable_egl" = yes; then
echo " EGL: $EGL_DRIVERS_DIRS"
+ echo " EGL platforms: $EGL_PLATFORMS"
else
echo " EGL: no"
fi
@@ -9830,14 +10525,6 @@ echo " GLU: $enable_glu"
echo " GLw: $enable_glw (Motif: $enable_motif)"
echo " glut: $enable_glut"
-# cleanup the programs var for display
-program_dirs=`echo $PROGRAM_DIRS | $SED 's/^ *//;s/ */ /;s/ *$//'`
-if test "x$program_dirs" = x; then
- echo " Demos: no"
-else
- echo " Demos: $program_dirs"
-fi
-
# cleanup the CFLAGS/CXXFLAGS/DEFINES vars
cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
$SED 's/^ *//;s/ */ /;s/ *$//'`
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index e711634ee..2f3a47a30 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ([2.59])
dnl Versioning - scrape the version from configs/default
m4_define([mesa_version],
- [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n'])])
+ [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])
m4_ifval(mesa_version,,
[m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
@@ -48,9 +48,23 @@ solaris*)
;;
esac
+dnl clang is mostly GCC-compatible, but its version is much lower,
+dnl so we have to check for it.
+AC_MSG_CHECKING([if compiling with clang])
+
+AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([], [[
+#ifndef __clang__
+ not clang
+#endif
+]])],
+[CLANG=yes], [CLANG=no])
+
+AC_MSG_RESULT([$CLANG])
+
dnl If we're using GCC, make sure that it is at least version 3.3.0. Older
dnl versions are explictly not supported.
-if test "x$GCC" = xyes; then
+if test "x$GCC" = xyes -a "x$CLANG" = xno; then
AC_MSG_CHECKING([whether gcc version is sufficient])
major=0
minor=0
@@ -123,7 +137,10 @@ esac
dnl Add flags for gcc and g++
if test "x$GCC" = xyes; then
- CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99 -ffast-math"
+ CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99"
+ if test "x$CLANG" = "xno"; then
+ CFLAGS="$CFLAGS -ffast-math"
+ fi
# Enable -fvisibility=hidden if using a gcc that supports it
save_CFLAGS="$CFLAGS"
@@ -138,6 +155,13 @@ fi
if test "x$GXX" = xyes; then
CXXFLAGS="$CXXFLAGS -Wall"
+ # Enable -fvisibility=hidden if using a gcc that supports it
+ save_CXXFLAGS="$CXXFLAGS"
+ AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+ [CXXFLAGS="$save_CXXFLAGS" ; AC_MSG_RESULT([no])]);
+
# Work around aliasing bugs - developers should comment this out
CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
fi
@@ -258,6 +282,8 @@ fi
dnl
dnl library names
dnl
+LIB_PREFIX_GLOB='lib'
+LIB_VERSION_SEPARATOR='.'
if test "$enable_static" = yes; then
LIB_EXTENSION='a'
else
@@ -265,6 +291,9 @@ else
darwin* )
LIB_EXTENSION='dylib' ;;
cygwin* )
+ dnl prefix can be 'cyg' or 'lib'
+ LIB_PREFIX_GLOB='???'
+ LIB_VERSION_SEPARATOR='-'
LIB_EXTENSION='dll' ;;
aix* )
LIB_EXTENSION='a' ;;
@@ -279,13 +308,20 @@ GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}
GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}
OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}
EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION}
-
-GL_LIB_GLOB='lib$(GL_LIB).*'${LIB_EXTENSION}'*'
-GLU_LIB_GLOB='lib$(GLU_LIB).*'${LIB_EXTENSION}'*'
-GLUT_LIB_GLOB='lib$(GLUT_LIB).*'${LIB_EXTENSION}'*'
-GLW_LIB_GLOB='lib$(GLW_LIB).*'${LIB_EXTENSION}'*'
-OSMESA_LIB_GLOB='lib$(OSMESA_LIB).*'${LIB_EXTENSION}'*'
-EGL_LIB_GLOB='lib$(EGL_LIB).*'${LIB_EXTENSION}'*'
+GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}
+GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}
+VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}
+
+GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLUT_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLUT_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLW_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLW_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
AC_SUBST([GL_LIB_NAME])
AC_SUBST([GLU_LIB_NAME])
@@ -293,6 +329,9 @@ AC_SUBST([GLUT_LIB_NAME])
AC_SUBST([GLW_LIB_NAME])
AC_SUBST([OSMESA_LIB_NAME])
AC_SUBST([EGL_LIB_NAME])
+AC_SUBST([GLESv1_CM_LIB_NAME])
+AC_SUBST([GLESv2_LIB_NAME])
+AC_SUBST([VG_LIB_NAME])
AC_SUBST([GL_LIB_GLOB])
AC_SUBST([GLU_LIB_GLOB])
@@ -300,6 +339,9 @@ AC_SUBST([GLUT_LIB_GLOB])
AC_SUBST([GLW_LIB_GLOB])
AC_SUBST([OSMESA_LIB_GLOB])
AC_SUBST([EGL_LIB_GLOB])
+AC_SUBST([GLESv1_CM_LIB_GLOB])
+AC_SUBST([GLESv2_LIB_GLOB])
+AC_SUBST([VG_LIB_GLOB])
dnl
dnl Arch/platform-specific settings
@@ -398,6 +440,7 @@ dnl Check to see if dlopen is in default libraries (like Solaris, which
dnl has it in libc), or if libdl is needed to get it.
AC_CHECK_FUNC([dlopen], [],
[AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
dnl See if posix_memalign is available
AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
@@ -450,32 +493,35 @@ xxlib|xdri|xosmesa)
;;
esac
+PKG_CHECK_MODULES([TALLOC], [talloc])
+AC_SUBST([TALLOC_LIBS])
+AC_SUBST([TALLOC_CFLAGS])
+
dnl
dnl Driver specific build directories
dnl
dnl this variable will be prepended to SRC_DIRS and is not exported
-CORE_DIRS="glsl mesa"
+CORE_DIRS="mapi/glapi glsl mesa"
-SRC_DIRS="glew"
+SRC_DIRS=""
GLU_DIRS="sgi"
-WINDOW_SYSTEM=""
GALLIUM_DIRS="auxiliary drivers state_trackers"
-GALLIUM_WINSYS_DIRS=""
-GALLIUM_WINSYS_DRM_DIRS=""
-GALLIUM_DRIVERS_DIRS="softpipe failover trace identity"
+GALLIUM_TARGET_DIRS=""
+GALLIUM_WINSYS_DIRS="sw"
+GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug identity"
GALLIUM_STATE_TRACKERS_DIRS=""
case "$mesa_driver" in
xlib)
DRIVER_DIRS="x11"
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"
;;
dri)
SRC_DIRS="$SRC_DIRS glx"
DRIVER_DIRS="dri"
- WINDOW_SYSTEM="dri"
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"
;;
osmesa)
DRIVER_DIRS="osmesa"
@@ -484,51 +530,12 @@ esac
AC_SUBST([SRC_DIRS])
AC_SUBST([GLU_DIRS])
AC_SUBST([DRIVER_DIRS])
-AC_SUBST([WINDOW_SYSTEM])
AC_SUBST([GALLIUM_DIRS])
+AC_SUBST([GALLIUM_TARGET_DIRS])
AC_SUBST([GALLIUM_WINSYS_DIRS])
-AC_SUBST([GALLIUM_WINSYS_DRM_DIRS])
AC_SUBST([GALLIUM_DRIVERS_DIRS])
AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
-
-dnl
-dnl User supplied program configuration
-dnl
-if test -d "$srcdir/progs/demos"; then
- default_demos=yes
-else
- default_demos=no
-fi
-AC_ARG_WITH([demos],
- [AS_HELP_STRING([--with-demos@<:@=DIRS...@:>@],
- [optional comma delimited demo directories to build
- @<:@default=auto if source available@:>@])],
- [with_demos="$withval"],
- [with_demos="$default_demos"])
-if test "x$with_demos" = x; then
- with_demos=no
-fi
-
-dnl If $with_demos is yes, directories will be added as libs available
-PROGRAM_DIRS=""
-case "$with_demos" in
-no) ;;
-yes)
- # If the driver isn't osmesa, we have libGL and can build xdemos
- if test "$mesa_driver" != osmesa; then
- PROGRAM_DIRS="xdemos"
- fi
- ;;
-*)
- # verify the requested demos directories exist
- demos=`IFS=,; echo $with_demos`
- for demo in $demos; do
- test -d "$srcdir/progs/$demo" || \
- AC_MSG_ERROR([Program directory '$demo' doesn't exist])
- done
- PROGRAM_DIRS="$demos"
- ;;
-esac
+AC_SUBST([MESA_LLVM])
dnl
dnl Find out if X is available. The variable have_x is set if libX11 is
@@ -601,8 +608,8 @@ xlib)
GL_PC_LIB_PRIV="$GL_LIB_DEPS"
GL_PC_CFLAGS="$X11_INCLUDES"
fi
- GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
- GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"
+ GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS"
+ GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS"
# if static, move the external libraries to the programs
# and empty the libraries for libGL
@@ -626,8 +633,15 @@ dri)
# find the DRI deps for libGL
if test "$x11_pkgconfig" = yes; then
+ dri_modules="x11 xext xdamage xfixes"
+
+ # add xf86vidmode if available
+ PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)
+ if test "$HAVE_XF86VIDMODE" = yes ; then
+ dri_modules="$dri_modules xxf86vm"
+ fi
+
# add xcb modules if necessary
- dri_modules="x11 xext xxf86vm xdamage xfixes"
if test "$enable_xcb" = yes; then
dri_modules="$dri_modules x11-xcb xcb-glx"
fi
@@ -655,6 +669,10 @@ dri)
# need DRM libs, -lpthread, etc.
GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+ GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+ GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+ GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+ GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
;;
osmesa)
# No libGL for osmesa
@@ -666,6 +684,18 @@ AC_SUBST([GL_PC_REQ_PRIV])
AC_SUBST([GL_PC_LIB_PRIV])
AC_SUBST([GL_PC_CFLAGS])
AC_SUBST([DRI_PC_REQ_PRIV])
+AC_SUBST([GLESv1_CM_LIB_DEPS])
+AC_SUBST([GLESv1_CM_PC_LIB_PRIV])
+AC_SUBST([GLESv2_LIB_DEPS])
+AC_SUBST([GLESv2_PC_LIB_PRIV])
+
+
+AC_SUBST([HAVE_XF86VIDMODE])
+
+PKG_CHECK_MODULES([LIBDRM_RADEON],
+ [libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED],
+ HAVE_LIBDRM_RADEON=yes,
+ HAVE_LIBDRM_RADEON=no)
dnl
dnl More X11 setup
@@ -699,7 +729,7 @@ AC_SUBST([DRI_DRIVER_SEARCH_DIR])
dnl Direct rendering or just indirect rendering
AC_ARG_ENABLE([driglx-direct],
[AS_HELP_STRING([--disable-driglx-direct],
- [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
+ [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])],
[driglx_direct="$enableval"],
[driglx_direct="yes"])
dnl Which drivers to build - default is chosen by platform
@@ -713,6 +743,51 @@ if test "x$with_dri_drivers" = x; then
with_dri_drivers=no
fi
+dnl Determine which APIs to support
+AC_ARG_ENABLE([opengl],
+ [AS_HELP_STRING([--disable-opengl],
+ [disable support for standard OpenGL API @<:@default=no@:>@])],
+ [enable_opengl="$enableval"],
+ [enable_opengl=yes])
+AC_ARG_ENABLE([gles1],
+ [AS_HELP_STRING([--enable-gles1],
+ [enable support for OpenGL ES 1.x API @<:@default=no@:>@])],
+ [enable_gles1="$enableval"],
+ [enable_gles1=no])
+AC_ARG_ENABLE([gles2],
+ [AS_HELP_STRING([--enable-gles2],
+ [enable support for OpenGL ES 2.x API @<:@default=no@:>@])],
+ [enable_gles2="$enableval"],
+ [enable_gles2=no])
+AC_ARG_ENABLE([gles-overlay],
+ [AS_HELP_STRING([--enable-gles-overlay],
+ [build separate OpenGL ES only libraries @<:@default=no@:>@])],
+ [enable_gles_overlay="$enableval"],
+ [enable_gles_overlay=no])
+
+API_DEFINES=""
+GLES_OVERLAY=0
+if test "x$enable_opengl" = xno; then
+ API_DEFINES="$API_DEFINES -DFEATURE_GL=0"
+else
+ API_DEFINES="$API_DEFINES -DFEATURE_GL=1"
+fi
+if test "x$enable_gles1" = xyes; then
+ API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"
+fi
+if test "x$enable_gles2" = xyes; then
+ API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"
+fi
+if test "x$enable_gles_overlay" = xyes -o \
+ "x$enable_gles1" = xyes -o "x$enable_gles2" = xyes; then
+ CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
+ if test "x$enable_gles_overlay" = xyes; then
+ GLES_OVERLAY=1
+ fi
+fi
+AC_SUBST([API_DEFINES])
+AC_SUBST([GLES_OVERLAY])
+
dnl If $with_dri_drivers is yes, directories will be added through
dnl platform checks
DRI_DIRS=""
@@ -826,7 +901,7 @@ if test "$mesa_driver" = dri; then
[AC_MSG_ERROR([Expat required for DRI.])])
# put all the necessary libs together
- DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
+ DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS $TALLOC_LIBS"
fi
AC_SUBST([DRI_DIRS])
AC_SUBST([EXPAT_INCLUDES])
@@ -834,18 +909,13 @@ AC_SUBST([DRI_LIB_DEPS])
case $DRI_DIRS in
*i915*|*i965*)
- PKG_CHECK_MODULES([INTEL], [libdrm_intel >= 2.4.19])
+ PKG_CHECK_MODULES([INTEL], [libdrm_intel >= 2.4.21])
;;
esac
case $DRI_DIRS in
*radeon*|*r200*|*r300*|*r600*)
- PKG_CHECK_MODULES([LIBDRM_RADEON],
- [libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED],
- HAVE_LIBDRM_RADEON=yes,
- HAVE_LIBDRM_RADEON=no)
-
- if test "$HAVE_LIBDRM_RADEON" = yes; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
fi
@@ -904,12 +974,12 @@ case "$DRIVER_DIRS" in
*osmesa*)
# only link libraries with osmesa if shared
if test "$enable_static" = no; then
- OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+ OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS"
else
OSMESA_LIB_DEPS=""
fi
OSMESA_MESA_DEPS=""
- OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+ OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS"
;;
esac
AC_SUBST([OSMESA_LIB_DEPS])
@@ -935,16 +1005,23 @@ if test "x$enable_egl" = xyes; then
EGL_DRIVERS_DIRS="glx"
fi
- # build egl_dri2 when xcb-dri2 is available
- PKG_CHECK_MODULES([EGL_DRI2], [x11-xcb xcb-dri2 xcb-xfixes libdrm],
- [have_xcb_dri2=yes],[have_xcb_dri2=no])
- if test "$have_xcb_dri2" = yes; then
- EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
- fi
- fi
+ if test "$mesa_driver" = dri; then
+ # build egl_dri2 when xcb-dri2 is available
+ PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],
+ [have_xcb_dri2=yes],[have_xcb_dri2=no])
+ PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
+ [have_libudev=yes],[have_libudev=no])
+
+ if test "$have_xcb_dri2" = yes; then
+ EGL_DRIVER_DRI2=dri2
+ DEFINES="$DEFINES -DHAVE_XCB_DRI2"
+ if test "$have_libudev" = yes; then
+ DEFINES="$DEFINES -DHAVE_LIBUDEV"
+ fi
+ fi
+ fi
- if test "$with_demos" = yes; then
- PROGRAM_DIRS="$PROGRAM_DIRS egl"
+ EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"
fi
fi
AC_SUBST([EGL_LIB_DEPS])
@@ -963,12 +1040,6 @@ if test "x$enable_glu" = xyes; then
case "$mesa_driver" in
osmesa)
- # If GLU is available and we have libOSMesa (not 16 or 32),
- # we can build the osdemos
- if test "$with_demos" = yes && test "$osmesa_bits" = 8; then
- PROGRAM_DIRS="$PROGRAM_DIRS osdemos"
- fi
-
# Link libGLU to libOSMesa instead of libGL
GLU_LIB_DEPS=""
GLU_PC_REQ="osmesa"
@@ -1102,10 +1173,6 @@ fi
if test "x$enable_glut" = xyes; then
SRC_DIRS="$SRC_DIRS glut/glx"
- GLUT_CFLAGS=""
- if test "x$GCC" = xyes; then
- GLUT_CFLAGS="-fexceptions"
- fi
if test "$x11_pkgconfig" = yes; then
PKG_CHECK_MODULES([GLUT],[x11 xmu xi])
GLUT_PC_REQ_PRIV="x11 xmu xi"
@@ -1116,14 +1183,12 @@ if test "x$enable_glut" = xyes; then
GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"
GLUT_PC_CFLAGS="$X11_INCLUDES"
fi
+ if test "x$GCC" = xyes; then
+ GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions"
+ fi
GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"
GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"
- # If glut is available, we can build most programs
- if test "$with_demos" = yes; then
- PROGRAM_DIRS="$PROGRAM_DIRS demos redbook samples glsl"
- fi
-
# If static, empty GLUT_LIB_DEPS and add libs for programs to link
if test "$enable_static" = no; then
GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)'
@@ -1170,7 +1235,21 @@ AC_ARG_ENABLE([gallium],
[enable_gallium="$enableval"],
[enable_gallium=yes])
if test "x$enable_gallium" = xyes; then
- SRC_DIRS="$SRC_DIRS gallium gallium/winsys"
+ SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
+ AC_CHECK_HEADER([udis86.h], [HAS_UDIS86="yes"],
+ [HAS_UDIS86="no"])
+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
+fi
+
+AC_SUBST([LLVM_CFLAGS])
+AC_SUBST([LLVM_LIBS])
+AC_SUBST([LLVM_LDFLAGS])
+AC_SUBST([LLVM_VERSION])
+
+VG_LIB_DEPS=""
+EGL_CLIENT_APIS='$(GL_LIB)'
+if test "x$enable_gles_overlay" = xyes; then
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)'
fi
dnl
@@ -1195,62 +1274,111 @@ yes)
;;
dri)
GALLIUM_STATE_TRACKERS_DIRS="dri"
+ HAVE_ST_DRI="yes"
if test "x$enable_egl" = xyes; then
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
+ HAVE_ST_EGL="yes"
fi
# Have only tested st/xorg on 1.6.0 servers
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED],
- HAVE_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",
- HAVE_XORG="no")
+ HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",
+ HAVE_ST_XORG="no")
;;
esac
;;
*)
# verify the requested state tracker exist
- state_trackers=`IFS=', '; echo $with_state_trackers`
- for tracker in $state_trackers; do
- test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
- AC_MSG_ERROR([state tracker '$tracker' doesn't exist])
-
+ state_trackers=""
+ _state_trackers=`IFS=', '; echo $with_state_trackers`
+ for tracker in $_state_trackers; do
case "$tracker" in
+ dri)
+ if test "x$mesa_driver" != xdri; then
+ AC_MSG_ERROR([cannot build dri state tracker without mesa driver set to dri])
+ fi
+ HAVE_ST_DRI="yes"
+ ;;
egl)
if test "x$enable_egl" != xyes; then
AC_MSG_ERROR([cannot build egl state tracker without EGL library])
fi
+ HAVE_ST_EGL="yes"
;;
xorg)
+ PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])
PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])
PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])
- HAVE_XORG="yes"
+ HAVE_ST_XORG="yes"
;;
es)
- # mesa/es is required to build es state tracker
- CORE_DIRS="$CORE_DIRS mesa/es"
+ AC_MSG_WARN([state tracker 'es' has been replaced by --enable-gles-overlay])
+
+ if test "x$enable_gles_overlay" != xyes; then
+ if test "x$enable_gles1" != xyes -a "x$enable_gles2" != xyes; then
+ CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
+ fi
+ GLES_OVERLAY=1
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)'
+ fi
+ tracker=""
+ ;;
+ vega)
+ CORE_DIRS="$CORE_DIRS mapi/vgapi"
+ VG_LIB_DEPS="$VG_LIB_DEPS -lpthread"
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'
;;
esac
+
+ if test -n "$tracker"; then
+ test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
+ AC_MSG_ERROR([state tracker '$tracker' doesn't exist])
+ if test -n "$state_trackers"; then
+ state_trackers="$state_trackers $tracker"
+ else
+ state_trackers="$tracker"
+ fi
+ fi
done
GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
;;
esac
-if test "x$HAVE_XORG" = xyes; then
+AC_SUBST([VG_LIB_DEPS])
+AC_SUBST([EGL_CLIENT_APIS])
+
+if test "x$HAVE_ST_EGL" = xyes; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"
+ # define GLX_DIRECT_RENDERING even when the driver is not dri
+ if test "x$mesa_driver" != xdri -a "x$driglx_direct" = xyes; then
+ DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+ fi
+fi
+
+if test "x$HAVE_ST_XORG" = xyes; then
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
HAVE_XEXTPROTO_71="no")
fi
+AC_ARG_WITH([egl-platforms],
+ [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
+ [comma delimited native platforms libEGL supports, e.g.
+ "x11,drm" @<:@default=auto@:>@])],
+ [with_egl_platforms="$withval"],
+ [with_egl_platforms=yes])
AC_ARG_WITH([egl-displays],
[AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],
- [comma delimited native displays libEGL supports, e.g.
- "x11,kms" @<:@default=auto@:>@])],
- [with_egl_displays="$withval"],
- [with_egl_displays=yes])
+ [DEPRECATED. Use --with-egl-platforms instead])],
+ [with_egl_platforms="$withval"])
-EGL_DISPLAYS=""
-case "$with_egl_displays" in
+EGL_PLATFORMS=""
+case "$with_egl_platforms" in
yes)
if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then
- EGL_DISPLAYS="x11"
+ EGL_PLATFORMS="x11"
+ if test "$mesa_driver" = dri; then
+ EGL_PLATFORMS="$EGL_PLATFORMS drm"
+ fi
fi
;;
*)
@@ -1258,15 +1386,18 @@ yes)
AC_MSG_ERROR([cannot build egl state tracker without EGL library])
fi
# verify the requested driver directories exist
- egl_displays=`IFS=', '; echo $with_egl_displays`
- for dpy in $egl_displays; do
- test -d "$srcdir/src/gallium/state_trackers/egl/$dpy" || \
- AC_MSG_ERROR([EGL display '$dpy' does't exist])
+ egl_platforms=`IFS=', '; echo $with_egl_platforms`
+ for plat in $egl_platforms; do
+ test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \
+ AC_MSG_ERROR([EGL platform '$plat' does't exist])
+ if test "$plat" = "fbdev"; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"
+ fi
done
- EGL_DISPLAYS="$egl_displays"
+ EGL_PLATFORMS="$egl_platforms"
;;
esac
-AC_SUBST([EGL_DISPLAYS])
+AC_SUBST([EGL_PLATFORMS])
AC_ARG_WITH([egl-driver-dir],
[AS_HELP_STRING([--with-egl-driver-dir=DIR],
@@ -1297,6 +1428,51 @@ AC_ARG_WITH([max-height],
[AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]
)
+dnl
+dnl Gallium LLVM
+dnl
+AC_ARG_ENABLE([gallium-llvm],
+ [AS_HELP_STRING([--enable-gallium-llvm],
+ [build gallium LLVM support @<:@default=disabled@:>@])],
+ [enable_gallium_llvm="$enableval"],
+ [enable_gallium_llvm=auto])
+if test "x$enable_gallium_llvm" = xyes; then
+ if test "x$LLVM_CONFIG" != xno; then
+ LLVM_VERSION=`$LLVM_CONFIG --version`
+ LLVM_CFLAGS=`$LLVM_CONFIG --cflags`
+ LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
+
+ if test "x$HAS_UDIS86" != xno; then
+ LLVM_LIBS="$LLVM_LIBS -ludis86"
+ DEFINES="$DEFINES -DHAVE_UDIS86"
+ fi
+ LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+ DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
+ MESA_LLVM=1
+ else
+ MESA_LLVM=0
+ fi
+else
+ MESA_LLVM=0
+fi
+
+dnl
+dnl Gallium helper functions
+dnl
+gallium_check_st() {
+ if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1"
+ fi
+ if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"
+ fi
+ if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"
+ fi
+}
+
+
dnl
dnl Gallium SVGA configuration
dnl
@@ -1306,40 +1482,84 @@ AC_ARG_ENABLE([gallium-svga],
[enable_gallium_svga="$enableval"],
[enable_gallium_svga=auto])
if test "x$enable_gallium_svga" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS vmware"
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
+ gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"
elif test "x$enable_gallium_svga" = xauto; then
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
fi
dnl
-dnl Gallium Intel configuration
+dnl Gallium i915 configuration
dnl
-AC_ARG_ENABLE([gallium-intel],
- [AS_HELP_STRING([--enable-gallium-intel],
- [build gallium intel @<:@default=disabled@:>@])],
- [enable_gallium_intel="$enableval"],
- [enable_gallium_intel=auto])
-if test "x$enable_gallium_intel" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel i965"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
-elif test "x$enable_gallium_intel" = xauto; then
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
+AC_ARG_ENABLE([gallium-i915],
+ [AS_HELP_STRING([--enable-gallium-i915],
+ [build gallium i915 @<:@default=disabled@:>@])],
+ [enable_gallium_i915="$enableval"],
+ [enable_gallium_i915=auto])
+if test "x$enable_gallium_i915" = xyes; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+ gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
+elif test "x$enable_gallium_i915" = xauto; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
fi
dnl
-dnl Gallium Radeon configuration
+dnl Gallium i965 configuration
+dnl
+AC_ARG_ENABLE([gallium-i965],
+ [AS_HELP_STRING([--enable-gallium-i965],
+ [build gallium i965 @<:@default=disabled@:>@])],
+ [enable_gallium_i965="$enableval"],
+ [enable_gallium_i965=auto])
+if test "x$enable_gallium_i965" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
+ gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
+elif test "x$enable_gallium_i965" = xauto; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
+fi
+
+dnl
+dnl Gallium Radeon r300g configuration
dnl
AC_ARG_ENABLE([gallium-radeon],
[AS_HELP_STRING([--enable-gallium-radeon],
[build gallium radeon @<:@default=disabled@:>@])],
[enable_gallium_radeon="$enableval"],
[enable_gallium_radeon=auto])
+if test "x$enable_gallium_radeon" = xauto; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ gallium_check_st "radeon/drm" "dri-r300"
+ else
+ AC_MSG_WARN([libdrm_radeon is missing, not building gallium-radeon (r300)])
+ fi
+fi
if test "x$enable_gallium_radeon" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS radeon"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-elif test "x$enable_gallium_radeon" = xauto; then
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+ else
+ AC_MSG_ERROR([libdrm_radeon is missing, cannot build gallium-radeon (r300)])
+ fi
+fi
+
+dnl
+dnl Gallium Radeon r600g configuration
+dnl
+AC_ARG_ENABLE([gallium-r600],
+ [AS_HELP_STRING([--enable-gallium-r600],
+ [build gallium radeon @<:@default=disabled@:>@])],
+ [enable_gallium_r600="$enableval"],
+ [enable_gallium_r600=auto])
+if test "x$enable_gallium_r600" = xyes; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+ gallium_check_st "r600/drm" "dri-r600"
+ else
+ AC_MSG_ERROR([libdrm_radeon is missing, cannot build gallium-r600])
+ fi
fi
dnl
@@ -1351,8 +1571,8 @@ AC_ARG_ENABLE([gallium-nouveau],
[enable_gallium_nouveau="$enableval"],
[enable_gallium_nouveau=no])
if test "x$enable_gallium_nouveau" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS nouveau"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv30 nv40 nv50"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50"
+ gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
fi
dnl
@@ -1360,11 +1580,13 @@ dnl Gallium swrast configuration
dnl
AC_ARG_ENABLE([gallium-swrast],
[AS_HELP_STRING([--enable-gallium-swrast],
- [build gallium swrast @<:@default=disabled@:>@])],
+ [build gallium swrast @<:@default=auto@:>@])],
[enable_gallium_swrast="$enableval"],
[enable_gallium_swrast=auto])
-if test "x$enable_gallium_swrast" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS swrast"
+if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xauto; then
+ if test "x$HAVE_ST_DRI" = xyes; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
+ fi
fi
dnl prepend CORE_DIRS to SRC_DIRS
@@ -1416,14 +1638,26 @@ fi
fi
echo " Use XCB: $enable_xcb"
+echo ""
+if test "x$MESA_LLVM" = x1; then
+ echo " llvm: yes"
+ echo " llvm-config: $LLVM_CONFIG"
+ echo " llvm-version: $LLVM_VERSION"
+else
+ echo " llvm: no"
+fi
+
echo ""
if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
echo " Gallium: yes"
echo " Gallium dirs: $GALLIUM_DIRS"
+ echo " Target dirs: $GALLIUM_TARGET_DIRS"
echo " Winsys dirs: $GALLIUM_WINSYS_DIRS"
- echo " Winsys drm dirs:$GALLIUM_WINSYS_DRM_DIRS"
echo " Driver dirs: $GALLIUM_DRIVERS_DIRS"
echo " Trackers dirs: $GALLIUM_STATE_TRACKERS_DIRS"
+ if test "x$HAVE_ST_EGL" = xyes; then
+ echo " EGL client APIs: $EGL_CLIENT_APIS"
+ fi
else
echo " Gallium: no"
fi
@@ -1434,6 +1668,7 @@ echo " Shared libs: $enable_shared"
echo " Static libs: $enable_static"
if test "$enable_egl" = yes; then
echo " EGL: $EGL_DRIVERS_DIRS"
+ echo " EGL platforms: $EGL_PLATFORMS"
else
echo " EGL: no"
fi
@@ -1441,15 +1676,6 @@ echo " GLU: $enable_glu"
echo " GLw: $enable_glw (Motif: $enable_motif)"
echo " glut: $enable_glut"
-dnl Programs
-# cleanup the programs var for display
-program_dirs=`echo $PROGRAM_DIRS | $SED 's/^ *//;s/ */ /;s/ *$//'`
-if test "x$program_dirs" = x; then
- echo " Demos: no"
-else
- echo " Demos: $program_dirs"
-fi
-
dnl Compiler options
# cleanup the CFLAGS/CXXFLAGS/DEFINES vars
cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
diff --git a/mesalib/docs/MESA_drm_image.spec b/mesalib/docs/MESA_drm_image.spec
new file mode 100644
index 000000000..118501c3d
--- /dev/null
+++ b/mesalib/docs/MESA_drm_image.spec
@@ -0,0 +1,149 @@
+Name
+
+ MESA_drm_image
+
+Name Strings
+
+ EGL_MESA_drm_image
+
+Contact
+
+ Kristian Høgsberg
+
+Status
+
+ Proposal
+
+Version
+
+ Version 2, August 25, 2010
+
+Number
+
+ EGL Extension #not assigned
+
+Dependencies
+
+ Reguires EGL 1.4 or later. This extension is written against the
+ wording of the EGL 1.4 specification.
+
+ EGL_KHR_base_image is required.
+
+Overview
+
+ This extension provides entry points for integrating EGLImage with the
+ Linux DRM mode setting and memory management drivers. The extension
+ lets applications create EGLImages without a client API resource and
+ lets the application get the DRM buffer handles.
+
+IP Status
+
+ Open-source; freely implementable.
+
+New Procedures and Functions
+
+ EGLImageKHR eglCreateDRMImageMESA(EGLDisplay dpy,
+ const EGLint *attrib_list);
+
+ EGLBoolean eglExportDRMImageMESA(EGLDisplay dpy,
+ EGLImageKHR image,
+ EGLint *name,
+ EGLint *handle,
+ EGLint *stride);
+
+New Tokens
+
+ Accepted in the parameter of eglCreateDRMImageMESA:
+
+ EGL_DRM_BUFFER_FORMAT_MESA 0x31D0
+ EGL_DRM_BUFFER_USE_MESA 0x31D1
+
+ Accepted as values for the EGL_IMAGE_FORMAT_MESA attribute:
+
+ EGL_DRM_BUFFER_FORMAT_ARGB32_MESA 0x31D2
+
+ Bits accepted in EGL_DRM_BUFFER_USE_MESA:
+
+ EGL_DRM_BUFFER_USE_SCANOUT_MESA 0x0001
+ EGL_DRM_BUFFER_USE_SHARE_MESA 0x0002
+
+ Accepted in the parameter of eglCreateImageKHR:
+
+ EGL_DRM_BUFFER_MESA 0x31D3
+
+ Use when importing drm buffer:
+
+ EGL_DRM_BUFFER_STRIDE_MESA 0x31D4
+ EGL_DRM_BUFFER_FORMAT_MESA 0x31D0
+
+Additions to the EGL 1.4 Specification:
+
+ To create a DRM EGLImage, call
+
+ EGLImageKHR eglCreateDRMImageMESA(EGLDisplay dpy,
+ const EGLint *attrib_list);
+
+ In the attribute list, pass EGL_WIDTH, EGL_EIGHT and format and
+ use in the attrib list using EGL_DRM_BUFFER_FORMAT_MESA and
+ EGL_DRM_BUFFER_USE_MESA. The only format specified by this
+ extension is EGL_DRM_BUFFER_FORMAT_ARGB32_MESA, where each pixel
+ is a CPU-endian, 32-bit quantity, with alpha in the upper 8 bits,
+ then red, then green, then blue. The bit values accepted by
+ EGL_DRM_BUFFER_USE_MESA are EGL_DRM_BUFFER_USE_SCANOUT_MESA and
+ EGL_DRM_BUFFER_USE_SHARE_MESA. EGL_DRM_BUFFER_USE_SCANOUT_MESA
+ requests that the created EGLImage should be usable as a scanout
+ buffer with the DRM kernel modesetting API. The
+ EGL_DRM_BUFFER_USE_SHARE_MESA bit requests that the EGLImage can
+ be shared with other processes by passing the underlying DRM
+ buffer name.
+
+ To create a process local handle or a global DRM name for a
+ buffer, call
+
+ EGLBoolean eglExportDRMImageMESA(EGLDisplay dpy,
+ EGLImageKHR image,
+ EGLint *name,
+ EGLint *handle,
+ EGLint *stride);
+
+ If is non-NULL, a global name is assigned to the image and
+ written to , the handle (local to the DRM file descriptor,
+ for use with DRM kernel modesetting API) is written to if
+ non-NULL and the stride (in bytes) is written to , if
+ non-NULL.
+
+ Import a shared buffer by calling eglCreateImageKHR with
+ EGL_DRM_BUFFER_MESA as the target, using EGL_WIDTH, EGL_HEIGHT,
+ EGL_DRM_BUFFER_FORMAT_MESA, EGL_DRM_BUFFER_STRIDE_MESA
+ in the attrib list.
+
+Issues
+
+ 1. Why don't we use eglCreateImageKHR with a target that
+ indicates that we want to create an EGLImage from scratch?
+
+ RESOLVED: The eglCreateImageKHR entry point is reserved for
+ creating an EGLImage from an already existing client API
+ resource. This is fine when we're creating the EGLImage from
+ an existing DRM buffer name, it doesn't seem right to overload
+ the function to also allocate the underlying resource.
+
+ 2. Why don't we use an eglQueryImageMESA type functions for
+ querying the DRM EGLImage attributes (name, handle, and stride)?
+
+ RESOLVED: The eglQueryImage function has been proposed often,
+ but it goes against the EGLImage design. EGLImages are opaque
+ handles to a 2D array of pixels, which can be passed between
+ client APIs. By referenceing an EGLImage in a client API, the
+ EGLImage target (a texture, a renderbuffer or such) can be
+ used to query the attributes of the EGLImage. We don't have a
+ full client API for creating and querying DRM buffers, though,
+ so we use a new EGL extension entry point instead.
+
+Revision History
+
+ Version 1, June 3, 2010
+ Initial draft (Kristian Høgsberg)
+ Version 2, August 25, 2010
+ Flesh out the extension a bit, add final EGL tokens, capture
+ some of the original discussion in the issues section.
diff --git a/mesalib/docs/contents.html b/mesalib/docs/contents.html
index cca20ecaa..cf1661e4e 100644
--- a/mesalib/docs/contents.html
+++ b/mesalib/docs/contents.html
@@ -69,7 +69,6 @@ a:visited {
SourceForge homepage
Source Code Repository
Source Code Tree
-DRI Memory Management
SGI's GLU
Utilities
Help Wanted
diff --git a/mesalib/docs/developers.html b/mesalib/docs/developers.html
index 410f1ac5e..8960e7cb4 100644
--- a/mesalib/docs/developers.html
+++ b/mesalib/docs/developers.html
@@ -12,12 +12,14 @@
Both professional and volunteer developers contribute to Mesa.
-Tungsten Graphics
+VMware
employs several of the main Mesa developers including Brian Paul
and Keith Whitwell.
-Much of the on-going work in Mesa is done through Tungsten Graphics engineering
-contracts.
-Prominent examples of this work includes:
+
+
+
+In the past, Tungsten Graphics contracts implemented many Mesa features
+including:
- DRI drivers for Intel i965, i945, i915 and other chips
@@ -29,23 +31,19 @@ Prominent examples of this work includes:
Other companies including
Intel
-and IBM also actively contribute to the project.
+and RedHat also actively contribute to the project.
+Intel has recently contributed the new GLSL compiler in Mesa 7.9.
-Volunteers have made significant contributions to all parts of Mesa, including
-complete device drivers.
+LunarG can be contacted
+for custom Mesa / 3D graphics development.
-
-Custom Development
-Contact
-Tungsten Graphics
-for information about custom development in Mesa, OpenGL, X and other
-graphics technologies.
+Volunteers have made significant contributions to all parts of Mesa, including
+complete device drivers.
-