[X2Go-Commits] [vcxsrv] 13/24: Merge remote-tracking branch 'origin/released'

git-admin at x2go.org git-admin at x2go.org
Sun May 3 23:21:42 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 1.17.0.0
in repository vcxsrv.

commit c646056120fe14e4c4ccf81bac5d78d61225a8e8
Merge: 87e58a9 8574eba
Author: marha <marha at users.sourceforge.net>
Date:   Thu Mar 5 23:40:39 2015 +0100

    Merge remote-tracking branch 'origin/released'
    
    Conflicts:
    	mesalib/src/mesa/drivers/dri/swrast/swrast.c
    	mesalib/src/mesa/main/.gitignore
    	mesalib/src/mesa/main/queryobj.c

 fontconfig/Makefile.am                             |    2 +-
 fontconfig/configure.ac                            |   38 +-
 fontconfig/fc-blanks/Makefile.am                   |   40 +
 fontconfig/fc-blanks/fc-blanks.py                  |  132 +
 fontconfig/fc-blanks/fcblanks.h                    | 4223 ++++++++++++++++++++
 fontconfig/fc-blanks/fcblanks.tmpl.h               |   25 +
 fontconfig/fc-blanks/makefile                      |    7 +
 fontconfig/fonts.conf.in                           |   68 -
 fontconfig/src/fcarch.c                            |    3 +-
 fontconfig/src/fcblanks.c                          |   28 +-
 fontconfig/src/fccfg.c                             |   12 +-
 fontconfig/src/fcfreetype.c                        |  355 +-
 fontconfig/src/fclist.c                            |    2 +-
 fontconfig/src/fcstat.c                            |   82 +-
 fontconfig/src/fcxml.c                             |    4 +
 fontconfig/src/makefile                            |    1 +
 libxcb/src/makefile                                |    1 +
 libxcb/src/xcb_in.c                                |    1 -
 mesalib/configure.ac                               |   49 +-
 mesalib/docs/GL3.txt                               |    6 +-
 mesalib/docs/README.WIN32                          |    4 +-
 mesalib/docs/contents.html                         |    1 -
 mesalib/docs/egl.html                              |   36 +-
 mesalib/docs/index.html                            |    6 +
 mesalib/docs/install.html                          |    5 +-
 mesalib/docs/openvg.html                           |   59 -
 mesalib/docs/relnotes.html                         |    1 +
 mesalib/docs/relnotes/10.4.5.html                  |  114 +
 mesalib/docs/relnotes/10.6.0.html                  |    7 +-
 mesalib/docs/relnotes/7.6.html                     |    2 +-
 mesalib/docs/sourcetree.html                       |    2 -
 mesalib/include/GL/wmesa.h                         |  140 -
 mesalib/include/VG/openvg.h                        |  746 ----
 mesalib/include/VG/vgext.h                         |  233 --
 mesalib/include/VG/vgplatform.h                    |   92 -
 mesalib/include/VG/vgu.h                           |  131 -
 .../st_cb_queryobj.h => include/c99_alloca.h}      |   46 +-
 mesalib/include/c99_compat.h                       |   11 +-
 mesalib/include/c99_math.h                         |  164 +
 mesalib/install-lib-links.mk                       |    1 +
 mesalib/scons/gallium.py                           |   74 +-
 mesalib/src/SConscript                             |    2 -
 mesalib/src/gallium/Android.mk                     |    5 -
 mesalib/src/gallium/Makefile.am                    |    8 -
 mesalib/src/gallium/SConscript                     |    8 -
 mesalib/src/gallium/auxiliary/Makefile.am          |    7 +-
 mesalib/src/gallium/auxiliary/SConscript           |    4 +
 mesalib/src/gallium/auxiliary/util/u_debug.c       |  134 +-
 mesalib/src/gallium/auxiliary/util/u_debug.h       |    6 +
 .../src/gallium/auxiliary/util/u_format_other.c    |   80 +-
 mesalib/src/gallium/auxiliary/util/u_format_yuv.c  |  192 +-
 mesalib/src/gallium/auxiliary/util/u_format_zs.c   |  160 +-
 mesalib/src/gallium/auxiliary/util/u_math.h        |  171 +-
 mesalib/src/gallium/auxiliary/util/u_sse.h         |   27 -
 mesalib/src/glsl/Makefile.am                       |    8 +-
 mesalib/src/glsl/Makefile.sources                  |    1 +
 mesalib/src/glsl/SConscript                        |    2 +
 mesalib/src/glsl/ast_array_index.cpp               |    4 +-
 mesalib/src/glsl/builtin_functions.cpp             |    2 +-
 mesalib/src/glsl/builtin_variables.cpp             |    2 +-
 mesalib/src/glsl/glcpp/pp.c                        |    1 -
 mesalib/src/glsl/glsl_parser.yy                    |    4 +-
 mesalib/src/glsl/glsl_parser_extras.cpp            |    9 +-
 mesalib/src/glsl/ir.cpp                            |    6 +-
 mesalib/src/glsl/ir_clone.cpp                      |    2 +-
 mesalib/src/glsl/ir_constant_expression.cpp        |    2 +-
 mesalib/src/glsl/ir_optimization.h                 |    1 +
 mesalib/src/glsl/ir_rvalue_visitor.cpp             |   19 +
 mesalib/src/glsl/ir_rvalue_visitor.h               |    3 +
 mesalib/src/glsl/ir_validate.cpp                   |   15 +
 mesalib/src/glsl/link_interface_blocks.cpp         |   74 +-
 mesalib/src/glsl/linker.cpp                        |   93 +-
 mesalib/src/glsl/linker.h                          |    5 +
 mesalib/src/glsl/loop_controls.cpp                 |    2 +-
 mesalib/src/glsl/lower_discard_flow.cpp            |    9 +-
 mesalib/src/glsl/lower_instructions.cpp            |    2 +-
 mesalib/src/glsl/lower_packed_varyings.cpp         |  117 +-
 mesalib/src/glsl/nir/glsl_to_nir.cpp               |   10 +-
 mesalib/src/glsl/nir/nir.c                         |    1 +
 mesalib/src/glsl/nir/nir.h                         |   11 +-
 mesalib/src/glsl/nir/nir_from_ssa.c                |   29 +-
 mesalib/src/glsl/nir/nir_intrinsics.h              |    2 +
 mesalib/src/glsl/nir/nir_live_variables.c          |    5 +-
 mesalib/src/glsl/nir/nir_lower_vars_to_ssa.c       |   11 +-
 mesalib/src/glsl/nir/nir_opt_copy_propagate.c      |   45 +-
 mesalib/src/glsl/nir/nir_opt_gcm.c                 |    4 +
 .../st_cb_queryobj.h => glsl/nir/nir_vla.h}        |   57 +-
 mesalib/src/glsl/opt_algebraic.cpp                 |   76 +-
 mesalib/src/glsl/opt_conditional_discard.cpp       |   81 +
 mesalib/src/glsl/opt_constant_folding.cpp          |   24 +
 mesalib/src/glsl/s_expression.cpp                  |    1 +
 mesalib/src/glsl/s_expression.h                    |    4 +-
 mesalib/src/glsl/standalone_scaffolding.cpp        |    1 +
 mesalib/src/loader/Makefile.am                     |    1 +
 mesalib/src/loader/SConscript                      |    2 +
 mesalib/src/mapi/Makefile.am                       |   15 +-
 mesalib/src/mapi/Makefile.sources                  |    5 +-
 mesalib/src/mapi/entry.c                           |    6 +-
 mesalib/src/mapi/entry.h                           |    1 -
 mesalib/src/mapi/entry_x86-64_tls.h                |    3 +-
 mesalib/src/mapi/entry_x86_tls.h                   |    3 +-
 mesalib/src/mapi/entry_x86_tsd.h                   |    1 -
 mesalib/src/mapi/glapi/SConscript                  |    3 +
 mesalib/src/mapi/glapi/gen/gl_enums.py             |    4 +-
 mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py        |    6 +-
 mesalib/src/mapi/glapi/gen/gl_x86_asm.py           |   14 +-
 mesalib/src/mapi/glapi/glapi.h                     |   15 +-
 mesalib/src/mapi/glapi/glapi_entrypoint.c          |    9 +-
 mesalib/src/mapi/glapi/glapi_priv.h                |    4 +-
 mesalib/src/mapi/mapi.c                            |    1 -
 mesalib/src/mapi/mapi.h                            |    2 -
 mesalib/src/mapi/mapi_abi.py                       |   20 +-
 mesalib/src/mapi/stub.c                            |   16 +-
 mesalib/src/mapi/table.h                           |   10 +-
 mesalib/src/mapi/u_compiler.h                      |   33 -
 mesalib/src/mapi/u_current.c                       |   89 +-
 mesalib/src/mapi/u_current.h                       |   10 +-
 mesalib/src/mapi/u_execmem.c                       |    4 +-
 mesalib/src/mapi/u_macros.h                        |   12 -
 mesalib/src/mapi/u_thread.h                        |  156 -
 mesalib/src/mesa/Android.gen.mk                    |    2 +-
 mesalib/src/mesa/Makefile.am                       |   19 +-
 mesalib/src/mesa/Makefile.sources                  |    2 +
 mesalib/src/mesa/SConscript                        |    4 +-
 mesalib/src/mesa/drivers/SConscript                |    3 -
 mesalib/src/mesa/drivers/common/driverfuncs.h      |    7 +
 mesalib/src/mesa/drivers/common/meta.c             |   12 +-
 mesalib/src/mesa/drivers/common/meta_blit.c        |    6 +-
 .../src/mesa/drivers/common/meta_tex_subimage.c    |   73 +-
 mesalib/src/mesa/drivers/dri/common/utils.c        |    2 +
 mesalib/src/mesa/drivers/dri/common/xmlconfig.c    |    3 +
 .../mesa/drivers/dri/common/xmlpool/Makefile.am    |    2 +-
 mesalib/src/mesa/drivers/dri/common/xmlpool/ca.po  |   52 +-
 mesalib/src/mesa/drivers/dri/common/xmlpool/es.po  |   26 +-
 mesalib/src/mesa/drivers/dri/swrast/swrast.c       |    5 +-
 mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h  |   10 +-
 mesalib/src/mesa/drivers/windows/gdi/SConscript    |   40 -
 mesalib/src/mesa/drivers/windows/gdi/colors.h      |   29 -
 mesalib/src/mesa/drivers/windows/gdi/mesa.def      |  385 --
 mesalib/src/mesa/drivers/windows/gdi/wgl.c         |  689 ----
 mesalib/src/mesa/drivers/windows/gdi/wmesa.c       |  791 ----
 mesalib/src/mesa/drivers/windows/gdi/wmesadef.h    |   43 -
 mesalib/src/mesa/main/.gitignore                   |    4 +-
 mesalib/src/mesa/main/api_arrayelt.c               |    6 +-
 mesalib/src/mesa/main/api_exec.h                   |    7 +
 mesalib/src/mesa/main/api_loopback.h               |    8 +-
 mesalib/src/mesa/main/arbprogram.c                 |   12 +-
 mesalib/src/mesa/main/arrayobj.c                   |   16 +-
 mesalib/src/mesa/main/atifragshader.c              |    2 +-
 mesalib/src/mesa/main/atifragshader.h              |    3 +-
 mesalib/src/mesa/main/attrib.c                     |    2 +-
 mesalib/src/mesa/main/attrib.h                     |    1 -
 mesalib/src/mesa/main/blend.c                      |    4 +-
 mesalib/src/mesa/main/blit.c                       |    5 +-
 mesalib/src/mesa/main/blit.h                       |    1 -
 mesalib/src/mesa/main/bufferobj.c                  |   58 +-
 mesalib/src/mesa/main/buffers.c                    |    4 +-
 mesalib/src/mesa/main/clear.c                      |    2 +-
 mesalib/src/mesa/main/colortab.h                   |    2 -
 mesalib/src/mesa/main/compiler.h                   |  192 -
 mesalib/src/mesa/main/condrender.c                 |    4 +-
 mesalib/src/mesa/main/context.c                    |   11 +-
 mesalib/src/mesa/main/convolve.h                   |    2 +-
 mesalib/src/mesa/main/cpuinfo.c                    |    2 +-
 mesalib/src/mesa/main/dd.h                         |    2 +-
 mesalib/src/mesa/main/debug.c                      |   14 +-
 mesalib/src/mesa/main/dlist.c                      |   21 +-
 mesalib/src/mesa/main/dlist.h                      |    2 +-
 mesalib/src/mesa/main/drawpix.c                    |    6 +-
 mesalib/src/mesa/main/drawpix.h                    |    4 +-
 mesalib/src/mesa/main/drawtex.c                    |    2 +-
 mesalib/src/mesa/main/enable.c                     |    2 +-
 mesalib/src/mesa/main/errors.c                     |   12 +-
 mesalib/src/mesa/main/es1_conversion.c             |   16 +-
 mesalib/src/mesa/main/eval.c                       |   10 +-
 mesalib/src/mesa/main/execmem.c                    |    1 +
 mesalib/src/mesa/main/fbobject.c                   |   38 +-
 mesalib/src/mesa/main/ffvertex_prog.c              |    6 +-
 mesalib/src/mesa/main/format_unpack.py             |    8 +-
 mesalib/src/mesa/main/formats.c                    |    8 +-
 mesalib/src/mesa/main/framebuffer.c                |   22 +-
 mesalib/src/mesa/main/get.c                        |   16 +-
 mesalib/src/mesa/main/hash.c                       |   10 +-
 mesalib/src/mesa/main/histogram.h                  |    3 +-
 mesalib/src/mesa/main/image.c                      |   74 +-
 mesalib/src/mesa/main/imports.c                    |    9 +-
 mesalib/src/mesa/main/imports.h                    |  111 +-
 mesalib/src/mesa/main/light.c                      |   23 +-
 mesalib/src/mesa/main/macros.h                     |   40 +-
 mesalib/src/mesa/main/matrix.c                     |   10 +-
 mesalib/src/mesa/main/mipmap.c                     |   20 +-
 mesalib/src/mesa/main/mtypes.h                     |    1 +
 mesalib/src/mesa/main/multisample.c                |    7 +-
 mesalib/src/mesa/main/pack.c                       |   23 +-
 mesalib/src/mesa/main/pbo.c                        |    8 +-
 mesalib/src/mesa/main/pipelineobj.c                |    6 +-
 mesalib/src/mesa/main/pixel.h                      |    2 -
 mesalib/src/mesa/main/points.c                     |    4 +-
 mesalib/src/mesa/main/queryobj.c                   |   31 +-
 mesalib/src/mesa/main/rastpos.c                    |    4 +-
 mesalib/src/mesa/main/rastpos.h                    |    3 +-
 mesalib/src/mesa/main/readpix.c                    |   13 +-
 mesalib/src/mesa/main/remap.c                      |    4 +-
 mesalib/src/mesa/main/remap.h                      |    2 -
 mesalib/src/mesa/main/renderbuffer.c               |    2 +-
 mesalib/src/mesa/main/samplerobj.c                 |    6 +-
 mesalib/src/mesa/main/shaderapi.c                  |   40 +-
 mesalib/src/mesa/main/shaderobj.c                  |    4 +-
 mesalib/src/mesa/main/shaderobj.h                  |    2 +-
 mesalib/src/mesa/main/shared.c                     |    8 +-
 mesalib/src/mesa/main/state.c                      |    2 +-
 mesalib/src/mesa/main/stencil.h                    |    1 +
 mesalib/src/mesa/main/texcompress.c                |    4 +-
 mesalib/src/mesa/main/texcompress_bptc.c           |    4 +-
 mesalib/src/mesa/main/texcompress_cpal.c           |    3 +-
 mesalib/src/mesa/main/texcompress_etc.c            |   22 +-
 mesalib/src/mesa/main/texcompress_fxt1.c           |   14 +-
 mesalib/src/mesa/main/texcompress_rgtc.c           |    8 +-
 mesalib/src/mesa/main/texcompress_s3tc.c           |    8 +-
 mesalib/src/mesa/main/texcompress_s3tc.h           |    1 -
 mesalib/src/mesa/main/texformat.c                  |    8 +-
 mesalib/src/mesa/main/texgen.h                     |    1 -
 mesalib/src/mesa/main/texgetimage.c                |    3 +-
 mesalib/src/mesa/main/teximage.c                   |  211 +-
 mesalib/src/mesa/main/teximage.h                   |    3 +
 mesalib/src/mesa/main/texobj.c                     |   15 +-
 mesalib/src/mesa/main/texparam.c                   |    6 +-
 mesalib/src/mesa/main/texstate.c                   |   32 +-
 mesalib/src/mesa/main/texstate.h                   |    2 +-
 mesalib/src/mesa/main/texstorage.c                 |    2 +-
 mesalib/src/mesa/main/texstore.c                   |   58 +-
 mesalib/src/mesa/main/transformfeedback.c          |   10 +-
 mesalib/src/mesa/main/uniform_query.cpp            |    2 +-
 mesalib/src/mesa/main/uniforms.c                   |    4 +-
 mesalib/src/mesa/main/varray.c                     |   19 +-
 mesalib/src/mesa/main/version.c                    |    1 +
 mesalib/src/mesa/main/vtxfmt.h                     |    9 +-
 mesalib/src/mesa/math/m_debug_norm.c               |    5 +-
 mesalib/src/mesa/math/m_debug_util.h               |    9 +-
 mesalib/src/mesa/math/m_debug_xform.c              |    4 +-
 mesalib/src/mesa/math/m_matrix.c                   |   21 +-
 mesalib/src/mesa/math/m_norm_tmp.h                 |    6 +-
 mesalib/src/mesa/math/m_trans_tmp.h                |   84 +-
 mesalib/src/mesa/math/m_translate.c                |    6 -
 mesalib/src/mesa/math/m_translate.h                |    1 -
 mesalib/src/mesa/math/m_vector.c                   |    1 +
 mesalib/src/mesa/math/m_xform.c                    |    1 +
 mesalib/src/mesa/math/m_xform.h                    |    2 +-
 mesalib/src/mesa/program/arbprogparse.c            |    4 +-
 mesalib/src/mesa/program/ir_to_mesa.cpp            |    2 +-
 mesalib/src/mesa/program/prog_execute.c            |   85 +-
 mesalib/src/mesa/program/prog_instruction.c        |   12 +-
 mesalib/src/mesa/program/prog_optimize.c           |   34 +-
 mesalib/src/mesa/program/prog_parameter.c          |    6 +-
 mesalib/src/mesa/program/prog_parameter_layout.c   |    2 +-
 mesalib/src/mesa/program/prog_print.c              |   16 +-
 mesalib/src/mesa/program/prog_statevars.c          |   18 +-
 mesalib/src/mesa/program/program.c                 |   40 +-
 mesalib/src/mesa/program/program.h                 |    2 +-
 mesalib/src/mesa/program/program_parse.y           |   14 +-
 mesalib/src/mesa/program/programopt.c              |    2 +-
 mesalib/src/mesa/program/sampler.cpp               |    1 -
 mesalib/src/mesa/state_tracker/st_atom.c           |    5 +-
 .../src/mesa/state_tracker/st_cb_bufferobjects.c   |   12 +-
 .../src/mesa/state_tracker/st_cb_bufferobjects.h   |    2 +-
 mesalib/src/mesa/state_tracker/st_cb_clear.c       |   14 +-
 mesalib/src/mesa/state_tracker/st_cb_drawpixels.c  |    4 +-
 mesalib/src/mesa/state_tracker/st_cb_fbo.h         |    2 +-
 mesalib/src/mesa/state_tracker/st_cb_feedback.c    |    2 +-
 mesalib/src/mesa/state_tracker/st_cb_flush.c       |    2 +-
 mesalib/src/mesa/state_tracker/st_cb_program.c     |   10 -
 mesalib/src/mesa/state_tracker/st_cb_queryobj.h    |    2 +-
 mesalib/src/mesa/state_tracker/st_cb_rasterpos.c   |    4 +-
 mesalib/src/mesa/state_tracker/st_cb_texture.c     |    1 +
 mesalib/src/mesa/state_tracker/st_cb_viewport.c    |    2 +-
 mesalib/src/mesa/state_tracker/st_cb_xformfb.c     |   10 +-
 mesalib/src/mesa/state_tracker/st_context.c        |    6 +-
 mesalib/src/mesa/state_tracker/st_context.h        |    4 +-
 mesalib/src/mesa/state_tracker/st_debug.h          |    2 +-
 mesalib/src/mesa/state_tracker/st_draw.h           |    2 +-
 mesalib/src/mesa/state_tracker/st_extensions.c     |   24 +-
 mesalib/src/mesa/state_tracker/st_format.c         |    2 +-
 mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp |   26 +-
 mesalib/src/mesa/state_tracker/st_manager.c        |    6 +-
 mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c   |   25 +-
 mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.h   |    3 -
 mesalib/src/mesa/state_tracker/st_program.c        |  255 +-
 mesalib/src/mesa/state_tracker/st_program.h        |   36 +-
 mesalib/src/mesa/state_tracker/st_texture.h        |   16 +-
 mesalib/src/mesa/swrast/s_aaline.c                 |    5 +-
 mesalib/src/mesa/swrast/s_aatriangle.c             |    8 +-
 mesalib/src/mesa/swrast/s_aatritemp.h              |    2 +-
 mesalib/src/mesa/swrast/s_alpha.c                  |    2 +-
 mesalib/src/mesa/swrast/s_atifragshader.c          |    2 +-
 mesalib/src/mesa/swrast/s_bitmap.c                 |    6 +-
 mesalib/src/mesa/swrast/s_blend.c                  |   96 +-
 mesalib/src/mesa/swrast/s_blit.c                   |   22 +-
 mesalib/src/mesa/swrast/s_context.c                |    5 +-
 mesalib/src/mesa/swrast/s_copypix.c                |    4 +-
 mesalib/src/mesa/swrast/s_drawpix.c                |    6 +-
 mesalib/src/mesa/swrast/s_fog.c                    |   25 +-
 mesalib/src/mesa/swrast/s_fragprog.c               |    2 +-
 mesalib/src/mesa/swrast/s_lines.c                  |   10 +-
 mesalib/src/mesa/swrast/s_linetemp.h               |    4 +-
 mesalib/src/mesa/swrast/s_logic.c                  |    4 +-
 mesalib/src/mesa/swrast/s_masking.c                |    4 +-
 mesalib/src/mesa/swrast/s_points.c                 |    4 +-
 mesalib/src/mesa/swrast/s_renderbuffer.c           |    2 +-
 mesalib/src/mesa/swrast/s_span.c                   |   70 +-
 mesalib/src/mesa/swrast/s_stencil.c                |    2 +-
 mesalib/src/mesa/swrast/s_texcombine.c             |    6 +-
 mesalib/src/mesa/swrast/s_texfetch.c               |    4 +-
 mesalib/src/mesa/swrast/s_texfilter.c              |  145 +-
 mesalib/src/mesa/swrast/s_texrender.c              |    2 +-
 mesalib/src/mesa/swrast/s_triangle.c               |   28 +-
 mesalib/src/mesa/swrast/s_tritemp.h                |    9 +-
 mesalib/src/mesa/swrast/s_zoom.c                   |   60 +-
 mesalib/src/mesa/swrast_setup/ss_triangle.c        |    1 +
 mesalib/src/mesa/swrast_setup/ss_tritmp.h          |    4 +-
 mesalib/src/mesa/tnl/t_context.c                   |    2 +-
 mesalib/src/mesa/tnl/t_draw.c                      |    2 +
 mesalib/src/mesa/tnl/t_pipeline.c                  |   78 +
 mesalib/src/mesa/tnl/t_rasterpos.c                 |    3 +-
 mesalib/src/mesa/tnl/t_vb_cliptmp.h                |    8 +-
 mesalib/src/mesa/tnl/t_vb_fog.c                    |    7 +-
 mesalib/src/mesa/tnl/t_vb_light.c                  |    4 +-
 mesalib/src/mesa/tnl/t_vb_points.c                 |    5 +-
 mesalib/src/mesa/tnl/t_vb_program.c                |    2 +-
 mesalib/src/mesa/tnl/t_vb_render.c                 |   27 +-
 mesalib/src/mesa/tnl/t_vb_texgen.c                 |    4 +-
 mesalib/src/mesa/tnl/t_vertex.c                    |    1 +
 mesalib/src/mesa/tnl/t_vertex_sse.c                |    2 +
 mesalib/src/mesa/vbo/vbo.h                         |    8 +
 mesalib/src/mesa/vbo/vbo_attrib_tmp.h              |   22 +-
 mesalib/src/mesa/vbo/vbo_context.c                 |    6 +-
 mesalib/src/mesa/vbo/vbo_context.h                 |   28 +-
 mesalib/src/mesa/vbo/vbo_exec.h                    |   11 +-
 mesalib/src/mesa/vbo/vbo_exec_api.c                |   52 +-
 mesalib/src/mesa/vbo/vbo_exec_array.c              |    8 +-
 mesalib/src/mesa/vbo/vbo_exec_draw.c               |   17 +-
 mesalib/src/mesa/vbo/vbo_exec_eval.c               |   32 +-
 mesalib/src/mesa/vbo/vbo_rebase.c                  |    1 +
 mesalib/src/mesa/vbo/vbo_save.h                    |   18 +-
 mesalib/src/mesa/vbo/vbo_save_api.c                |   38 +-
 mesalib/src/mesa/vbo/vbo_save_draw.c               |   10 +-
 mesalib/src/mesa/vbo/vbo_save_loopback.c           |    1 +
 mesalib/src/mesa/vbo/vbo_split_copy.c              |    2 +
 mesalib/src/mesa/x86/common_x86.c                  |    6 +-
 mesalib/src/mesa/x86/gen_matypes.c                 |    2 +
 mesalib/src/util/Makefile.am                       |    6 +-
 mesalib/src/util/SConscript                        |    2 +
 mesalib/src/util/bitset.h                          |    2 +-
 mesalib/src/util/macros.h                          |   23 +
 mesalib/src/util/register_allocate.c               |   24 +-
 mesalib/src/util/register_allocate.h               |   10 +
 .../glsl_apps_compile/glsl_apps_compile.vcxproj    |    5 +-
 .../glsl_apps_compile.vcxproj.filters              |    3 +
 mesalib/windows/VC8/mesa/makefile                  |    4 +-
 mesalib/windows/VC8/mesa/mesa/mesa.vcxproj         |    5 +-
 mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters |    3 +
 .../windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj |    4 +-
 361 files changed, 7558 insertions(+), 6955 deletions(-)

diff --cc fontconfig/fc-blanks/fcblanks.h
index 0000000,0000000..51ba34d
new file mode 100755
--- /dev/null
+++ b/fontconfig/fc-blanks/fcblanks.h
@@@ -1,0 -1,0 +1,4223 @@@
++/*
++ * fontconfig/fc-blanks/fcblanks.tmpl.h
++ *
++ * Copyright © 2003 Keith Packard
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the author(s) not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The authors make no
++ * representations about the suitability of this software for any purpose.  It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++static FcChar32 _fcBlanks[4191] = {
++    0x0020 ,
++    0x00a0 ,
++    0x00ad ,
++    0x034f ,
++    0x061c ,
++    0x115f ,
++    0x1160 ,
++    0x1680 ,
++    0x17b4 ,
++    0x17b5 ,
++    0x180b ,
++    0x180c ,
++    0x180d ,
++    0x180e ,
++    0x2000 ,
++    0x2001 ,
++    0x2002 ,
++    0x2003 ,
++    0x2004 ,
++    0x2005 ,
++    0x2006 ,
++    0x2007 ,
++    0x2008 ,
++    0x2009 ,
++    0x200a ,
++    0x200b ,
++    0x200c ,
++    0x200d ,
++    0x200e ,
++    0x200f ,
++    0x202a ,
++    0x202b ,
++    0x202c ,
++    0x202d ,
++    0x202e ,
++    0x202f ,
++    0x205f ,
++    0x2060 ,
++    0x2061 ,
++    0x2062 ,
++    0x2063 ,
++    0x2064 ,
++    0x2065 ,
++    0x2066 ,
++    0x2067 ,
++    0x2068 ,
++    0x2069 ,
++    0x206a ,
++    0x206b ,
++    0x206c ,
++    0x206d ,
++    0x206e ,
++    0x206f ,
++    0x2800 ,
++    0x3000 ,
++    0x3164 ,
++    0xfe00 ,
++    0xfe01 ,
++    0xfe02 ,
++    0xfe03 ,
++    0xfe04 ,
++    0xfe05 ,
++    0xfe06 ,
++    0xfe07 ,
++    0xfe08 ,
++    0xfe09 ,
++    0xfe0a ,
++    0xfe0b ,
++    0xfe0c ,
++    0xfe0d ,
++    0xfe0e ,
++    0xfe0f ,
++    0xfeff ,
++    0xffa0 ,
++    0xfff0 ,
++    0xfff1 ,
++    0xfff2 ,
++    0xfff3 ,
++    0xfff4 ,
++    0xfff5 ,
++    0xfff6 ,
++    0xfff7 ,
++    0xfff8 ,
++    0x1bca0 ,
++    0x1bca1 ,
++    0x1bca2 ,
++    0x1bca3 ,
++    0x1d173 ,
++    0x1d174 ,
++    0x1d175 ,
++    0x1d176 ,
++    0x1d177 ,
++    0x1d178 ,
++    0x1d179 ,
++    0x1d17a ,
++    0xe0000 ,
++    0xe0001 ,
++    0xe0002 ,
++    0xe0003 ,
++    0xe0004 ,
++    0xe0005 ,
++    0xe0006 ,
++    0xe0007 ,
++    0xe0008 ,
++    0xe0009 ,
++    0xe000a ,
++    0xe000b ,
++    0xe000c ,
++    0xe000d ,
++    0xe000e ,
++    0xe000f ,
++    0xe0010 ,
++    0xe0011 ,
++    0xe0012 ,
++    0xe0013 ,
++    0xe0014 ,
++    0xe0015 ,
++    0xe0016 ,
++    0xe0017 ,
++    0xe0018 ,
++    0xe0019 ,
++    0xe001a ,
++    0xe001b ,
++    0xe001c ,
++    0xe001d ,
++    0xe001e ,
++    0xe001f ,
++    0xe0020 ,
++    0xe0021 ,
++    0xe0022 ,
++    0xe0023 ,
++    0xe0024 ,
++    0xe0025 ,
++    0xe0026 ,
++    0xe0027 ,
++    0xe0028 ,
++    0xe0029 ,
++    0xe002a ,
++    0xe002b ,
++    0xe002c ,
++    0xe002d ,
++    0xe002e ,
++    0xe002f ,
++    0xe0030 ,
++    0xe0031 ,
++    0xe0032 ,
++    0xe0033 ,
++    0xe0034 ,
++    0xe0035 ,
++    0xe0036 ,
++    0xe0037 ,
++    0xe0038 ,
++    0xe0039 ,
++    0xe003a ,
++    0xe003b ,
++    0xe003c ,
++    0xe003d ,
++    0xe003e ,
++    0xe003f ,
++    0xe0040 ,
++    0xe0041 ,
++    0xe0042 ,
++    0xe0043 ,
++    0xe0044 ,
++    0xe0045 ,
++    0xe0046 ,
++    0xe0047 ,
++    0xe0048 ,
++    0xe0049 ,
++    0xe004a ,
++    0xe004b ,
++    0xe004c ,
++    0xe004d ,
++    0xe004e ,
++    0xe004f ,
++    0xe0050 ,
++    0xe0051 ,
++    0xe0052 ,
++    0xe0053 ,
++    0xe0054 ,
++    0xe0055 ,
++    0xe0056 ,
++    0xe0057 ,
++    0xe0058 ,
++    0xe0059 ,
++    0xe005a ,
++    0xe005b ,
++    0xe005c ,
++    0xe005d ,
++    0xe005e ,
++    0xe005f ,
++    0xe0060 ,
++    0xe0061 ,
++    0xe0062 ,
++    0xe0063 ,
++    0xe0064 ,
++    0xe0065 ,
++    0xe0066 ,
++    0xe0067 ,
++    0xe0068 ,
++    0xe0069 ,
++    0xe006a ,
++    0xe006b ,
++    0xe006c ,
++    0xe006d ,
++    0xe006e ,
++    0xe006f ,
++    0xe0070 ,
++    0xe0071 ,
++    0xe0072 ,
++    0xe0073 ,
++    0xe0074 ,
++    0xe0075 ,
++    0xe0076 ,
++    0xe0077 ,
++    0xe0078 ,
++    0xe0079 ,
++    0xe007a ,
++    0xe007b ,
++    0xe007c ,
++    0xe007d ,
++    0xe007e ,
++    0xe007f ,
++    0xe0080 ,
++    0xe0081 ,
++    0xe0082 ,
++    0xe0083 ,
++    0xe0084 ,
++    0xe0085 ,
++    0xe0086 ,
++    0xe0087 ,
++    0xe0088 ,
++    0xe0089 ,
++    0xe008a ,
++    0xe008b ,
++    0xe008c ,
++    0xe008d ,
++    0xe008e ,
++    0xe008f ,
++    0xe0090 ,
++    0xe0091 ,
++    0xe0092 ,
++    0xe0093 ,
++    0xe0094 ,
++    0xe0095 ,
++    0xe0096 ,
++    0xe0097 ,
++    0xe0098 ,
++    0xe0099 ,
++    0xe009a ,
++    0xe009b ,
++    0xe009c ,
++    0xe009d ,
++    0xe009e ,
++    0xe009f ,
++    0xe00a0 ,
++    0xe00a1 ,
++    0xe00a2 ,
++    0xe00a3 ,
++    0xe00a4 ,
++    0xe00a5 ,
++    0xe00a6 ,
++    0xe00a7 ,
++    0xe00a8 ,
++    0xe00a9 ,
++    0xe00aa ,
++    0xe00ab ,
++    0xe00ac ,
++    0xe00ad ,
++    0xe00ae ,
++    0xe00af ,
++    0xe00b0 ,
++    0xe00b1 ,
++    0xe00b2 ,
++    0xe00b3 ,
++    0xe00b4 ,
++    0xe00b5 ,
++    0xe00b6 ,
++    0xe00b7 ,
++    0xe00b8 ,
++    0xe00b9 ,
++    0xe00ba ,
++    0xe00bb ,
++    0xe00bc ,
++    0xe00bd ,
++    0xe00be ,
++    0xe00bf ,
++    0xe00c0 ,
++    0xe00c1 ,
++    0xe00c2 ,
++    0xe00c3 ,
++    0xe00c4 ,
++    0xe00c5 ,
++    0xe00c6 ,
++    0xe00c7 ,
++    0xe00c8 ,
++    0xe00c9 ,
++    0xe00ca ,
++    0xe00cb ,
++    0xe00cc ,
++    0xe00cd ,
++    0xe00ce ,
++    0xe00cf ,
++    0xe00d0 ,
++    0xe00d1 ,
++    0xe00d2 ,
++    0xe00d3 ,
++    0xe00d4 ,
++    0xe00d5 ,
++    0xe00d6 ,
++    0xe00d7 ,
++    0xe00d8 ,
++    0xe00d9 ,
++    0xe00da ,
++    0xe00db ,
++    0xe00dc ,
++    0xe00dd ,
++    0xe00de ,
++    0xe00df ,
++    0xe00e0 ,
++    0xe00e1 ,
++    0xe00e2 ,
++    0xe00e3 ,
++    0xe00e4 ,
++    0xe00e5 ,
++    0xe00e6 ,
++    0xe00e7 ,
++    0xe00e8 ,
++    0xe00e9 ,
++    0xe00ea ,
++    0xe00eb ,
++    0xe00ec ,
++    0xe00ed ,
++    0xe00ee ,
++    0xe00ef ,
++    0xe00f0 ,
++    0xe00f1 ,
++    0xe00f2 ,
++    0xe00f3 ,
++    0xe00f4 ,
++    0xe00f5 ,
++    0xe00f6 ,
++    0xe00f7 ,
++    0xe00f8 ,
++    0xe00f9 ,
++    0xe00fa ,
++    0xe00fb ,
++    0xe00fc ,
++    0xe00fd ,
++    0xe00fe ,
++    0xe00ff ,
++    0xe0100 ,
++    0xe0101 ,
++    0xe0102 ,
++    0xe0103 ,
++    0xe0104 ,
++    0xe0105 ,
++    0xe0106 ,
++    0xe0107 ,
++    0xe0108 ,
++    0xe0109 ,
++    0xe010a ,
++    0xe010b ,
++    0xe010c ,
++    0xe010d ,
++    0xe010e ,
++    0xe010f ,
++    0xe0110 ,
++    0xe0111 ,
++    0xe0112 ,
++    0xe0113 ,
++    0xe0114 ,
++    0xe0115 ,
++    0xe0116 ,
++    0xe0117 ,
++    0xe0118 ,
++    0xe0119 ,
++    0xe011a ,
++    0xe011b ,
++    0xe011c ,
++    0xe011d ,
++    0xe011e ,
++    0xe011f ,
++    0xe0120 ,
++    0xe0121 ,
++    0xe0122 ,
++    0xe0123 ,
++    0xe0124 ,
++    0xe0125 ,
++    0xe0126 ,
++    0xe0127 ,
++    0xe0128 ,
++    0xe0129 ,
++    0xe012a ,
++    0xe012b ,
++    0xe012c ,
++    0xe012d ,
++    0xe012e ,
++    0xe012f ,
++    0xe0130 ,
++    0xe0131 ,
++    0xe0132 ,
++    0xe0133 ,
++    0xe0134 ,
++    0xe0135 ,
++    0xe0136 ,
++    0xe0137 ,
++    0xe0138 ,
++    0xe0139 ,
++    0xe013a ,
++    0xe013b ,
++    0xe013c ,
++    0xe013d ,
++    0xe013e ,
++    0xe013f ,
++    0xe0140 ,
++    0xe0141 ,
++    0xe0142 ,
++    0xe0143 ,
++    0xe0144 ,
++    0xe0145 ,
++    0xe0146 ,
++    0xe0147 ,
++    0xe0148 ,
++    0xe0149 ,
++    0xe014a ,
++    0xe014b ,
++    0xe014c ,
++    0xe014d ,
++    0xe014e ,
++    0xe014f ,
++    0xe0150 ,
++    0xe0151 ,
++    0xe0152 ,
++    0xe0153 ,
++    0xe0154 ,
++    0xe0155 ,
++    0xe0156 ,
++    0xe0157 ,
++    0xe0158 ,
++    0xe0159 ,
++    0xe015a ,
++    0xe015b ,
++    0xe015c ,
++    0xe015d ,
++    0xe015e ,
++    0xe015f ,
++    0xe0160 ,
++    0xe0161 ,
++    0xe0162 ,
++    0xe0163 ,
++    0xe0164 ,
++    0xe0165 ,
++    0xe0166 ,
++    0xe0167 ,
++    0xe0168 ,
++    0xe0169 ,
++    0xe016a ,
++    0xe016b ,
++    0xe016c ,
++    0xe016d ,
++    0xe016e ,
++    0xe016f ,
++    0xe0170 ,
++    0xe0171 ,
++    0xe0172 ,
++    0xe0173 ,
++    0xe0174 ,
++    0xe0175 ,
++    0xe0176 ,
++    0xe0177 ,
++    0xe0178 ,
++    0xe0179 ,
++    0xe017a ,
++    0xe017b ,
++    0xe017c ,
++    0xe017d ,
++    0xe017e ,
++    0xe017f ,
++    0xe0180 ,
++    0xe0181 ,
++    0xe0182 ,
++    0xe0183 ,
++    0xe0184 ,
++    0xe0185 ,
++    0xe0186 ,
++    0xe0187 ,
++    0xe0188 ,
++    0xe0189 ,
++    0xe018a ,
++    0xe018b ,
++    0xe018c ,
++    0xe018d ,
++    0xe018e ,
++    0xe018f ,
++    0xe0190 ,
++    0xe0191 ,
++    0xe0192 ,
++    0xe0193 ,
++    0xe0194 ,
++    0xe0195 ,
++    0xe0196 ,
++    0xe0197 ,
++    0xe0198 ,
++    0xe0199 ,
++    0xe019a ,
++    0xe019b ,
++    0xe019c ,
++    0xe019d ,
++    0xe019e ,
++    0xe019f ,
++    0xe01a0 ,
++    0xe01a1 ,
++    0xe01a2 ,
++    0xe01a3 ,
++    0xe01a4 ,
++    0xe01a5 ,
++    0xe01a6 ,
++    0xe01a7 ,
++    0xe01a8 ,
++    0xe01a9 ,
++    0xe01aa ,
++    0xe01ab ,
++    0xe01ac ,
++    0xe01ad ,
++    0xe01ae ,
++    0xe01af ,
++    0xe01b0 ,
++    0xe01b1 ,
++    0xe01b2 ,
++    0xe01b3 ,
++    0xe01b4 ,
++    0xe01b5 ,
++    0xe01b6 ,
++    0xe01b7 ,
++    0xe01b8 ,
++    0xe01b9 ,
++    0xe01ba ,
++    0xe01bb ,
++    0xe01bc ,
++    0xe01bd ,
++    0xe01be ,
++    0xe01bf ,
++    0xe01c0 ,
++    0xe01c1 ,
++    0xe01c2 ,
++    0xe01c3 ,
++    0xe01c4 ,
++    0xe01c5 ,
++    0xe01c6 ,
++    0xe01c7 ,
++    0xe01c8 ,
++    0xe01c9 ,
++    0xe01ca ,
++    0xe01cb ,
++    0xe01cc ,
++    0xe01cd ,
++    0xe01ce ,
++    0xe01cf ,
++    0xe01d0 ,
++    0xe01d1 ,
++    0xe01d2 ,
++    0xe01d3 ,
++    0xe01d4 ,
++    0xe01d5 ,
++    0xe01d6 ,
++    0xe01d7 ,
++    0xe01d8 ,
++    0xe01d9 ,
++    0xe01da ,
++    0xe01db ,
++    0xe01dc ,
++    0xe01dd ,
++    0xe01de ,
++    0xe01df ,
++    0xe01e0 ,
++    0xe01e1 ,
++    0xe01e2 ,
++    0xe01e3 ,
++    0xe01e4 ,
++    0xe01e5 ,
++    0xe01e6 ,
++    0xe01e7 ,
++    0xe01e8 ,
++    0xe01e9 ,
++    0xe01ea ,
++    0xe01eb ,
++    0xe01ec ,
++    0xe01ed ,
++    0xe01ee ,
++    0xe01ef ,
++    0xe01f0 ,
++    0xe01f1 ,
++    0xe01f2 ,
++    0xe01f3 ,
++    0xe01f4 ,
++    0xe01f5 ,
++    0xe01f6 ,
++    0xe01f7 ,
++    0xe01f8 ,
++    0xe01f9 ,
++    0xe01fa ,
++    0xe01fb ,
++    0xe01fc ,
++    0xe01fd ,
++    0xe01fe ,
++    0xe01ff ,
++    0xe0200 ,
++    0xe0201 ,
++    0xe0202 ,
++    0xe0203 ,
++    0xe0204 ,
++    0xe0205 ,
++    0xe0206 ,
++    0xe0207 ,
++    0xe0208 ,
++    0xe0209 ,
++    0xe020a ,
++    0xe020b ,
++    0xe020c ,
++    0xe020d ,
++    0xe020e ,
++    0xe020f ,
++    0xe0210 ,
++    0xe0211 ,
++    0xe0212 ,
++    0xe0213 ,
++    0xe0214 ,
++    0xe0215 ,
++    0xe0216 ,
++    0xe0217 ,
++    0xe0218 ,
++    0xe0219 ,
++    0xe021a ,
++    0xe021b ,
++    0xe021c ,
++    0xe021d ,
++    0xe021e ,
++    0xe021f ,
++    0xe0220 ,
++    0xe0221 ,
++    0xe0222 ,
++    0xe0223 ,
++    0xe0224 ,
++    0xe0225 ,
++    0xe0226 ,
++    0xe0227 ,
++    0xe0228 ,
++    0xe0229 ,
++    0xe022a ,
++    0xe022b ,
++    0xe022c ,
++    0xe022d ,
++    0xe022e ,
++    0xe022f ,
++    0xe0230 ,
++    0xe0231 ,
++    0xe0232 ,
++    0xe0233 ,
++    0xe0234 ,
++    0xe0235 ,
++    0xe0236 ,
++    0xe0237 ,
++    0xe0238 ,
++    0xe0239 ,
++    0xe023a ,
++    0xe023b ,
++    0xe023c ,
++    0xe023d ,
++    0xe023e ,
++    0xe023f ,
++    0xe0240 ,
++    0xe0241 ,
++    0xe0242 ,
++    0xe0243 ,
++    0xe0244 ,
++    0xe0245 ,
++    0xe0246 ,
++    0xe0247 ,
++    0xe0248 ,
++    0xe0249 ,
++    0xe024a ,
++    0xe024b ,
++    0xe024c ,
++    0xe024d ,
++    0xe024e ,
++    0xe024f ,
++    0xe0250 ,
++    0xe0251 ,
++    0xe0252 ,
++    0xe0253 ,
++    0xe0254 ,
++    0xe0255 ,
++    0xe0256 ,
++    0xe0257 ,
++    0xe0258 ,
++    0xe0259 ,
++    0xe025a ,
++    0xe025b ,
++    0xe025c ,
++    0xe025d ,
++    0xe025e ,
++    0xe025f ,
++    0xe0260 ,
++    0xe0261 ,
++    0xe0262 ,
++    0xe0263 ,
++    0xe0264 ,
++    0xe0265 ,
++    0xe0266 ,
++    0xe0267 ,
++    0xe0268 ,
++    0xe0269 ,
++    0xe026a ,
++    0xe026b ,
++    0xe026c ,
++    0xe026d ,
++    0xe026e ,
++    0xe026f ,
++    0xe0270 ,
++    0xe0271 ,
++    0xe0272 ,
++    0xe0273 ,
++    0xe0274 ,
++    0xe0275 ,
++    0xe0276 ,
++    0xe0277 ,
++    0xe0278 ,
++    0xe0279 ,
++    0xe027a ,
++    0xe027b ,
++    0xe027c ,
++    0xe027d ,
++    0xe027e ,
++    0xe027f ,
++    0xe0280 ,
++    0xe0281 ,
++    0xe0282 ,
++    0xe0283 ,
++    0xe0284 ,
++    0xe0285 ,
++    0xe0286 ,
++    0xe0287 ,
++    0xe0288 ,
++    0xe0289 ,
++    0xe028a ,
++    0xe028b ,
++    0xe028c ,
++    0xe028d ,
++    0xe028e ,
++    0xe028f ,
++    0xe0290 ,
++    0xe0291 ,
++    0xe0292 ,
++    0xe0293 ,
++    0xe0294 ,
++    0xe0295 ,
++    0xe0296 ,
++    0xe0297 ,
++    0xe0298 ,
++    0xe0299 ,
++    0xe029a ,
++    0xe029b ,
++    0xe029c ,
++    0xe029d ,
++    0xe029e ,
++    0xe029f ,
++    0xe02a0 ,
++    0xe02a1 ,
++    0xe02a2 ,
++    0xe02a3 ,
++    0xe02a4 ,
++    0xe02a5 ,
++    0xe02a6 ,
++    0xe02a7 ,
++    0xe02a8 ,
++    0xe02a9 ,
++    0xe02aa ,
++    0xe02ab ,
++    0xe02ac ,
++    0xe02ad ,
++    0xe02ae ,
++    0xe02af ,
++    0xe02b0 ,
++    0xe02b1 ,
++    0xe02b2 ,
++    0xe02b3 ,
++    0xe02b4 ,
++    0xe02b5 ,
++    0xe02b6 ,
++    0xe02b7 ,
++    0xe02b8 ,
++    0xe02b9 ,
++    0xe02ba ,
++    0xe02bb ,
++    0xe02bc ,
++    0xe02bd ,
++    0xe02be ,
++    0xe02bf ,
++    0xe02c0 ,
++    0xe02c1 ,
++    0xe02c2 ,
++    0xe02c3 ,
++    0xe02c4 ,
++    0xe02c5 ,
++    0xe02c6 ,
++    0xe02c7 ,
++    0xe02c8 ,
++    0xe02c9 ,
++    0xe02ca ,
++    0xe02cb ,
++    0xe02cc ,
++    0xe02cd ,
++    0xe02ce ,
++    0xe02cf ,
++    0xe02d0 ,
++    0xe02d1 ,
++    0xe02d2 ,
++    0xe02d3 ,
++    0xe02d4 ,
++    0xe02d5 ,
++    0xe02d6 ,
++    0xe02d7 ,
++    0xe02d8 ,
++    0xe02d9 ,
++    0xe02da ,
++    0xe02db ,
++    0xe02dc ,
++    0xe02dd ,
++    0xe02de ,
++    0xe02df ,
++    0xe02e0 ,
++    0xe02e1 ,
++    0xe02e2 ,
++    0xe02e3 ,
++    0xe02e4 ,
++    0xe02e5 ,
++    0xe02e6 ,
++    0xe02e7 ,
++    0xe02e8 ,
++    0xe02e9 ,
++    0xe02ea ,
++    0xe02eb ,
++    0xe02ec ,
++    0xe02ed ,
++    0xe02ee ,
++    0xe02ef ,
++    0xe02f0 ,
++    0xe02f1 ,
++    0xe02f2 ,
++    0xe02f3 ,
++    0xe02f4 ,
++    0xe02f5 ,
++    0xe02f6 ,
++    0xe02f7 ,
++    0xe02f8 ,
++    0xe02f9 ,
++    0xe02fa ,
++    0xe02fb ,
++    0xe02fc ,
++    0xe02fd ,
++    0xe02fe ,
++    0xe02ff ,
++    0xe0300 ,
++    0xe0301 ,
++    0xe0302 ,
++    0xe0303 ,
++    0xe0304 ,
++    0xe0305 ,
++    0xe0306 ,
++    0xe0307 ,
++    0xe0308 ,
++    0xe0309 ,
++    0xe030a ,
++    0xe030b ,
++    0xe030c ,
++    0xe030d ,
++    0xe030e ,
++    0xe030f ,
++    0xe0310 ,
++    0xe0311 ,
++    0xe0312 ,
++    0xe0313 ,
++    0xe0314 ,
++    0xe0315 ,
++    0xe0316 ,
++    0xe0317 ,
++    0xe0318 ,
++    0xe0319 ,
++    0xe031a ,
++    0xe031b ,
++    0xe031c ,
++    0xe031d ,
++    0xe031e ,
++    0xe031f ,
++    0xe0320 ,
++    0xe0321 ,
++    0xe0322 ,
++    0xe0323 ,
++    0xe0324 ,
++    0xe0325 ,
++    0xe0326 ,
++    0xe0327 ,
++    0xe0328 ,
++    0xe0329 ,
++    0xe032a ,
++    0xe032b ,
++    0xe032c ,
++    0xe032d ,
++    0xe032e ,
++    0xe032f ,
++    0xe0330 ,
++    0xe0331 ,
++    0xe0332 ,
++    0xe0333 ,
++    0xe0334 ,
++    0xe0335 ,
++    0xe0336 ,
++    0xe0337 ,
++    0xe0338 ,
++    0xe0339 ,
++    0xe033a ,
++    0xe033b ,
++    0xe033c ,
++    0xe033d ,
++    0xe033e ,
++    0xe033f ,
++    0xe0340 ,
++    0xe0341 ,
++    0xe0342 ,
++    0xe0343 ,
++    0xe0344 ,
++    0xe0345 ,
++    0xe0346 ,
++    0xe0347 ,
++    0xe0348 ,
++    0xe0349 ,
++    0xe034a ,
++    0xe034b ,
++    0xe034c ,
++    0xe034d ,
++    0xe034e ,
++    0xe034f ,
++    0xe0350 ,
++    0xe0351 ,
++    0xe0352 ,
++    0xe0353 ,
++    0xe0354 ,
++    0xe0355 ,
++    0xe0356 ,
++    0xe0357 ,
++    0xe0358 ,
++    0xe0359 ,
++    0xe035a ,
++    0xe035b ,
++    0xe035c ,
++    0xe035d ,
++    0xe035e ,
++    0xe035f ,
++    0xe0360 ,
++    0xe0361 ,
++    0xe0362 ,
++    0xe0363 ,
++    0xe0364 ,
++    0xe0365 ,
++    0xe0366 ,
++    0xe0367 ,
++    0xe0368 ,
++    0xe0369 ,
++    0xe036a ,
++    0xe036b ,
++    0xe036c ,
++    0xe036d ,
++    0xe036e ,
++    0xe036f ,
++    0xe0370 ,
++    0xe0371 ,
++    0xe0372 ,
++    0xe0373 ,
++    0xe0374 ,
++    0xe0375 ,
++    0xe0376 ,
++    0xe0377 ,
++    0xe0378 ,
++    0xe0379 ,
++    0xe037a ,
++    0xe037b ,
++    0xe037c ,
++    0xe037d ,
++    0xe037e ,
++    0xe037f ,
++    0xe0380 ,
++    0xe0381 ,
++    0xe0382 ,
++    0xe0383 ,
++    0xe0384 ,
++    0xe0385 ,
++    0xe0386 ,
++    0xe0387 ,
++    0xe0388 ,
++    0xe0389 ,
++    0xe038a ,
++    0xe038b ,
++    0xe038c ,
++    0xe038d ,
++    0xe038e ,
++    0xe038f ,
++    0xe0390 ,
++    0xe0391 ,
++    0xe0392 ,
++    0xe0393 ,
++    0xe0394 ,
++    0xe0395 ,
++    0xe0396 ,
++    0xe0397 ,
++    0xe0398 ,
++    0xe0399 ,
++    0xe039a ,
++    0xe039b ,
++    0xe039c ,
++    0xe039d ,
++    0xe039e ,
++    0xe039f ,
++    0xe03a0 ,
++    0xe03a1 ,
++    0xe03a2 ,
++    0xe03a3 ,
++    0xe03a4 ,
++    0xe03a5 ,
++    0xe03a6 ,
++    0xe03a7 ,
++    0xe03a8 ,
++    0xe03a9 ,
++    0xe03aa ,
++    0xe03ab ,
++    0xe03ac ,
++    0xe03ad ,
++    0xe03ae ,
++    0xe03af ,
++    0xe03b0 ,
++    0xe03b1 ,
++    0xe03b2 ,
++    0xe03b3 ,
++    0xe03b4 ,
++    0xe03b5 ,
++    0xe03b6 ,
++    0xe03b7 ,
++    0xe03b8 ,
++    0xe03b9 ,
++    0xe03ba ,
++    0xe03bb ,
++    0xe03bc ,
++    0xe03bd ,
++    0xe03be ,
++    0xe03bf ,
++    0xe03c0 ,
++    0xe03c1 ,
++    0xe03c2 ,
++    0xe03c3 ,
++    0xe03c4 ,
++    0xe03c5 ,
++    0xe03c6 ,
++    0xe03c7 ,
++    0xe03c8 ,
++    0xe03c9 ,
++    0xe03ca ,
++    0xe03cb ,
++    0xe03cc ,
++    0xe03cd ,
++    0xe03ce ,
++    0xe03cf ,
++    0xe03d0 ,
++    0xe03d1 ,
++    0xe03d2 ,
++    0xe03d3 ,
++    0xe03d4 ,
++    0xe03d5 ,
++    0xe03d6 ,
++    0xe03d7 ,
++    0xe03d8 ,
++    0xe03d9 ,
++    0xe03da ,
++    0xe03db ,
++    0xe03dc ,
++    0xe03dd ,
++    0xe03de ,
++    0xe03df ,
++    0xe03e0 ,
++    0xe03e1 ,
++    0xe03e2 ,
++    0xe03e3 ,
++    0xe03e4 ,
++    0xe03e5 ,
++    0xe03e6 ,
++    0xe03e7 ,
++    0xe03e8 ,
++    0xe03e9 ,
++    0xe03ea ,
++    0xe03eb ,
++    0xe03ec ,
++    0xe03ed ,
++    0xe03ee ,
++    0xe03ef ,
++    0xe03f0 ,
++    0xe03f1 ,
++    0xe03f2 ,
++    0xe03f3 ,
++    0xe03f4 ,
++    0xe03f5 ,
++    0xe03f6 ,
++    0xe03f7 ,
++    0xe03f8 ,
++    0xe03f9 ,
++    0xe03fa ,
++    0xe03fb ,
++    0xe03fc ,
++    0xe03fd ,
++    0xe03fe ,
++    0xe03ff ,
++    0xe0400 ,
++    0xe0401 ,
++    0xe0402 ,
++    0xe0403 ,
++    0xe0404 ,
++    0xe0405 ,
++    0xe0406 ,
++    0xe0407 ,
++    0xe0408 ,
++    0xe0409 ,
++    0xe040a ,
++    0xe040b ,
++    0xe040c ,
++    0xe040d ,
++    0xe040e ,
++    0xe040f ,
++    0xe0410 ,
++    0xe0411 ,
++    0xe0412 ,
++    0xe0413 ,
++    0xe0414 ,
++    0xe0415 ,
++    0xe0416 ,
++    0xe0417 ,
++    0xe0418 ,
++    0xe0419 ,
++    0xe041a ,
++    0xe041b ,
++    0xe041c ,
++    0xe041d ,
++    0xe041e ,
++    0xe041f ,
++    0xe0420 ,
++    0xe0421 ,
++    0xe0422 ,
++    0xe0423 ,
++    0xe0424 ,
++    0xe0425 ,
++    0xe0426 ,
++    0xe0427 ,
++    0xe0428 ,
++    0xe0429 ,
++    0xe042a ,
++    0xe042b ,
++    0xe042c ,
++    0xe042d ,
++    0xe042e ,
++    0xe042f ,
++    0xe0430 ,
++    0xe0431 ,
++    0xe0432 ,
++    0xe0433 ,
++    0xe0434 ,
++    0xe0435 ,
++    0xe0436 ,
++    0xe0437 ,
++    0xe0438 ,
++    0xe0439 ,
++    0xe043a ,
++    0xe043b ,
++    0xe043c ,
++    0xe043d ,
++    0xe043e ,
++    0xe043f ,
++    0xe0440 ,
++    0xe0441 ,
++    0xe0442 ,
++    0xe0443 ,
++    0xe0444 ,
++    0xe0445 ,
++    0xe0446 ,
++    0xe0447 ,
++    0xe0448 ,
++    0xe0449 ,
++    0xe044a ,
++    0xe044b ,
++    0xe044c ,
++    0xe044d ,
++    0xe044e ,
++    0xe044f ,
++    0xe0450 ,
++    0xe0451 ,
++    0xe0452 ,
++    0xe0453 ,
++    0xe0454 ,
++    0xe0455 ,
++    0xe0456 ,
++    0xe0457 ,
++    0xe0458 ,
++    0xe0459 ,
++    0xe045a ,
++    0xe045b ,
++    0xe045c ,
++    0xe045d ,
++    0xe045e ,
++    0xe045f ,
++    0xe0460 ,
++    0xe0461 ,
++    0xe0462 ,
++    0xe0463 ,
++    0xe0464 ,
++    0xe0465 ,
++    0xe0466 ,
++    0xe0467 ,
++    0xe0468 ,
++    0xe0469 ,
++    0xe046a ,
++    0xe046b ,
++    0xe046c ,
++    0xe046d ,
++    0xe046e ,
++    0xe046f ,
++    0xe0470 ,
++    0xe0471 ,
++    0xe0472 ,
++    0xe0473 ,
++    0xe0474 ,
++    0xe0475 ,
++    0xe0476 ,
++    0xe0477 ,
++    0xe0478 ,
++    0xe0479 ,
++    0xe047a ,
++    0xe047b ,
++    0xe047c ,
++    0xe047d ,
++    0xe047e ,
++    0xe047f ,
++    0xe0480 ,
++    0xe0481 ,
++    0xe0482 ,
++    0xe0483 ,
++    0xe0484 ,
++    0xe0485 ,
++    0xe0486 ,
++    0xe0487 ,
++    0xe0488 ,
++    0xe0489 ,
++    0xe048a ,
++    0xe048b ,
++    0xe048c ,
++    0xe048d ,
++    0xe048e ,
++    0xe048f ,
++    0xe0490 ,
++    0xe0491 ,
++    0xe0492 ,
++    0xe0493 ,
++    0xe0494 ,
++    0xe0495 ,
++    0xe0496 ,
++    0xe0497 ,
++    0xe0498 ,
++    0xe0499 ,
++    0xe049a ,
++    0xe049b ,
++    0xe049c ,
++    0xe049d ,
++    0xe049e ,
++    0xe049f ,
++    0xe04a0 ,
++    0xe04a1 ,
++    0xe04a2 ,
++    0xe04a3 ,
++    0xe04a4 ,
++    0xe04a5 ,
++    0xe04a6 ,
++    0xe04a7 ,
++    0xe04a8 ,
++    0xe04a9 ,
++    0xe04aa ,
++    0xe04ab ,
++    0xe04ac ,
++    0xe04ad ,
++    0xe04ae ,
++    0xe04af ,
++    0xe04b0 ,
++    0xe04b1 ,
++    0xe04b2 ,
++    0xe04b3 ,
++    0xe04b4 ,
++    0xe04b5 ,
++    0xe04b6 ,
++    0xe04b7 ,
++    0xe04b8 ,
++    0xe04b9 ,
++    0xe04ba ,
++    0xe04bb ,
++    0xe04bc ,
++    0xe04bd ,
++    0xe04be ,
++    0xe04bf ,
++    0xe04c0 ,
++    0xe04c1 ,
++    0xe04c2 ,
++    0xe04c3 ,
++    0xe04c4 ,
++    0xe04c5 ,
++    0xe04c6 ,
++    0xe04c7 ,
++    0xe04c8 ,
++    0xe04c9 ,
++    0xe04ca ,
++    0xe04cb ,
++    0xe04cc ,
++    0xe04cd ,
++    0xe04ce ,
++    0xe04cf ,
++    0xe04d0 ,
++    0xe04d1 ,
++    0xe04d2 ,
++    0xe04d3 ,
++    0xe04d4 ,
++    0xe04d5 ,
++    0xe04d6 ,
++    0xe04d7 ,
++    0xe04d8 ,
++    0xe04d9 ,
++    0xe04da ,
++    0xe04db ,
++    0xe04dc ,
++    0xe04dd ,
++    0xe04de ,
++    0xe04df ,
++    0xe04e0 ,
++    0xe04e1 ,
++    0xe04e2 ,
++    0xe04e3 ,
++    0xe04e4 ,
++    0xe04e5 ,
++    0xe04e6 ,
++    0xe04e7 ,
++    0xe04e8 ,
++    0xe04e9 ,
++    0xe04ea ,
++    0xe04eb ,
++    0xe04ec ,
++    0xe04ed ,
++    0xe04ee ,
++    0xe04ef ,
++    0xe04f0 ,
++    0xe04f1 ,
++    0xe04f2 ,
++    0xe04f3 ,
++    0xe04f4 ,
++    0xe04f5 ,
++    0xe04f6 ,
++    0xe04f7 ,
++    0xe04f8 ,
++    0xe04f9 ,
++    0xe04fa ,
++    0xe04fb ,
++    0xe04fc ,
++    0xe04fd ,
++    0xe04fe ,
++    0xe04ff ,
++    0xe0500 ,
++    0xe0501 ,
++    0xe0502 ,
++    0xe0503 ,
++    0xe0504 ,
++    0xe0505 ,
++    0xe0506 ,
++    0xe0507 ,
++    0xe0508 ,
++    0xe0509 ,
++    0xe050a ,
++    0xe050b ,
++    0xe050c ,
++    0xe050d ,
++    0xe050e ,
++    0xe050f ,
++    0xe0510 ,
++    0xe0511 ,
++    0xe0512 ,
++    0xe0513 ,
++    0xe0514 ,
++    0xe0515 ,
++    0xe0516 ,
++    0xe0517 ,
++    0xe0518 ,
++    0xe0519 ,
++    0xe051a ,
++    0xe051b ,
++    0xe051c ,
++    0xe051d ,
++    0xe051e ,
++    0xe051f ,
++    0xe0520 ,
++    0xe0521 ,
++    0xe0522 ,
++    0xe0523 ,
++    0xe0524 ,
++    0xe0525 ,
++    0xe0526 ,
++    0xe0527 ,
++    0xe0528 ,
++    0xe0529 ,
++    0xe052a ,
++    0xe052b ,
++    0xe052c ,
++    0xe052d ,
++    0xe052e ,
++    0xe052f ,
++    0xe0530 ,
++    0xe0531 ,
++    0xe0532 ,
++    0xe0533 ,
++    0xe0534 ,
++    0xe0535 ,
++    0xe0536 ,
++    0xe0537 ,
++    0xe0538 ,
++    0xe0539 ,
++    0xe053a ,
++    0xe053b ,
++    0xe053c ,
++    0xe053d ,
++    0xe053e ,
++    0xe053f ,
++    0xe0540 ,
++    0xe0541 ,
++    0xe0542 ,
++    0xe0543 ,
++    0xe0544 ,
++    0xe0545 ,
++    0xe0546 ,
++    0xe0547 ,
++    0xe0548 ,
++    0xe0549 ,
++    0xe054a ,
++    0xe054b ,
++    0xe054c ,
++    0xe054d ,
++    0xe054e ,
++    0xe054f ,
++    0xe0550 ,
++    0xe0551 ,
++    0xe0552 ,
++    0xe0553 ,
++    0xe0554 ,
++    0xe0555 ,
++    0xe0556 ,
++    0xe0557 ,
++    0xe0558 ,
++    0xe0559 ,
++    0xe055a ,
++    0xe055b ,
++    0xe055c ,
++    0xe055d ,
++    0xe055e ,
++    0xe055f ,
++    0xe0560 ,
++    0xe0561 ,
++    0xe0562 ,
++    0xe0563 ,
++    0xe0564 ,
++    0xe0565 ,
++    0xe0566 ,
++    0xe0567 ,
++    0xe0568 ,
++    0xe0569 ,
++    0xe056a ,
++    0xe056b ,
++    0xe056c ,
++    0xe056d ,
++    0xe056e ,
++    0xe056f ,
++    0xe0570 ,
++    0xe0571 ,
++    0xe0572 ,
++    0xe0573 ,
++    0xe0574 ,
++    0xe0575 ,
++    0xe0576 ,
++    0xe0577 ,
++    0xe0578 ,
++    0xe0579 ,
++    0xe057a ,
++    0xe057b ,
++    0xe057c ,
++    0xe057d ,
++    0xe057e ,
++    0xe057f ,
++    0xe0580 ,
++    0xe0581 ,
++    0xe0582 ,
++    0xe0583 ,
++    0xe0584 ,
++    0xe0585 ,
++    0xe0586 ,
++    0xe0587 ,
++    0xe0588 ,
++    0xe0589 ,
++    0xe058a ,
++    0xe058b ,
++    0xe058c ,
++    0xe058d ,
++    0xe058e ,
++    0xe058f ,
++    0xe0590 ,
++    0xe0591 ,
++    0xe0592 ,
++    0xe0593 ,
++    0xe0594 ,
++    0xe0595 ,
++    0xe0596 ,
++    0xe0597 ,
++    0xe0598 ,
++    0xe0599 ,
++    0xe059a ,
++    0xe059b ,
++    0xe059c ,
++    0xe059d ,
++    0xe059e ,
++    0xe059f ,
++    0xe05a0 ,
++    0xe05a1 ,
++    0xe05a2 ,
++    0xe05a3 ,
++    0xe05a4 ,
++    0xe05a5 ,
++    0xe05a6 ,
++    0xe05a7 ,
++    0xe05a8 ,
++    0xe05a9 ,
++    0xe05aa ,
++    0xe05ab ,
++    0xe05ac ,
++    0xe05ad ,
++    0xe05ae ,
++    0xe05af ,
++    0xe05b0 ,
++    0xe05b1 ,
++    0xe05b2 ,
++    0xe05b3 ,
++    0xe05b4 ,
++    0xe05b5 ,
++    0xe05b6 ,
++    0xe05b7 ,
++    0xe05b8 ,
++    0xe05b9 ,
++    0xe05ba ,
++    0xe05bb ,
++    0xe05bc ,
++    0xe05bd ,
++    0xe05be ,
++    0xe05bf ,
++    0xe05c0 ,
++    0xe05c1 ,
++    0xe05c2 ,
++    0xe05c3 ,
++    0xe05c4 ,
++    0xe05c5 ,
++    0xe05c6 ,
++    0xe05c7 ,
++    0xe05c8 ,
++    0xe05c9 ,
++    0xe05ca ,
++    0xe05cb ,
++    0xe05cc ,
++    0xe05cd ,
++    0xe05ce ,
++    0xe05cf ,
++    0xe05d0 ,
++    0xe05d1 ,
++    0xe05d2 ,
++    0xe05d3 ,
++    0xe05d4 ,
++    0xe05d5 ,
++    0xe05d6 ,
++    0xe05d7 ,
++    0xe05d8 ,
++    0xe05d9 ,
++    0xe05da ,
++    0xe05db ,
++    0xe05dc ,
++    0xe05dd ,
++    0xe05de ,
++    0xe05df ,
++    0xe05e0 ,
++    0xe05e1 ,
++    0xe05e2 ,
++    0xe05e3 ,
++    0xe05e4 ,
++    0xe05e5 ,
++    0xe05e6 ,
++    0xe05e7 ,
++    0xe05e8 ,
++    0xe05e9 ,
++    0xe05ea ,
++    0xe05eb ,
++    0xe05ec ,
++    0xe05ed ,
++    0xe05ee ,
++    0xe05ef ,
++    0xe05f0 ,
++    0xe05f1 ,
++    0xe05f2 ,
++    0xe05f3 ,
++    0xe05f4 ,
++    0xe05f5 ,
++    0xe05f6 ,
++    0xe05f7 ,
++    0xe05f8 ,
++    0xe05f9 ,
++    0xe05fa ,
++    0xe05fb ,
++    0xe05fc ,
++    0xe05fd ,
++    0xe05fe ,
++    0xe05ff ,
++    0xe0600 ,
++    0xe0601 ,
++    0xe0602 ,
++    0xe0603 ,
++    0xe0604 ,
++    0xe0605 ,
++    0xe0606 ,
++    0xe0607 ,
++    0xe0608 ,
++    0xe0609 ,
++    0xe060a ,
++    0xe060b ,
++    0xe060c ,
++    0xe060d ,
++    0xe060e ,
++    0xe060f ,
++    0xe0610 ,
++    0xe0611 ,
++    0xe0612 ,
++    0xe0613 ,
++    0xe0614 ,
++    0xe0615 ,
++    0xe0616 ,
++    0xe0617 ,
++    0xe0618 ,
++    0xe0619 ,
++    0xe061a ,
++    0xe061b ,
++    0xe061c ,
++    0xe061d ,
++    0xe061e ,
++    0xe061f ,
++    0xe0620 ,
++    0xe0621 ,
++    0xe0622 ,
++    0xe0623 ,
++    0xe0624 ,
++    0xe0625 ,
++    0xe0626 ,
++    0xe0627 ,
++    0xe0628 ,
++    0xe0629 ,
++    0xe062a ,
++    0xe062b ,
++    0xe062c ,
++    0xe062d ,
++    0xe062e ,
++    0xe062f ,
++    0xe0630 ,
++    0xe0631 ,
++    0xe0632 ,
++    0xe0633 ,
++    0xe0634 ,
++    0xe0635 ,
++    0xe0636 ,
++    0xe0637 ,
++    0xe0638 ,
++    0xe0639 ,
++    0xe063a ,
++    0xe063b ,
++    0xe063c ,
++    0xe063d ,
++    0xe063e ,
++    0xe063f ,
++    0xe0640 ,
++    0xe0641 ,
++    0xe0642 ,
++    0xe0643 ,
++    0xe0644 ,
++    0xe0645 ,
++    0xe0646 ,
++    0xe0647 ,
++    0xe0648 ,
++    0xe0649 ,
++    0xe064a ,
++    0xe064b ,
++    0xe064c ,
++    0xe064d ,
++    0xe064e ,
++    0xe064f ,
++    0xe0650 ,
++    0xe0651 ,
++    0xe0652 ,
++    0xe0653 ,
++    0xe0654 ,
++    0xe0655 ,
++    0xe0656 ,
++    0xe0657 ,
++    0xe0658 ,
++    0xe0659 ,
++    0xe065a ,
++    0xe065b ,
++    0xe065c ,
++    0xe065d ,
++    0xe065e ,
++    0xe065f ,
++    0xe0660 ,
++    0xe0661 ,
++    0xe0662 ,
++    0xe0663 ,
++    0xe0664 ,
++    0xe0665 ,
++    0xe0666 ,
++    0xe0667 ,
++    0xe0668 ,
++    0xe0669 ,
++    0xe066a ,
++    0xe066b ,
++    0xe066c ,
++    0xe066d ,
++    0xe066e ,
++    0xe066f ,
++    0xe0670 ,
++    0xe0671 ,
++    0xe0672 ,
++    0xe0673 ,
++    0xe0674 ,
++    0xe0675 ,
++    0xe0676 ,
++    0xe0677 ,
++    0xe0678 ,
++    0xe0679 ,
++    0xe067a ,
++    0xe067b ,
++    0xe067c ,
++    0xe067d ,
++    0xe067e ,
++    0xe067f ,
++    0xe0680 ,
++    0xe0681 ,
++    0xe0682 ,
++    0xe0683 ,
++    0xe0684 ,
++    0xe0685 ,
++    0xe0686 ,
++    0xe0687 ,
++    0xe0688 ,
++    0xe0689 ,
++    0xe068a ,
++    0xe068b ,
++    0xe068c ,
++    0xe068d ,
++    0xe068e ,
++    0xe068f ,
++    0xe0690 ,
++    0xe0691 ,
++    0xe0692 ,
++    0xe0693 ,
++    0xe0694 ,
++    0xe0695 ,
++    0xe0696 ,
++    0xe0697 ,
++    0xe0698 ,
++    0xe0699 ,
++    0xe069a ,
++    0xe069b ,
++    0xe069c ,
++    0xe069d ,
++    0xe069e ,
++    0xe069f ,
++    0xe06a0 ,
++    0xe06a1 ,
++    0xe06a2 ,
++    0xe06a3 ,
++    0xe06a4 ,
++    0xe06a5 ,
++    0xe06a6 ,
++    0xe06a7 ,
++    0xe06a8 ,
++    0xe06a9 ,
++    0xe06aa ,
++    0xe06ab ,
++    0xe06ac ,
++    0xe06ad ,
++    0xe06ae ,
++    0xe06af ,
++    0xe06b0 ,
++    0xe06b1 ,
++    0xe06b2 ,
++    0xe06b3 ,
++    0xe06b4 ,
++    0xe06b5 ,
++    0xe06b6 ,
++    0xe06b7 ,
++    0xe06b8 ,
++    0xe06b9 ,
++    0xe06ba ,
++    0xe06bb ,
++    0xe06bc ,
++    0xe06bd ,
++    0xe06be ,
++    0xe06bf ,
++    0xe06c0 ,
++    0xe06c1 ,
++    0xe06c2 ,
++    0xe06c3 ,
++    0xe06c4 ,
++    0xe06c5 ,
++    0xe06c6 ,
++    0xe06c7 ,
++    0xe06c8 ,
++    0xe06c9 ,
++    0xe06ca ,
++    0xe06cb ,
++    0xe06cc ,
++    0xe06cd ,
++    0xe06ce ,
++    0xe06cf ,
++    0xe06d0 ,
++    0xe06d1 ,
++    0xe06d2 ,
++    0xe06d3 ,
++    0xe06d4 ,
++    0xe06d5 ,
++    0xe06d6 ,
++    0xe06d7 ,
++    0xe06d8 ,
++    0xe06d9 ,
++    0xe06da ,
++    0xe06db ,
++    0xe06dc ,
++    0xe06dd ,
++    0xe06de ,
++    0xe06df ,
++    0xe06e0 ,
++    0xe06e1 ,
++    0xe06e2 ,
++    0xe06e3 ,
++    0xe06e4 ,
++    0xe06e5 ,
++    0xe06e6 ,
++    0xe06e7 ,
++    0xe06e8 ,
++    0xe06e9 ,
++    0xe06ea ,
++    0xe06eb ,
++    0xe06ec ,
++    0xe06ed ,
++    0xe06ee ,
++    0xe06ef ,
++    0xe06f0 ,
++    0xe06f1 ,
++    0xe06f2 ,
++    0xe06f3 ,
++    0xe06f4 ,
++    0xe06f5 ,
++    0xe06f6 ,
++    0xe06f7 ,
++    0xe06f8 ,
++    0xe06f9 ,
++    0xe06fa ,
++    0xe06fb ,
++    0xe06fc ,
++    0xe06fd ,
++    0xe06fe ,
++    0xe06ff ,
++    0xe0700 ,
++    0xe0701 ,
++    0xe0702 ,
++    0xe0703 ,
++    0xe0704 ,
++    0xe0705 ,
++    0xe0706 ,
++    0xe0707 ,
++    0xe0708 ,
++    0xe0709 ,
++    0xe070a ,
++    0xe070b ,
++    0xe070c ,
++    0xe070d ,
++    0xe070e ,
++    0xe070f ,
++    0xe0710 ,
++    0xe0711 ,
++    0xe0712 ,
++    0xe0713 ,
++    0xe0714 ,
++    0xe0715 ,
++    0xe0716 ,
++    0xe0717 ,
++    0xe0718 ,
++    0xe0719 ,
++    0xe071a ,
++    0xe071b ,
++    0xe071c ,
++    0xe071d ,
++    0xe071e ,
++    0xe071f ,
++    0xe0720 ,
++    0xe0721 ,
++    0xe0722 ,
++    0xe0723 ,
++    0xe0724 ,
++    0xe0725 ,
++    0xe0726 ,
++    0xe0727 ,
++    0xe0728 ,
++    0xe0729 ,
++    0xe072a ,
++    0xe072b ,
++    0xe072c ,
++    0xe072d ,
++    0xe072e ,
++    0xe072f ,
++    0xe0730 ,
++    0xe0731 ,
++    0xe0732 ,
++    0xe0733 ,
++    0xe0734 ,
++    0xe0735 ,
++    0xe0736 ,
++    0xe0737 ,
++    0xe0738 ,
++    0xe0739 ,
++    0xe073a ,
++    0xe073b ,
++    0xe073c ,
++    0xe073d ,
++    0xe073e ,
++    0xe073f ,
++    0xe0740 ,
++    0xe0741 ,
++    0xe0742 ,
++    0xe0743 ,
++    0xe0744 ,
++    0xe0745 ,
++    0xe0746 ,
++    0xe0747 ,
++    0xe0748 ,
++    0xe0749 ,
++    0xe074a ,
++    0xe074b ,
++    0xe074c ,
++    0xe074d ,
++    0xe074e ,
++    0xe074f ,
++    0xe0750 ,
++    0xe0751 ,
++    0xe0752 ,
++    0xe0753 ,
++    0xe0754 ,
++    0xe0755 ,
++    0xe0756 ,
++    0xe0757 ,
++    0xe0758 ,
++    0xe0759 ,
++    0xe075a ,
++    0xe075b ,
++    0xe075c ,
++    0xe075d ,
++    0xe075e ,
++    0xe075f ,
++    0xe0760 ,
++    0xe0761 ,
++    0xe0762 ,
++    0xe0763 ,
++    0xe0764 ,
++    0xe0765 ,
++    0xe0766 ,
++    0xe0767 ,
++    0xe0768 ,
++    0xe0769 ,
++    0xe076a ,
++    0xe076b ,
++    0xe076c ,
++    0xe076d ,
++    0xe076e ,
++    0xe076f ,
++    0xe0770 ,
++    0xe0771 ,
++    0xe0772 ,
++    0xe0773 ,
++    0xe0774 ,
++    0xe0775 ,
++    0xe0776 ,
++    0xe0777 ,
++    0xe0778 ,
++    0xe0779 ,
++    0xe077a ,
++    0xe077b ,
++    0xe077c ,
++    0xe077d ,
++    0xe077e ,
++    0xe077f ,
++    0xe0780 ,
++    0xe0781 ,
++    0xe0782 ,
++    0xe0783 ,
++    0xe0784 ,
++    0xe0785 ,
++    0xe0786 ,
++    0xe0787 ,
++    0xe0788 ,
++    0xe0789 ,
++    0xe078a ,
++    0xe078b ,
++    0xe078c ,
++    0xe078d ,
++    0xe078e ,
++    0xe078f ,
++    0xe0790 ,
++    0xe0791 ,
++    0xe0792 ,
++    0xe0793 ,
++    0xe0794 ,
++    0xe0795 ,
++    0xe0796 ,
++    0xe0797 ,
++    0xe0798 ,
++    0xe0799 ,
++    0xe079a ,
++    0xe079b ,
++    0xe079c ,
++    0xe079d ,
++    0xe079e ,
++    0xe079f ,
++    0xe07a0 ,
++    0xe07a1 ,
++    0xe07a2 ,
++    0xe07a3 ,
++    0xe07a4 ,
++    0xe07a5 ,
++    0xe07a6 ,
++    0xe07a7 ,
++    0xe07a8 ,
++    0xe07a9 ,
++    0xe07aa ,
++    0xe07ab ,
++    0xe07ac ,
++    0xe07ad ,
++    0xe07ae ,
++    0xe07af ,
++    0xe07b0 ,
++    0xe07b1 ,
++    0xe07b2 ,
++    0xe07b3 ,
++    0xe07b4 ,
++    0xe07b5 ,
++    0xe07b6 ,
++    0xe07b7 ,
++    0xe07b8 ,
++    0xe07b9 ,
++    0xe07ba ,
++    0xe07bb ,
++    0xe07bc ,
++    0xe07bd ,
++    0xe07be ,
++    0xe07bf ,
++    0xe07c0 ,
++    0xe07c1 ,
++    0xe07c2 ,
++    0xe07c3 ,
++    0xe07c4 ,
++    0xe07c5 ,
++    0xe07c6 ,
++    0xe07c7 ,
++    0xe07c8 ,
++    0xe07c9 ,
++    0xe07ca ,
++    0xe07cb ,
++    0xe07cc ,
++    0xe07cd ,
++    0xe07ce ,
++    0xe07cf ,
++    0xe07d0 ,
++    0xe07d1 ,
++    0xe07d2 ,
++    0xe07d3 ,
++    0xe07d4 ,
++    0xe07d5 ,
++    0xe07d6 ,
++    0xe07d7 ,
++    0xe07d8 ,
++    0xe07d9 ,
++    0xe07da ,
++    0xe07db ,
++    0xe07dc ,
++    0xe07dd ,
++    0xe07de ,
++    0xe07df ,
++    0xe07e0 ,
++    0xe07e1 ,
++    0xe07e2 ,
++    0xe07e3 ,
++    0xe07e4 ,
++    0xe07e5 ,
++    0xe07e6 ,
++    0xe07e7 ,
++    0xe07e8 ,
++    0xe07e9 ,
++    0xe07ea ,
++    0xe07eb ,
++    0xe07ec ,
++    0xe07ed ,
++    0xe07ee ,
++    0xe07ef ,
++    0xe07f0 ,
++    0xe07f1 ,
++    0xe07f2 ,
++    0xe07f3 ,
++    0xe07f4 ,
++    0xe07f5 ,
++    0xe07f6 ,
++    0xe07f7 ,
++    0xe07f8 ,
++    0xe07f9 ,
++    0xe07fa ,
++    0xe07fb ,
++    0xe07fc ,
++    0xe07fd ,
++    0xe07fe ,
++    0xe07ff ,
++    0xe0800 ,
++    0xe0801 ,
++    0xe0802 ,
++    0xe0803 ,
++    0xe0804 ,
++    0xe0805 ,
++    0xe0806 ,
++    0xe0807 ,
++    0xe0808 ,
++    0xe0809 ,
++    0xe080a ,
++    0xe080b ,
++    0xe080c ,
++    0xe080d ,
++    0xe080e ,
++    0xe080f ,
++    0xe0810 ,
++    0xe0811 ,
++    0xe0812 ,
++    0xe0813 ,
++    0xe0814 ,
++    0xe0815 ,
++    0xe0816 ,
++    0xe0817 ,
++    0xe0818 ,
++    0xe0819 ,
++    0xe081a ,
++    0xe081b ,
++    0xe081c ,
++    0xe081d ,
++    0xe081e ,
++    0xe081f ,
++    0xe0820 ,
++    0xe0821 ,
++    0xe0822 ,
++    0xe0823 ,
++    0xe0824 ,
++    0xe0825 ,
++    0xe0826 ,
++    0xe0827 ,
++    0xe0828 ,
++    0xe0829 ,
++    0xe082a ,
++    0xe082b ,
++    0xe082c ,
++    0xe082d ,
++    0xe082e ,
++    0xe082f ,
++    0xe0830 ,
++    0xe0831 ,
++    0xe0832 ,
++    0xe0833 ,
++    0xe0834 ,
++    0xe0835 ,
++    0xe0836 ,
++    0xe0837 ,
++    0xe0838 ,
++    0xe0839 ,
++    0xe083a ,
++    0xe083b ,
++    0xe083c ,
++    0xe083d ,
++    0xe083e ,
++    0xe083f ,
++    0xe0840 ,
++    0xe0841 ,
++    0xe0842 ,
++    0xe0843 ,
++    0xe0844 ,
++    0xe0845 ,
++    0xe0846 ,
++    0xe0847 ,
++    0xe0848 ,
++    0xe0849 ,
++    0xe084a ,
++    0xe084b ,
++    0xe084c ,
++    0xe084d ,
++    0xe084e ,
++    0xe084f ,
++    0xe0850 ,
++    0xe0851 ,
++    0xe0852 ,
++    0xe0853 ,
++    0xe0854 ,
++    0xe0855 ,
++    0xe0856 ,
++    0xe0857 ,
++    0xe0858 ,
++    0xe0859 ,
++    0xe085a ,
++    0xe085b ,
++    0xe085c ,
++    0xe085d ,
++    0xe085e ,
++    0xe085f ,
++    0xe0860 ,
++    0xe0861 ,
++    0xe0862 ,
++    0xe0863 ,
++    0xe0864 ,
++    0xe0865 ,
++    0xe0866 ,
++    0xe0867 ,
++    0xe0868 ,
++    0xe0869 ,
++    0xe086a ,
++    0xe086b ,
++    0xe086c ,
++    0xe086d ,
++    0xe086e ,
++    0xe086f ,
++    0xe0870 ,
++    0xe0871 ,
++    0xe0872 ,
++    0xe0873 ,
++    0xe0874 ,
++    0xe0875 ,
++    0xe0876 ,
++    0xe0877 ,
++    0xe0878 ,
++    0xe0879 ,
++    0xe087a ,
++    0xe087b ,
++    0xe087c ,
++    0xe087d ,
++    0xe087e ,
++    0xe087f ,
++    0xe0880 ,
++    0xe0881 ,
++    0xe0882 ,
++    0xe0883 ,
++    0xe0884 ,
++    0xe0885 ,
++    0xe0886 ,
++    0xe0887 ,
++    0xe0888 ,
++    0xe0889 ,
++    0xe088a ,
++    0xe088b ,
++    0xe088c ,
++    0xe088d ,
++    0xe088e ,
++    0xe088f ,
++    0xe0890 ,
++    0xe0891 ,
++    0xe0892 ,
++    0xe0893 ,
++    0xe0894 ,
++    0xe0895 ,
++    0xe0896 ,
++    0xe0897 ,
++    0xe0898 ,
++    0xe0899 ,
++    0xe089a ,
++    0xe089b ,
++    0xe089c ,
++    0xe089d ,
++    0xe089e ,
++    0xe089f ,
++    0xe08a0 ,
++    0xe08a1 ,
++    0xe08a2 ,
++    0xe08a3 ,
++    0xe08a4 ,
++    0xe08a5 ,
++    0xe08a6 ,
++    0xe08a7 ,
++    0xe08a8 ,
++    0xe08a9 ,
++    0xe08aa ,
++    0xe08ab ,
++    0xe08ac ,
++    0xe08ad ,
++    0xe08ae ,
++    0xe08af ,
++    0xe08b0 ,
++    0xe08b1 ,
++    0xe08b2 ,
++    0xe08b3 ,
++    0xe08b4 ,
++    0xe08b5 ,
++    0xe08b6 ,
++    0xe08b7 ,
++    0xe08b8 ,
++    0xe08b9 ,
++    0xe08ba ,
++    0xe08bb ,
++    0xe08bc ,
++    0xe08bd ,
++    0xe08be ,
++    0xe08bf ,
++    0xe08c0 ,
++    0xe08c1 ,
++    0xe08c2 ,
++    0xe08c3 ,
++    0xe08c4 ,
++    0xe08c5 ,
++    0xe08c6 ,
++    0xe08c7 ,
++    0xe08c8 ,
++    0xe08c9 ,
++    0xe08ca ,
++    0xe08cb ,
++    0xe08cc ,
++    0xe08cd ,
++    0xe08ce ,
++    0xe08cf ,
++    0xe08d0 ,
++    0xe08d1 ,
++    0xe08d2 ,
++    0xe08d3 ,
++    0xe08d4 ,
++    0xe08d5 ,
++    0xe08d6 ,
++    0xe08d7 ,
++    0xe08d8 ,
++    0xe08d9 ,
++    0xe08da ,
++    0xe08db ,
++    0xe08dc ,
++    0xe08dd ,
++    0xe08de ,
++    0xe08df ,
++    0xe08e0 ,
++    0xe08e1 ,
++    0xe08e2 ,
++    0xe08e3 ,
++    0xe08e4 ,
++    0xe08e5 ,
++    0xe08e6 ,
++    0xe08e7 ,
++    0xe08e8 ,
++    0xe08e9 ,
++    0xe08ea ,
++    0xe08eb ,
++    0xe08ec ,
++    0xe08ed ,
++    0xe08ee ,
++    0xe08ef ,
++    0xe08f0 ,
++    0xe08f1 ,
++    0xe08f2 ,
++    0xe08f3 ,
++    0xe08f4 ,
++    0xe08f5 ,
++    0xe08f6 ,
++    0xe08f7 ,
++    0xe08f8 ,
++    0xe08f9 ,
++    0xe08fa ,
++    0xe08fb ,
++    0xe08fc ,
++    0xe08fd ,
++    0xe08fe ,
++    0xe08ff ,
++    0xe0900 ,
++    0xe0901 ,
++    0xe0902 ,
++    0xe0903 ,
++    0xe0904 ,
++    0xe0905 ,
++    0xe0906 ,
++    0xe0907 ,
++    0xe0908 ,
++    0xe0909 ,
++    0xe090a ,
++    0xe090b ,
++    0xe090c ,
++    0xe090d ,
++    0xe090e ,
++    0xe090f ,
++    0xe0910 ,
++    0xe0911 ,
++    0xe0912 ,
++    0xe0913 ,
++    0xe0914 ,
++    0xe0915 ,
++    0xe0916 ,
++    0xe0917 ,
++    0xe0918 ,
++    0xe0919 ,
++    0xe091a ,
++    0xe091b ,
++    0xe091c ,
++    0xe091d ,
++    0xe091e ,
++    0xe091f ,
++    0xe0920 ,
++    0xe0921 ,
++    0xe0922 ,
++    0xe0923 ,
++    0xe0924 ,
++    0xe0925 ,
++    0xe0926 ,
++    0xe0927 ,
++    0xe0928 ,
++    0xe0929 ,
++    0xe092a ,
++    0xe092b ,
++    0xe092c ,
++    0xe092d ,
++    0xe092e ,
++    0xe092f ,
++    0xe0930 ,
++    0xe0931 ,
++    0xe0932 ,
++    0xe0933 ,
++    0xe0934 ,
++    0xe0935 ,
++    0xe0936 ,
++    0xe0937 ,
++    0xe0938 ,
++    0xe0939 ,
++    0xe093a ,
++    0xe093b ,
++    0xe093c ,
++    0xe093d ,
++    0xe093e ,
++    0xe093f ,
++    0xe0940 ,
++    0xe0941 ,
++    0xe0942 ,
++    0xe0943 ,
++    0xe0944 ,
++    0xe0945 ,
++    0xe0946 ,
++    0xe0947 ,
++    0xe0948 ,
++    0xe0949 ,
++    0xe094a ,
++    0xe094b ,
++    0xe094c ,
++    0xe094d ,
++    0xe094e ,
++    0xe094f ,
++    0xe0950 ,
++    0xe0951 ,
++    0xe0952 ,
++    0xe0953 ,
++    0xe0954 ,
++    0xe0955 ,
++    0xe0956 ,
++    0xe0957 ,
++    0xe0958 ,
++    0xe0959 ,
++    0xe095a ,
++    0xe095b ,
++    0xe095c ,
++    0xe095d ,
++    0xe095e ,
++    0xe095f ,
++    0xe0960 ,
++    0xe0961 ,
++    0xe0962 ,
++    0xe0963 ,
++    0xe0964 ,
++    0xe0965 ,
++    0xe0966 ,
++    0xe0967 ,
++    0xe0968 ,
++    0xe0969 ,
++    0xe096a ,
++    0xe096b ,
++    0xe096c ,
++    0xe096d ,
++    0xe096e ,
++    0xe096f ,
++    0xe0970 ,
++    0xe0971 ,
++    0xe0972 ,
++    0xe0973 ,
++    0xe0974 ,
++    0xe0975 ,
++    0xe0976 ,
++    0xe0977 ,
++    0xe0978 ,
++    0xe0979 ,
++    0xe097a ,
++    0xe097b ,
++    0xe097c ,
++    0xe097d ,
++    0xe097e ,
++    0xe097f ,
++    0xe0980 ,
++    0xe0981 ,
++    0xe0982 ,
++    0xe0983 ,
++    0xe0984 ,
++    0xe0985 ,
++    0xe0986 ,
++    0xe0987 ,
++    0xe0988 ,
++    0xe0989 ,
++    0xe098a ,
++    0xe098b ,
++    0xe098c ,
++    0xe098d ,
++    0xe098e ,
++    0xe098f ,
++    0xe0990 ,
++    0xe0991 ,
++    0xe0992 ,
++    0xe0993 ,
++    0xe0994 ,
++    0xe0995 ,
++    0xe0996 ,
++    0xe0997 ,
++    0xe0998 ,
++    0xe0999 ,
++    0xe099a ,
++    0xe099b ,
++    0xe099c ,
++    0xe099d ,
++    0xe099e ,
++    0xe099f ,
++    0xe09a0 ,
++    0xe09a1 ,
++    0xe09a2 ,
++    0xe09a3 ,
++    0xe09a4 ,
++    0xe09a5 ,
++    0xe09a6 ,
++    0xe09a7 ,
++    0xe09a8 ,
++    0xe09a9 ,
++    0xe09aa ,
++    0xe09ab ,
++    0xe09ac ,
++    0xe09ad ,
++    0xe09ae ,
++    0xe09af ,
++    0xe09b0 ,
++    0xe09b1 ,
++    0xe09b2 ,
++    0xe09b3 ,
++    0xe09b4 ,
++    0xe09b5 ,
++    0xe09b6 ,
++    0xe09b7 ,
++    0xe09b8 ,
++    0xe09b9 ,
++    0xe09ba ,
++    0xe09bb ,
++    0xe09bc ,
++    0xe09bd ,
++    0xe09be ,
++    0xe09bf ,
++    0xe09c0 ,
++    0xe09c1 ,
++    0xe09c2 ,
++    0xe09c3 ,
++    0xe09c4 ,
++    0xe09c5 ,
++    0xe09c6 ,
++    0xe09c7 ,
++    0xe09c8 ,
++    0xe09c9 ,
++    0xe09ca ,
++    0xe09cb ,
++    0xe09cc ,
++    0xe09cd ,
++    0xe09ce ,
++    0xe09cf ,
++    0xe09d0 ,
++    0xe09d1 ,
++    0xe09d2 ,
++    0xe09d3 ,
++    0xe09d4 ,
++    0xe09d5 ,
++    0xe09d6 ,
++    0xe09d7 ,
++    0xe09d8 ,
++    0xe09d9 ,
++    0xe09da ,
++    0xe09db ,
++    0xe09dc ,
++    0xe09dd ,
++    0xe09de ,
++    0xe09df ,
++    0xe09e0 ,
++    0xe09e1 ,
++    0xe09e2 ,
++    0xe09e3 ,
++    0xe09e4 ,
++    0xe09e5 ,
++    0xe09e6 ,
++    0xe09e7 ,
++    0xe09e8 ,
++    0xe09e9 ,
++    0xe09ea ,
++    0xe09eb ,
++    0xe09ec ,
++    0xe09ed ,
++    0xe09ee ,
++    0xe09ef ,
++    0xe09f0 ,
++    0xe09f1 ,
++    0xe09f2 ,
++    0xe09f3 ,
++    0xe09f4 ,
++    0xe09f5 ,
++    0xe09f6 ,
++    0xe09f7 ,
++    0xe09f8 ,
++    0xe09f9 ,
++    0xe09fa ,
++    0xe09fb ,
++    0xe09fc ,
++    0xe09fd ,
++    0xe09fe ,
++    0xe09ff ,
++    0xe0a00 ,
++    0xe0a01 ,
++    0xe0a02 ,
++    0xe0a03 ,
++    0xe0a04 ,
++    0xe0a05 ,
++    0xe0a06 ,
++    0xe0a07 ,
++    0xe0a08 ,
++    0xe0a09 ,
++    0xe0a0a ,
++    0xe0a0b ,
++    0xe0a0c ,
++    0xe0a0d ,
++    0xe0a0e ,
++    0xe0a0f ,
++    0xe0a10 ,
++    0xe0a11 ,
++    0xe0a12 ,
++    0xe0a13 ,
++    0xe0a14 ,
++    0xe0a15 ,
++    0xe0a16 ,
++    0xe0a17 ,
++    0xe0a18 ,
++    0xe0a19 ,
++    0xe0a1a ,
++    0xe0a1b ,
++    0xe0a1c ,
++    0xe0a1d ,
++    0xe0a1e ,
++    0xe0a1f ,
++    0xe0a20 ,
++    0xe0a21 ,
++    0xe0a22 ,
++    0xe0a23 ,
++    0xe0a24 ,
++    0xe0a25 ,
++    0xe0a26 ,
++    0xe0a27 ,
++    0xe0a28 ,
++    0xe0a29 ,
++    0xe0a2a ,
++    0xe0a2b ,
++    0xe0a2c ,
++    0xe0a2d ,
++    0xe0a2e ,
++    0xe0a2f ,
++    0xe0a30 ,
++    0xe0a31 ,
++    0xe0a32 ,
++    0xe0a33 ,
++    0xe0a34 ,
++    0xe0a35 ,
++    0xe0a36 ,
++    0xe0a37 ,
++    0xe0a38 ,
++    0xe0a39 ,
++    0xe0a3a ,
++    0xe0a3b ,
++    0xe0a3c ,
++    0xe0a3d ,
++    0xe0a3e ,
++    0xe0a3f ,
++    0xe0a40 ,
++    0xe0a41 ,
++    0xe0a42 ,
++    0xe0a43 ,
++    0xe0a44 ,
++    0xe0a45 ,
++    0xe0a46 ,
++    0xe0a47 ,
++    0xe0a48 ,
++    0xe0a49 ,
++    0xe0a4a ,
++    0xe0a4b ,
++    0xe0a4c ,
++    0xe0a4d ,
++    0xe0a4e ,
++    0xe0a4f ,
++    0xe0a50 ,
++    0xe0a51 ,
++    0xe0a52 ,
++    0xe0a53 ,
++    0xe0a54 ,
++    0xe0a55 ,
++    0xe0a56 ,
++    0xe0a57 ,
++    0xe0a58 ,
++    0xe0a59 ,
++    0xe0a5a ,
++    0xe0a5b ,
++    0xe0a5c ,
++    0xe0a5d ,
++    0xe0a5e ,
++    0xe0a5f ,
++    0xe0a60 ,
++    0xe0a61 ,
++    0xe0a62 ,
++    0xe0a63 ,
++    0xe0a64 ,
++    0xe0a65 ,
++    0xe0a66 ,
++    0xe0a67 ,
++    0xe0a68 ,
++    0xe0a69 ,
++    0xe0a6a ,
++    0xe0a6b ,
++    0xe0a6c ,
++    0xe0a6d ,
++    0xe0a6e ,
++    0xe0a6f ,
++    0xe0a70 ,
++    0xe0a71 ,
++    0xe0a72 ,
++    0xe0a73 ,
++    0xe0a74 ,
++    0xe0a75 ,
++    0xe0a76 ,
++    0xe0a77 ,
++    0xe0a78 ,
++    0xe0a79 ,
++    0xe0a7a ,
++    0xe0a7b ,
++    0xe0a7c ,
++    0xe0a7d ,
++    0xe0a7e ,
++    0xe0a7f ,
++    0xe0a80 ,
++    0xe0a81 ,
++    0xe0a82 ,
++    0xe0a83 ,
++    0xe0a84 ,
++    0xe0a85 ,
++    0xe0a86 ,
++    0xe0a87 ,
++    0xe0a88 ,
++    0xe0a89 ,
++    0xe0a8a ,
++    0xe0a8b ,
++    0xe0a8c ,
++    0xe0a8d ,
++    0xe0a8e ,
++    0xe0a8f ,
++    0xe0a90 ,
++    0xe0a91 ,
++    0xe0a92 ,
++    0xe0a93 ,
++    0xe0a94 ,
++    0xe0a95 ,
++    0xe0a96 ,
++    0xe0a97 ,
++    0xe0a98 ,
++    0xe0a99 ,
++    0xe0a9a ,
++    0xe0a9b ,
++    0xe0a9c ,
++    0xe0a9d ,
++    0xe0a9e ,
++    0xe0a9f ,
++    0xe0aa0 ,
++    0xe0aa1 ,
++    0xe0aa2 ,
++    0xe0aa3 ,
++    0xe0aa4 ,
++    0xe0aa5 ,
++    0xe0aa6 ,
++    0xe0aa7 ,
++    0xe0aa8 ,
++    0xe0aa9 ,
++    0xe0aaa ,
++    0xe0aab ,
++    0xe0aac ,
++    0xe0aad ,
++    0xe0aae ,
++    0xe0aaf ,
++    0xe0ab0 ,
++    0xe0ab1 ,
++    0xe0ab2 ,
++    0xe0ab3 ,
++    0xe0ab4 ,
++    0xe0ab5 ,
++    0xe0ab6 ,
++    0xe0ab7 ,
++    0xe0ab8 ,
++    0xe0ab9 ,
++    0xe0aba ,
++    0xe0abb ,
++    0xe0abc ,
++    0xe0abd ,
++    0xe0abe ,
++    0xe0abf ,
++    0xe0ac0 ,
++    0xe0ac1 ,
++    0xe0ac2 ,
++    0xe0ac3 ,
++    0xe0ac4 ,
++    0xe0ac5 ,
++    0xe0ac6 ,
++    0xe0ac7 ,
++    0xe0ac8 ,
++    0xe0ac9 ,
++    0xe0aca ,
++    0xe0acb ,
++    0xe0acc ,
++    0xe0acd ,
++    0xe0ace ,
++    0xe0acf ,
++    0xe0ad0 ,
++    0xe0ad1 ,
++    0xe0ad2 ,
++    0xe0ad3 ,
++    0xe0ad4 ,
++    0xe0ad5 ,
++    0xe0ad6 ,
++    0xe0ad7 ,
++    0xe0ad8 ,
++    0xe0ad9 ,
++    0xe0ada ,
++    0xe0adb ,
++    0xe0adc ,
++    0xe0add ,
++    0xe0ade ,
++    0xe0adf ,
++    0xe0ae0 ,
++    0xe0ae1 ,
++    0xe0ae2 ,
++    0xe0ae3 ,
++    0xe0ae4 ,
++    0xe0ae5 ,
++    0xe0ae6 ,
++    0xe0ae7 ,
++    0xe0ae8 ,
++    0xe0ae9 ,
++    0xe0aea ,
++    0xe0aeb ,
++    0xe0aec ,
++    0xe0aed ,
++    0xe0aee ,
++    0xe0aef ,
++    0xe0af0 ,
++    0xe0af1 ,
++    0xe0af2 ,
++    0xe0af3 ,
++    0xe0af4 ,
++    0xe0af5 ,
++    0xe0af6 ,
++    0xe0af7 ,
++    0xe0af8 ,
++    0xe0af9 ,
++    0xe0afa ,
++    0xe0afb ,
++    0xe0afc ,
++    0xe0afd ,
++    0xe0afe ,
++    0xe0aff ,
++    0xe0b00 ,
++    0xe0b01 ,
++    0xe0b02 ,
++    0xe0b03 ,
++    0xe0b04 ,
++    0xe0b05 ,
++    0xe0b06 ,
++    0xe0b07 ,
++    0xe0b08 ,
++    0xe0b09 ,
++    0xe0b0a ,
++    0xe0b0b ,
++    0xe0b0c ,
++    0xe0b0d ,
++    0xe0b0e ,
++    0xe0b0f ,
++    0xe0b10 ,
++    0xe0b11 ,
++    0xe0b12 ,
++    0xe0b13 ,
++    0xe0b14 ,
++    0xe0b15 ,
++    0xe0b16 ,
++    0xe0b17 ,
++    0xe0b18 ,
++    0xe0b19 ,
++    0xe0b1a ,
++    0xe0b1b ,
++    0xe0b1c ,
++    0xe0b1d ,
++    0xe0b1e ,
++    0xe0b1f ,
++    0xe0b20 ,
++    0xe0b21 ,
++    0xe0b22 ,
++    0xe0b23 ,
++    0xe0b24 ,
++    0xe0b25 ,
++    0xe0b26 ,
++    0xe0b27 ,
++    0xe0b28 ,
++    0xe0b29 ,
++    0xe0b2a ,
++    0xe0b2b ,
++    0xe0b2c ,
++    0xe0b2d ,
++    0xe0b2e ,
++    0xe0b2f ,
++    0xe0b30 ,
++    0xe0b31 ,
++    0xe0b32 ,
++    0xe0b33 ,
++    0xe0b34 ,
++    0xe0b35 ,
++    0xe0b36 ,
++    0xe0b37 ,
++    0xe0b38 ,
++    0xe0b39 ,
++    0xe0b3a ,
++    0xe0b3b ,
++    0xe0b3c ,
++    0xe0b3d ,
++    0xe0b3e ,
++    0xe0b3f ,
++    0xe0b40 ,
++    0xe0b41 ,
++    0xe0b42 ,
++    0xe0b43 ,
++    0xe0b44 ,
++    0xe0b45 ,
++    0xe0b46 ,
++    0xe0b47 ,
++    0xe0b48 ,
++    0xe0b49 ,
++    0xe0b4a ,
++    0xe0b4b ,
++    0xe0b4c ,
++    0xe0b4d ,
++    0xe0b4e ,
++    0xe0b4f ,
++    0xe0b50 ,
++    0xe0b51 ,
++    0xe0b52 ,
++    0xe0b53 ,
++    0xe0b54 ,
++    0xe0b55 ,
++    0xe0b56 ,
++    0xe0b57 ,
++    0xe0b58 ,
++    0xe0b59 ,
++    0xe0b5a ,
++    0xe0b5b ,
++    0xe0b5c ,
++    0xe0b5d ,
++    0xe0b5e ,
++    0xe0b5f ,
++    0xe0b60 ,
++    0xe0b61 ,
++    0xe0b62 ,
++    0xe0b63 ,
++    0xe0b64 ,
++    0xe0b65 ,
++    0xe0b66 ,
++    0xe0b67 ,
++    0xe0b68 ,
++    0xe0b69 ,
++    0xe0b6a ,
++    0xe0b6b ,
++    0xe0b6c ,
++    0xe0b6d ,
++    0xe0b6e ,
++    0xe0b6f ,
++    0xe0b70 ,
++    0xe0b71 ,
++    0xe0b72 ,
++    0xe0b73 ,
++    0xe0b74 ,
++    0xe0b75 ,
++    0xe0b76 ,
++    0xe0b77 ,
++    0xe0b78 ,
++    0xe0b79 ,
++    0xe0b7a ,
++    0xe0b7b ,
++    0xe0b7c ,
++    0xe0b7d ,
++    0xe0b7e ,
++    0xe0b7f ,
++    0xe0b80 ,
++    0xe0b81 ,
++    0xe0b82 ,
++    0xe0b83 ,
++    0xe0b84 ,
++    0xe0b85 ,
++    0xe0b86 ,
++    0xe0b87 ,
++    0xe0b88 ,
++    0xe0b89 ,
++    0xe0b8a ,
++    0xe0b8b ,
++    0xe0b8c ,
++    0xe0b8d ,
++    0xe0b8e ,
++    0xe0b8f ,
++    0xe0b90 ,
++    0xe0b91 ,
++    0xe0b92 ,
++    0xe0b93 ,
++    0xe0b94 ,
++    0xe0b95 ,
++    0xe0b96 ,
++    0xe0b97 ,
++    0xe0b98 ,
++    0xe0b99 ,
++    0xe0b9a ,
++    0xe0b9b ,
++    0xe0b9c ,
++    0xe0b9d ,
++    0xe0b9e ,
++    0xe0b9f ,
++    0xe0ba0 ,
++    0xe0ba1 ,
++    0xe0ba2 ,
++    0xe0ba3 ,
++    0xe0ba4 ,
++    0xe0ba5 ,
++    0xe0ba6 ,
++    0xe0ba7 ,
++    0xe0ba8 ,
++    0xe0ba9 ,
++    0xe0baa ,
++    0xe0bab ,
++    0xe0bac ,
++    0xe0bad ,
++    0xe0bae ,
++    0xe0baf ,
++    0xe0bb0 ,
++    0xe0bb1 ,
++    0xe0bb2 ,
++    0xe0bb3 ,
++    0xe0bb4 ,
++    0xe0bb5 ,
++    0xe0bb6 ,
++    0xe0bb7 ,
++    0xe0bb8 ,
++    0xe0bb9 ,
++    0xe0bba ,
++    0xe0bbb ,
++    0xe0bbc ,
++    0xe0bbd ,
++    0xe0bbe ,
++    0xe0bbf ,
++    0xe0bc0 ,
++    0xe0bc1 ,
++    0xe0bc2 ,
++    0xe0bc3 ,
++    0xe0bc4 ,
++    0xe0bc5 ,
++    0xe0bc6 ,
++    0xe0bc7 ,
++    0xe0bc8 ,
++    0xe0bc9 ,
++    0xe0bca ,
++    0xe0bcb ,
++    0xe0bcc ,
++    0xe0bcd ,
++    0xe0bce ,
++    0xe0bcf ,
++    0xe0bd0 ,
++    0xe0bd1 ,
++    0xe0bd2 ,
++    0xe0bd3 ,
++    0xe0bd4 ,
++    0xe0bd5 ,
++    0xe0bd6 ,
++    0xe0bd7 ,
++    0xe0bd8 ,
++    0xe0bd9 ,
++    0xe0bda ,
++    0xe0bdb ,
++    0xe0bdc ,
++    0xe0bdd ,
++    0xe0bde ,
++    0xe0bdf ,
++    0xe0be0 ,
++    0xe0be1 ,
++    0xe0be2 ,
++    0xe0be3 ,
++    0xe0be4 ,
++    0xe0be5 ,
++    0xe0be6 ,
++    0xe0be7 ,
++    0xe0be8 ,
++    0xe0be9 ,
++    0xe0bea ,
++    0xe0beb ,
++    0xe0bec ,
++    0xe0bed ,
++    0xe0bee ,
++    0xe0bef ,
++    0xe0bf0 ,
++    0xe0bf1 ,
++    0xe0bf2 ,
++    0xe0bf3 ,
++    0xe0bf4 ,
++    0xe0bf5 ,
++    0xe0bf6 ,
++    0xe0bf7 ,
++    0xe0bf8 ,
++    0xe0bf9 ,
++    0xe0bfa ,
++    0xe0bfb ,
++    0xe0bfc ,
++    0xe0bfd ,
++    0xe0bfe ,
++    0xe0bff ,
++    0xe0c00 ,
++    0xe0c01 ,
++    0xe0c02 ,
++    0xe0c03 ,
++    0xe0c04 ,
++    0xe0c05 ,
++    0xe0c06 ,
++    0xe0c07 ,
++    0xe0c08 ,
++    0xe0c09 ,
++    0xe0c0a ,
++    0xe0c0b ,
++    0xe0c0c ,
++    0xe0c0d ,
++    0xe0c0e ,
++    0xe0c0f ,
++    0xe0c10 ,
++    0xe0c11 ,
++    0xe0c12 ,
++    0xe0c13 ,
++    0xe0c14 ,
++    0xe0c15 ,
++    0xe0c16 ,
++    0xe0c17 ,
++    0xe0c18 ,
++    0xe0c19 ,
++    0xe0c1a ,
++    0xe0c1b ,
++    0xe0c1c ,
++    0xe0c1d ,
++    0xe0c1e ,
++    0xe0c1f ,
++    0xe0c20 ,
++    0xe0c21 ,
++    0xe0c22 ,
++    0xe0c23 ,
++    0xe0c24 ,
++    0xe0c25 ,
++    0xe0c26 ,
++    0xe0c27 ,
++    0xe0c28 ,
++    0xe0c29 ,
++    0xe0c2a ,
++    0xe0c2b ,
++    0xe0c2c ,
++    0xe0c2d ,
++    0xe0c2e ,
++    0xe0c2f ,
++    0xe0c30 ,
++    0xe0c31 ,
++    0xe0c32 ,
++    0xe0c33 ,
++    0xe0c34 ,
++    0xe0c35 ,
++    0xe0c36 ,
++    0xe0c37 ,
++    0xe0c38 ,
++    0xe0c39 ,
++    0xe0c3a ,
++    0xe0c3b ,
++    0xe0c3c ,
++    0xe0c3d ,
++    0xe0c3e ,
++    0xe0c3f ,
++    0xe0c40 ,
++    0xe0c41 ,
++    0xe0c42 ,
++    0xe0c43 ,
++    0xe0c44 ,
++    0xe0c45 ,
++    0xe0c46 ,
++    0xe0c47 ,
++    0xe0c48 ,
++    0xe0c49 ,
++    0xe0c4a ,
++    0xe0c4b ,
++    0xe0c4c ,
++    0xe0c4d ,
++    0xe0c4e ,
++    0xe0c4f ,
++    0xe0c50 ,
++    0xe0c51 ,
++    0xe0c52 ,
++    0xe0c53 ,
++    0xe0c54 ,
++    0xe0c55 ,
++    0xe0c56 ,
++    0xe0c57 ,
++    0xe0c58 ,
++    0xe0c59 ,
++    0xe0c5a ,
++    0xe0c5b ,
++    0xe0c5c ,
++    0xe0c5d ,
++    0xe0c5e ,
++    0xe0c5f ,
++    0xe0c60 ,
++    0xe0c61 ,
++    0xe0c62 ,
++    0xe0c63 ,
++    0xe0c64 ,
++    0xe0c65 ,
++    0xe0c66 ,
++    0xe0c67 ,
++    0xe0c68 ,
++    0xe0c69 ,
++    0xe0c6a ,
++    0xe0c6b ,
++    0xe0c6c ,
++    0xe0c6d ,
++    0xe0c6e ,
++    0xe0c6f ,
++    0xe0c70 ,
++    0xe0c71 ,
++    0xe0c72 ,
++    0xe0c73 ,
++    0xe0c74 ,
++    0xe0c75 ,
++    0xe0c76 ,
++    0xe0c77 ,
++    0xe0c78 ,
++    0xe0c79 ,
++    0xe0c7a ,
++    0xe0c7b ,
++    0xe0c7c ,
++    0xe0c7d ,
++    0xe0c7e ,
++    0xe0c7f ,
++    0xe0c80 ,
++    0xe0c81 ,
++    0xe0c82 ,
++    0xe0c83 ,
++    0xe0c84 ,
++    0xe0c85 ,
++    0xe0c86 ,
++    0xe0c87 ,
++    0xe0c88 ,
++    0xe0c89 ,
++    0xe0c8a ,
++    0xe0c8b ,
++    0xe0c8c ,
++    0xe0c8d ,
++    0xe0c8e ,
++    0xe0c8f ,
++    0xe0c90 ,
++    0xe0c91 ,
++    0xe0c92 ,
++    0xe0c93 ,
++    0xe0c94 ,
++    0xe0c95 ,
++    0xe0c96 ,
++    0xe0c97 ,
++    0xe0c98 ,
++    0xe0c99 ,
++    0xe0c9a ,
++    0xe0c9b ,
++    0xe0c9c ,
++    0xe0c9d ,
++    0xe0c9e ,
++    0xe0c9f ,
++    0xe0ca0 ,
++    0xe0ca1 ,
++    0xe0ca2 ,
++    0xe0ca3 ,
++    0xe0ca4 ,
++    0xe0ca5 ,
++    0xe0ca6 ,
++    0xe0ca7 ,
++    0xe0ca8 ,
++    0xe0ca9 ,
++    0xe0caa ,
++    0xe0cab ,
++    0xe0cac ,
++    0xe0cad ,
++    0xe0cae ,
++    0xe0caf ,
++    0xe0cb0 ,
++    0xe0cb1 ,
++    0xe0cb2 ,
++    0xe0cb3 ,
++    0xe0cb4 ,
++    0xe0cb5 ,
++    0xe0cb6 ,
++    0xe0cb7 ,
++    0xe0cb8 ,
++    0xe0cb9 ,
++    0xe0cba ,
++    0xe0cbb ,
++    0xe0cbc ,
++    0xe0cbd ,
++    0xe0cbe ,
++    0xe0cbf ,
++    0xe0cc0 ,
++    0xe0cc1 ,
++    0xe0cc2 ,
++    0xe0cc3 ,
++    0xe0cc4 ,
++    0xe0cc5 ,
++    0xe0cc6 ,
++    0xe0cc7 ,
++    0xe0cc8 ,
++    0xe0cc9 ,
++    0xe0cca ,
++    0xe0ccb ,
++    0xe0ccc ,
++    0xe0ccd ,
++    0xe0cce ,
++    0xe0ccf ,
++    0xe0cd0 ,
++    0xe0cd1 ,
++    0xe0cd2 ,
++    0xe0cd3 ,
++    0xe0cd4 ,
++    0xe0cd5 ,
++    0xe0cd6 ,
++    0xe0cd7 ,
++    0xe0cd8 ,
++    0xe0cd9 ,
++    0xe0cda ,
++    0xe0cdb ,
++    0xe0cdc ,
++    0xe0cdd ,
++    0xe0cde ,
++    0xe0cdf ,
++    0xe0ce0 ,
++    0xe0ce1 ,
++    0xe0ce2 ,
++    0xe0ce3 ,
++    0xe0ce4 ,
++    0xe0ce5 ,
++    0xe0ce6 ,
++    0xe0ce7 ,
++    0xe0ce8 ,
++    0xe0ce9 ,
++    0xe0cea ,
++    0xe0ceb ,
++    0xe0cec ,
++    0xe0ced ,
++    0xe0cee ,
++    0xe0cef ,
++    0xe0cf0 ,
++    0xe0cf1 ,
++    0xe0cf2 ,
++    0xe0cf3 ,
++    0xe0cf4 ,
++    0xe0cf5 ,
++    0xe0cf6 ,
++    0xe0cf7 ,
++    0xe0cf8 ,
++    0xe0cf9 ,
++    0xe0cfa ,
++    0xe0cfb ,
++    0xe0cfc ,
++    0xe0cfd ,
++    0xe0cfe ,
++    0xe0cff ,
++    0xe0d00 ,
++    0xe0d01 ,
++    0xe0d02 ,
++    0xe0d03 ,
++    0xe0d04 ,
++    0xe0d05 ,
++    0xe0d06 ,
++    0xe0d07 ,
++    0xe0d08 ,
++    0xe0d09 ,
++    0xe0d0a ,
++    0xe0d0b ,
++    0xe0d0c ,
++    0xe0d0d ,
++    0xe0d0e ,
++    0xe0d0f ,
++    0xe0d10 ,
++    0xe0d11 ,
++    0xe0d12 ,
++    0xe0d13 ,
++    0xe0d14 ,
++    0xe0d15 ,
++    0xe0d16 ,
++    0xe0d17 ,
++    0xe0d18 ,
++    0xe0d19 ,
++    0xe0d1a ,
++    0xe0d1b ,
++    0xe0d1c ,
++    0xe0d1d ,
++    0xe0d1e ,
++    0xe0d1f ,
++    0xe0d20 ,
++    0xe0d21 ,
++    0xe0d22 ,
++    0xe0d23 ,
++    0xe0d24 ,
++    0xe0d25 ,
++    0xe0d26 ,
++    0xe0d27 ,
++    0xe0d28 ,
++    0xe0d29 ,
++    0xe0d2a ,
++    0xe0d2b ,
++    0xe0d2c ,
++    0xe0d2d ,
++    0xe0d2e ,
++    0xe0d2f ,
++    0xe0d30 ,
++    0xe0d31 ,
++    0xe0d32 ,
++    0xe0d33 ,
++    0xe0d34 ,
++    0xe0d35 ,
++    0xe0d36 ,
++    0xe0d37 ,
++    0xe0d38 ,
++    0xe0d39 ,
++    0xe0d3a ,
++    0xe0d3b ,
++    0xe0d3c ,
++    0xe0d3d ,
++    0xe0d3e ,
++    0xe0d3f ,
++    0xe0d40 ,
++    0xe0d41 ,
++    0xe0d42 ,
++    0xe0d43 ,
++    0xe0d44 ,
++    0xe0d45 ,
++    0xe0d46 ,
++    0xe0d47 ,
++    0xe0d48 ,
++    0xe0d49 ,
++    0xe0d4a ,
++    0xe0d4b ,
++    0xe0d4c ,
++    0xe0d4d ,
++    0xe0d4e ,
++    0xe0d4f ,
++    0xe0d50 ,
++    0xe0d51 ,
++    0xe0d52 ,
++    0xe0d53 ,
++    0xe0d54 ,
++    0xe0d55 ,
++    0xe0d56 ,
++    0xe0d57 ,
++    0xe0d58 ,
++    0xe0d59 ,
++    0xe0d5a ,
++    0xe0d5b ,
++    0xe0d5c ,
++    0xe0d5d ,
++    0xe0d5e ,
++    0xe0d5f ,
++    0xe0d60 ,
++    0xe0d61 ,
++    0xe0d62 ,
++    0xe0d63 ,
++    0xe0d64 ,
++    0xe0d65 ,
++    0xe0d66 ,
++    0xe0d67 ,
++    0xe0d68 ,
++    0xe0d69 ,
++    0xe0d6a ,
++    0xe0d6b ,
++    0xe0d6c ,
++    0xe0d6d ,
++    0xe0d6e ,
++    0xe0d6f ,
++    0xe0d70 ,
++    0xe0d71 ,
++    0xe0d72 ,
++    0xe0d73 ,
++    0xe0d74 ,
++    0xe0d75 ,
++    0xe0d76 ,
++    0xe0d77 ,
++    0xe0d78 ,
++    0xe0d79 ,
++    0xe0d7a ,
++    0xe0d7b ,
++    0xe0d7c ,
++    0xe0d7d ,
++    0xe0d7e ,
++    0xe0d7f ,
++    0xe0d80 ,
++    0xe0d81 ,
++    0xe0d82 ,
++    0xe0d83 ,
++    0xe0d84 ,
++    0xe0d85 ,
++    0xe0d86 ,
++    0xe0d87 ,
++    0xe0d88 ,
++    0xe0d89 ,
++    0xe0d8a ,
++    0xe0d8b ,
++    0xe0d8c ,
++    0xe0d8d ,
++    0xe0d8e ,
++    0xe0d8f ,
++    0xe0d90 ,
++    0xe0d91 ,
++    0xe0d92 ,
++    0xe0d93 ,
++    0xe0d94 ,
++    0xe0d95 ,
++    0xe0d96 ,
++    0xe0d97 ,
++    0xe0d98 ,
++    0xe0d99 ,
++    0xe0d9a ,
++    0xe0d9b ,
++    0xe0d9c ,
++    0xe0d9d ,
++    0xe0d9e ,
++    0xe0d9f ,
++    0xe0da0 ,
++    0xe0da1 ,
++    0xe0da2 ,
++    0xe0da3 ,
++    0xe0da4 ,
++    0xe0da5 ,
++    0xe0da6 ,
++    0xe0da7 ,
++    0xe0da8 ,
++    0xe0da9 ,
++    0xe0daa ,
++    0xe0dab ,
++    0xe0dac ,
++    0xe0dad ,
++    0xe0dae ,
++    0xe0daf ,
++    0xe0db0 ,
++    0xe0db1 ,
++    0xe0db2 ,
++    0xe0db3 ,
++    0xe0db4 ,
++    0xe0db5 ,
++    0xe0db6 ,
++    0xe0db7 ,
++    0xe0db8 ,
++    0xe0db9 ,
++    0xe0dba ,
++    0xe0dbb ,
++    0xe0dbc ,
++    0xe0dbd ,
++    0xe0dbe ,
++    0xe0dbf ,
++    0xe0dc0 ,
++    0xe0dc1 ,
++    0xe0dc2 ,
++    0xe0dc3 ,
++    0xe0dc4 ,
++    0xe0dc5 ,
++    0xe0dc6 ,
++    0xe0dc7 ,
++    0xe0dc8 ,
++    0xe0dc9 ,
++    0xe0dca ,
++    0xe0dcb ,
++    0xe0dcc ,
++    0xe0dcd ,
++    0xe0dce ,
++    0xe0dcf ,
++    0xe0dd0 ,
++    0xe0dd1 ,
++    0xe0dd2 ,
++    0xe0dd3 ,
++    0xe0dd4 ,
++    0xe0dd5 ,
++    0xe0dd6 ,
++    0xe0dd7 ,
++    0xe0dd8 ,
++    0xe0dd9 ,
++    0xe0dda ,
++    0xe0ddb ,
++    0xe0ddc ,
++    0xe0ddd ,
++    0xe0dde ,
++    0xe0ddf ,
++    0xe0de0 ,
++    0xe0de1 ,
++    0xe0de2 ,
++    0xe0de3 ,
++    0xe0de4 ,
++    0xe0de5 ,
++    0xe0de6 ,
++    0xe0de7 ,
++    0xe0de8 ,
++    0xe0de9 ,
++    0xe0dea ,
++    0xe0deb ,
++    0xe0dec ,
++    0xe0ded ,
++    0xe0dee ,
++    0xe0def ,
++    0xe0df0 ,
++    0xe0df1 ,
++    0xe0df2 ,
++    0xe0df3 ,
++    0xe0df4 ,
++    0xe0df5 ,
++    0xe0df6 ,
++    0xe0df7 ,
++    0xe0df8 ,
++    0xe0df9 ,
++    0xe0dfa ,
++    0xe0dfb ,
++    0xe0dfc ,
++    0xe0dfd ,
++    0xe0dfe ,
++    0xe0dff ,
++    0xe0e00 ,
++    0xe0e01 ,
++    0xe0e02 ,
++    0xe0e03 ,
++    0xe0e04 ,
++    0xe0e05 ,
++    0xe0e06 ,
++    0xe0e07 ,
++    0xe0e08 ,
++    0xe0e09 ,
++    0xe0e0a ,
++    0xe0e0b ,
++    0xe0e0c ,
++    0xe0e0d ,
++    0xe0e0e ,
++    0xe0e0f ,
++    0xe0e10 ,
++    0xe0e11 ,
++    0xe0e12 ,
++    0xe0e13 ,
++    0xe0e14 ,
++    0xe0e15 ,
++    0xe0e16 ,
++    0xe0e17 ,
++    0xe0e18 ,
++    0xe0e19 ,
++    0xe0e1a ,
++    0xe0e1b ,
++    0xe0e1c ,
++    0xe0e1d ,
++    0xe0e1e ,
++    0xe0e1f ,
++    0xe0e20 ,
++    0xe0e21 ,
++    0xe0e22 ,
++    0xe0e23 ,
++    0xe0e24 ,
++    0xe0e25 ,
++    0xe0e26 ,
++    0xe0e27 ,
++    0xe0e28 ,
++    0xe0e29 ,
++    0xe0e2a ,
++    0xe0e2b ,
++    0xe0e2c ,
++    0xe0e2d ,
++    0xe0e2e ,
++    0xe0e2f ,
++    0xe0e30 ,
++    0xe0e31 ,
++    0xe0e32 ,
++    0xe0e33 ,
++    0xe0e34 ,
++    0xe0e35 ,
++    0xe0e36 ,
++    0xe0e37 ,
++    0xe0e38 ,
++    0xe0e39 ,
++    0xe0e3a ,
++    0xe0e3b ,
++    0xe0e3c ,
++    0xe0e3d ,
++    0xe0e3e ,
++    0xe0e3f ,
++    0xe0e40 ,
++    0xe0e41 ,
++    0xe0e42 ,
++    0xe0e43 ,
++    0xe0e44 ,
++    0xe0e45 ,
++    0xe0e46 ,
++    0xe0e47 ,
++    0xe0e48 ,
++    0xe0e49 ,
++    0xe0e4a ,
++    0xe0e4b ,
++    0xe0e4c ,
++    0xe0e4d ,
++    0xe0e4e ,
++    0xe0e4f ,
++    0xe0e50 ,
++    0xe0e51 ,
++    0xe0e52 ,
++    0xe0e53 ,
++    0xe0e54 ,
++    0xe0e55 ,
++    0xe0e56 ,
++    0xe0e57 ,
++    0xe0e58 ,
++    0xe0e59 ,
++    0xe0e5a ,
++    0xe0e5b ,
++    0xe0e5c ,
++    0xe0e5d ,
++    0xe0e5e ,
++    0xe0e5f ,
++    0xe0e60 ,
++    0xe0e61 ,
++    0xe0e62 ,
++    0xe0e63 ,
++    0xe0e64 ,
++    0xe0e65 ,
++    0xe0e66 ,
++    0xe0e67 ,
++    0xe0e68 ,
++    0xe0e69 ,
++    0xe0e6a ,
++    0xe0e6b ,
++    0xe0e6c ,
++    0xe0e6d ,
++    0xe0e6e ,
++    0xe0e6f ,
++    0xe0e70 ,
++    0xe0e71 ,
++    0xe0e72 ,
++    0xe0e73 ,
++    0xe0e74 ,
++    0xe0e75 ,
++    0xe0e76 ,
++    0xe0e77 ,
++    0xe0e78 ,
++    0xe0e79 ,
++    0xe0e7a ,
++    0xe0e7b ,
++    0xe0e7c ,
++    0xe0e7d ,
++    0xe0e7e ,
++    0xe0e7f ,
++    0xe0e80 ,
++    0xe0e81 ,
++    0xe0e82 ,
++    0xe0e83 ,
++    0xe0e84 ,
++    0xe0e85 ,
++    0xe0e86 ,
++    0xe0e87 ,
++    0xe0e88 ,
++    0xe0e89 ,
++    0xe0e8a ,
++    0xe0e8b ,
++    0xe0e8c ,
++    0xe0e8d ,
++    0xe0e8e ,
++    0xe0e8f ,
++    0xe0e90 ,
++    0xe0e91 ,
++    0xe0e92 ,
++    0xe0e93 ,
++    0xe0e94 ,
++    0xe0e95 ,
++    0xe0e96 ,
++    0xe0e97 ,
++    0xe0e98 ,
++    0xe0e99 ,
++    0xe0e9a ,
++    0xe0e9b ,
++    0xe0e9c ,
++    0xe0e9d ,
++    0xe0e9e ,
++    0xe0e9f ,
++    0xe0ea0 ,
++    0xe0ea1 ,
++    0xe0ea2 ,
++    0xe0ea3 ,
++    0xe0ea4 ,
++    0xe0ea5 ,
++    0xe0ea6 ,
++    0xe0ea7 ,
++    0xe0ea8 ,
++    0xe0ea9 ,
++    0xe0eaa ,
++    0xe0eab ,
++    0xe0eac ,
++    0xe0ead ,
++    0xe0eae ,
++    0xe0eaf ,
++    0xe0eb0 ,
++    0xe0eb1 ,
++    0xe0eb2 ,
++    0xe0eb3 ,
++    0xe0eb4 ,
++    0xe0eb5 ,
++    0xe0eb6 ,
++    0xe0eb7 ,
++    0xe0eb8 ,
++    0xe0eb9 ,
++    0xe0eba ,
++    0xe0ebb ,
++    0xe0ebc ,
++    0xe0ebd ,
++    0xe0ebe ,
++    0xe0ebf ,
++    0xe0ec0 ,
++    0xe0ec1 ,
++    0xe0ec2 ,
++    0xe0ec3 ,
++    0xe0ec4 ,
++    0xe0ec5 ,
++    0xe0ec6 ,
++    0xe0ec7 ,
++    0xe0ec8 ,
++    0xe0ec9 ,
++    0xe0eca ,
++    0xe0ecb ,
++    0xe0ecc ,
++    0xe0ecd ,
++    0xe0ece ,
++    0xe0ecf ,
++    0xe0ed0 ,
++    0xe0ed1 ,
++    0xe0ed2 ,
++    0xe0ed3 ,
++    0xe0ed4 ,
++    0xe0ed5 ,
++    0xe0ed6 ,
++    0xe0ed7 ,
++    0xe0ed8 ,
++    0xe0ed9 ,
++    0xe0eda ,
++    0xe0edb ,
++    0xe0edc ,
++    0xe0edd ,
++    0xe0ede ,
++    0xe0edf ,
++    0xe0ee0 ,
++    0xe0ee1 ,
++    0xe0ee2 ,
++    0xe0ee3 ,
++    0xe0ee4 ,
++    0xe0ee5 ,
++    0xe0ee6 ,
++    0xe0ee7 ,
++    0xe0ee8 ,
++    0xe0ee9 ,
++    0xe0eea ,
++    0xe0eeb ,
++    0xe0eec ,
++    0xe0eed ,
++    0xe0eee ,
++    0xe0eef ,
++    0xe0ef0 ,
++    0xe0ef1 ,
++    0xe0ef2 ,
++    0xe0ef3 ,
++    0xe0ef4 ,
++    0xe0ef5 ,
++    0xe0ef6 ,
++    0xe0ef7 ,
++    0xe0ef8 ,
++    0xe0ef9 ,
++    0xe0efa ,
++    0xe0efb ,
++    0xe0efc ,
++    0xe0efd ,
++    0xe0efe ,
++    0xe0eff ,
++    0xe0f00 ,
++    0xe0f01 ,
++    0xe0f02 ,
++    0xe0f03 ,
++    0xe0f04 ,
++    0xe0f05 ,
++    0xe0f06 ,
++    0xe0f07 ,
++    0xe0f08 ,
++    0xe0f09 ,
++    0xe0f0a ,
++    0xe0f0b ,
++    0xe0f0c ,
++    0xe0f0d ,
++    0xe0f0e ,
++    0xe0f0f ,
++    0xe0f10 ,
++    0xe0f11 ,
++    0xe0f12 ,
++    0xe0f13 ,
++    0xe0f14 ,
++    0xe0f15 ,
++    0xe0f16 ,
++    0xe0f17 ,
++    0xe0f18 ,
++    0xe0f19 ,
++    0xe0f1a ,
++    0xe0f1b ,
++    0xe0f1c ,
++    0xe0f1d ,
++    0xe0f1e ,
++    0xe0f1f ,
++    0xe0f20 ,
++    0xe0f21 ,
++    0xe0f22 ,
++    0xe0f23 ,
++    0xe0f24 ,
++    0xe0f25 ,
++    0xe0f26 ,
++    0xe0f27 ,
++    0xe0f28 ,
++    0xe0f29 ,
++    0xe0f2a ,
++    0xe0f2b ,
++    0xe0f2c ,
++    0xe0f2d ,
++    0xe0f2e ,
++    0xe0f2f ,
++    0xe0f30 ,
++    0xe0f31 ,
++    0xe0f32 ,
++    0xe0f33 ,
++    0xe0f34 ,
++    0xe0f35 ,
++    0xe0f36 ,
++    0xe0f37 ,
++    0xe0f38 ,
++    0xe0f39 ,
++    0xe0f3a ,
++    0xe0f3b ,
++    0xe0f3c ,
++    0xe0f3d ,
++    0xe0f3e ,
++    0xe0f3f ,
++    0xe0f40 ,
++    0xe0f41 ,
++    0xe0f42 ,
++    0xe0f43 ,
++    0xe0f44 ,
++    0xe0f45 ,
++    0xe0f46 ,
++    0xe0f47 ,
++    0xe0f48 ,
++    0xe0f49 ,
++    0xe0f4a ,
++    0xe0f4b ,
++    0xe0f4c ,
++    0xe0f4d ,
++    0xe0f4e ,
++    0xe0f4f ,
++    0xe0f50 ,
++    0xe0f51 ,
++    0xe0f52 ,
++    0xe0f53 ,
++    0xe0f54 ,
++    0xe0f55 ,
++    0xe0f56 ,
++    0xe0f57 ,
++    0xe0f58 ,
++    0xe0f59 ,
++    0xe0f5a ,
++    0xe0f5b ,
++    0xe0f5c ,
++    0xe0f5d ,
++    0xe0f5e ,
++    0xe0f5f ,
++    0xe0f60 ,
++    0xe0f61 ,
++    0xe0f62 ,
++    0xe0f63 ,
++    0xe0f64 ,
++    0xe0f65 ,
++    0xe0f66 ,
++    0xe0f67 ,
++    0xe0f68 ,
++    0xe0f69 ,
++    0xe0f6a ,
++    0xe0f6b ,
++    0xe0f6c ,
++    0xe0f6d ,
++    0xe0f6e ,
++    0xe0f6f ,
++    0xe0f70 ,
++    0xe0f71 ,
++    0xe0f72 ,
++    0xe0f73 ,
++    0xe0f74 ,
++    0xe0f75 ,
++    0xe0f76 ,
++    0xe0f77 ,
++    0xe0f78 ,
++    0xe0f79 ,
++    0xe0f7a ,
++    0xe0f7b ,
++    0xe0f7c ,
++    0xe0f7d ,
++    0xe0f7e ,
++    0xe0f7f ,
++    0xe0f80 ,
++    0xe0f81 ,
++    0xe0f82 ,
++    0xe0f83 ,
++    0xe0f84 ,
++    0xe0f85 ,
++    0xe0f86 ,
++    0xe0f87 ,
++    0xe0f88 ,
++    0xe0f89 ,
++    0xe0f8a ,
++    0xe0f8b ,
++    0xe0f8c ,
++    0xe0f8d ,
++    0xe0f8e ,
++    0xe0f8f ,
++    0xe0f90 ,
++    0xe0f91 ,
++    0xe0f92 ,
++    0xe0f93 ,
++    0xe0f94 ,
++    0xe0f95 ,
++    0xe0f96 ,
++    0xe0f97 ,
++    0xe0f98 ,
++    0xe0f99 ,
++    0xe0f9a ,
++    0xe0f9b ,
++    0xe0f9c ,
++    0xe0f9d ,
++    0xe0f9e ,
++    0xe0f9f ,
++    0xe0fa0 ,
++    0xe0fa1 ,
++    0xe0fa2 ,
++    0xe0fa3 ,
++    0xe0fa4 ,
++    0xe0fa5 ,
++    0xe0fa6 ,
++    0xe0fa7 ,
++    0xe0fa8 ,
++    0xe0fa9 ,
++    0xe0faa ,
++    0xe0fab ,
++    0xe0fac ,
++    0xe0fad ,
++    0xe0fae ,
++    0xe0faf ,
++    0xe0fb0 ,
++    0xe0fb1 ,
++    0xe0fb2 ,
++    0xe0fb3 ,
++    0xe0fb4 ,
++    0xe0fb5 ,
++    0xe0fb6 ,
++    0xe0fb7 ,
++    0xe0fb8 ,
++    0xe0fb9 ,
++    0xe0fba ,
++    0xe0fbb ,
++    0xe0fbc ,
++    0xe0fbd ,
++    0xe0fbe ,
++    0xe0fbf ,
++    0xe0fc0 ,
++    0xe0fc1 ,
++    0xe0fc2 ,
++    0xe0fc3 ,
++    0xe0fc4 ,
++    0xe0fc5 ,
++    0xe0fc6 ,
++    0xe0fc7 ,
++    0xe0fc8 ,
++    0xe0fc9 ,
++    0xe0fca ,
++    0xe0fcb ,
++    0xe0fcc ,
++    0xe0fcd ,
++    0xe0fce ,
++    0xe0fcf ,
++    0xe0fd0 ,
++    0xe0fd1 ,
++    0xe0fd2 ,
++    0xe0fd3 ,
++    0xe0fd4 ,
++    0xe0fd5 ,
++    0xe0fd6 ,
++    0xe0fd7 ,
++    0xe0fd8 ,
++    0xe0fd9 ,
++    0xe0fda ,
++    0xe0fdb ,
++    0xe0fdc ,
++    0xe0fdd ,
++    0xe0fde ,
++    0xe0fdf ,
++    0xe0fe0 ,
++    0xe0fe1 ,
++    0xe0fe2 ,
++    0xe0fe3 ,
++    0xe0fe4 ,
++    0xe0fe5 ,
++    0xe0fe6 ,
++    0xe0fe7 ,
++    0xe0fe8 ,
++    0xe0fe9 ,
++    0xe0fea ,
++    0xe0feb ,
++    0xe0fec ,
++    0xe0fed ,
++    0xe0fee ,
++    0xe0fef ,
++    0xe0ff0 ,
++    0xe0ff1 ,
++    0xe0ff2 ,
++    0xe0ff3 ,
++    0xe0ff4 ,
++    0xe0ff5 ,
++    0xe0ff6 ,
++    0xe0ff7 ,
++    0xe0ff8 ,
++    0xe0ff9 ,
++    0xe0ffa ,
++    0xe0ffb ,
++    0xe0ffc ,
++    0xe0ffd ,
++    0xe0ffe ,
++    0xe0fff };
++
++static FcBlanks fcBlanks = {
++    4191,
++    -1,
++    _fcBlanks
++};
++
diff --cc fontconfig/fc-blanks/makefile
index 0000000,0000000..400fc2a
new file mode 100644
--- /dev/null
+++ b/fontconfig/fc-blanks/makefile
@@@ -1,0 -1,0 +1,7 @@@
++BLANKSPY = fc-blanks.py
++BLANKS_H = fcblanks.h
++TMPL = fcblanks.tmpl.h
++
++$(BLANKS_H): $(TMPL) $(BLANKSPY)
++	python $(BLANKSPY) < $< > $(BLANKS_H)
++
diff --cc fontconfig/src/makefile
index 49f0fdd,0000000..0a42b7c
mode 100755,000000..100755
--- a/fontconfig/src/makefile
+++ b/fontconfig/src/makefile
@@@ -1,63 -1,0 +1,64 @@@
 +$(OBJDIR)\fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
 +	cp $< $<.c
 +	$(CPP) -EP -I.. $<.c | \
 +	python cleangperf.py | \
 +	gawk '/CUT_OUT_BEGIN/ { no_write=1; next; }; /CUT_OUT_END/ { no_write=0; next; }; { if (!no_write) print; next; };' - > $@.tmp
 +	mv -f $@.tmp $@
 +	rm $<.c
 +
 +$(OBJDIR)\fcobjshash.h: $(OBJDIR)\fcobjshash.gperf
 +	gperf -m 100 $< > $@
 +
 +
 +load_makefile NORELDBG=1 ..\fc-case\makefile
 +load_makefile NORELDBG=1 ..\fc-glyphname\makefile
 +load_makefile NORELDBG=1 ..\fc-lang\makefile
++load_makefile NORELDBG=1 ..\fc-blanks\makefile
 +
 +CSRCS = \
 +	fcatomic.c \
 +	fcblanks.c \
 +	fccache.c \
 +	fccfg.c \
 +	fccharset.c \
 +	fccompat.c \
 +	fcdbg.c \
 +	fcdefault.c \
 +	fcdir.c \
 +	fcformat.c \
 +	fcfreetype.c \
 +	fcfs.c \
 +	fcinit.c \
 +	fclang.c \
 +	fclist.c \
 +	fcmatch.c \
 +	fcmatrix.c \
 +	fcname.c \
 +	fcobjs.c \
 +	fcpat.c \
 +	fcrange.c \
 +	fcserialize.c \
 +	fcstat.c \
 +	fcstr.c \
 +	fcweight.c \
 +	fcxml.c \
 +	ftglue.c
 +
 +LIBRARY = libfontconfig
 +
 +PUBLIC_FILES = \
 +	..\fontconfig\fontconfig.h \
 +	fcdeprecate.h \
 +	..\fontconfig\fcprivate.h
 +
 +PUBLIC_FT_FILES = \
 +	..\fontconfig\fcfreetype.h
 +
 +INCLUDES := .. $(OBJDIR) $(INCLUDES) $(MHMAKECONF)\freetype\include $(MHMAKECONF)\libxml2\include $(MHMAKECONF)\iconv\include
 +
 +fcalias.h fcaliastail.h: makealias.py $(PUBLIC_FILES)
 +	python makealias.py . fcalias.h fcaliastail.h $(PUBLIC_FILES)
 +
 +fcftalias.h fcftaliastail.h: makealias.py $(PUBLIC_FT_FILES)
 +	python makealias.py . fcftalias.h fcftaliastail.h $(PUBLIC_FT_FILES)
 +
diff --cc libxcb/src/makefile
index d763061,0000000..107250a
mode 100644,000000..100644
--- a/libxcb/src/makefile
+++ b/libxcb/src/makefile
@@@ -1,30 -1,0 +1,31 @@@
 +SHAREDLIB=libxcb
 +
 +CSRCS = \
 +		xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
 +		xcb_list.c xcb_util.c xcb_auth.c
 +
 +DEFINES += PTW32_STATIC_LIB HAVE_GETADDRINFO LIBXCB_DLL
 +
 +INCLUDELIBFILES = \
 + $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib
 +
 +LIBDIRS=$(dir $(INCLUDELIBFILES))
 +
 +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);)
 +
 +LINKLIBS += $(PTHREADLIB)
 +
 +XCBPROTO_XCBINCLUDEDIR = ..\xcb-proto\src
 +
 +XMLFILES := $(notdir $(wildcard $(XCBPROTO_XCBINCLUDEDIR)\*.xml))
 +XMLFILES := $(filter-out xkb.xml, $(XMLFILES))
++XMLFILES := $(filter-out xprint.xml, $(XMLFILES))
 +
 +EXTSOURCES := $(XMLFILES:%.xml=%.c)
 +CSRCS += $(EXTSOURCES)
 +
 +EXTHEADERS = $(XMLFILES:%.xml=%.h)
 +
 +$(EXTHEADERS) $(EXTSOURCES): c_client.py
 +
 +load_makefile NORELDBG=1 makefile.srcs
diff --cc libxcb/src/xcb_in.c
index dfcd1ec,ad870c1..ad870c1
mode 100644,100644..100755
--- a/libxcb/src/xcb_in.c
+++ b/libxcb/src/xcb_in.c
diff --cc mesalib/src/glsl/builtin_functions.cpp
index 1a85c2d,84bbdc2..28bcfdb3
mode 100755,100644..100755
--- a/mesalib/src/glsl/builtin_functions.cpp
+++ b/mesalib/src/glsl/builtin_functions.cpp
diff --cc mesalib/src/glsl/ir.cpp
index 90c055f,54656f8..516a534
mode 100755,100644..100755
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
diff --cc mesalib/src/glsl/ir_constant_expression.cpp
index 4b521f4,388c4c2..e24cad9
mode 100755,100644..100755
--- a/mesalib/src/glsl/ir_constant_expression.cpp
+++ b/mesalib/src/glsl/ir_constant_expression.cpp
diff --cc mesalib/src/loader/Makefile.am
index 36ddba8,3d32279..3d32279
mode 100755,100644..100755
--- a/mesalib/src/loader/Makefile.am
+++ b/mesalib/src/loader/Makefile.am
diff --cc mesalib/src/loader/SConscript
index 359fc18,16d1053..16d1053
mode 100755,100644..100755
--- a/mesalib/src/loader/SConscript
+++ b/mesalib/src/loader/SConscript
diff --cc mesalib/src/mapi/glapi/gen/gl_enums.py
index 3262bab,d61618f..a756ad9
mode 100755,100644..100755
--- a/mesalib/src/mapi/glapi/gen/gl_enums.py
+++ b/mesalib/src/mapi/glapi/gen/gl_enums.py
diff --cc mesalib/src/mapi/glapi/glapi.h
index 67bf1f4,8d991fb..89fb1dc
mode 100755,100644..100755
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@@ -114,30 -99,15 +114,21 @@@ _GLAPI_EXPORT extern const void *_glapi
  
  #else
  
 -_GLAPI_EXPORT extern struct _glapi_table *_glapi_Dispatch;
 -_GLAPI_EXPORT extern void *_glapi_Context;
 +#ifdef INSERVER
 +#define SERVEXTERN _declspec(dllimport)
 +#else
 +#define SERVEXTERN _declspec(dllexport)
 +#endif
 +
 +SERVEXTERN struct _glapi_table *_glapi_Dispatch;
 +SERVEXTERN void *_glapi_Context;
  
- # ifdef THREADS
- 
- #  define GET_DISPATCH() \
+ #define GET_DISPATCH() \
       (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
  
- #  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \
+ #define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \
       (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
  
- # else
- 
- #  define GET_DISPATCH() _glapi_Dispatch
- #  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_Context
- 
- # endif
- 
  #endif /* defined (GLX_USE_TLS) */
  
  
diff --cc mesalib/src/mapi/mapi_abi.py
index d783ed3,012a5c3..012a5c3
mode 100755,100644..100755
--- a/mesalib/src/mapi/mapi_abi.py
+++ b/mesalib/src/mapi/mapi_abi.py
diff --cc mesalib/src/mesa/drivers/common/meta_blit.c
index 3406be1,bb21642..bb21642
mode 100755,100644..100755
--- a/mesalib/src/mesa/drivers/common/meta_blit.c
+++ b/mesalib/src/mesa/drivers/common/meta_blit.c
diff --cc mesalib/src/mesa/drivers/dri/swrast/swrast.c
index e42ba65,fb29078..e840590
mode 100644,100644..100755
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@@ -32,11 -32,7 +32,12 @@@
   * The back-buffer is allocated by the driver and is private.
   */
  
+ #include <stdio.h>
 +#ifdef _MSC_VER
 +#define WIN32_LEAN_AND_MEAN 1
 +#include <windows.h>
 +#endif
 +
  #include "main/api_exec.h"
  #include "main/context.h"
  #include "main/extensions.h"
diff --cc mesalib/src/mesa/main/.gitignore
index 3e81f53,8256ad7..5488540
mode 100755,100644..100755
--- a/mesalib/src/mesa/main/.gitignore
+++ b/mesalib/src/mesa/main/.gitignore
@@@ -1,14 -1,11 +1,12 @@@
 -api_exec.c
 -dispatch.h
 -enums.c
 -git_sha1.h
 -git_sha1.h.tmp
 -remap_helper.h
 -get_hash.h
 -get_hash.h.tmp
 -format_info.h
 -format_pack.c
 -format_unpack.c
 +api_exec.c
 +dispatch.h
 +enums.c
- get_es1.c
- get_es2.c
 +git_sha1.h
 +git_sha1.h.tmp
 +remap_helper.h
 +get_hash.h
 +get_hash.h.tmp
- format_info.c
++format_info.h
 +glapitable.h
 +format_pack.c
 +format_unpack.c
diff --cc mesalib/src/mesa/main/bufferobj.c
index 303b268,e1c5877..008d1aa
mode 100755,100644..100755
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
diff --cc mesalib/src/mesa/main/imports.h
index e984cfb,7921000..c211b15
mode 100755,100644..100755
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@@ -79,64 -82,11 +82,10 @@@ typedef union { GLfloat f; GLint i; GLu
  
  
  
- /**********************************************************************
-  * Math macros
-  */
- 
- #define MAX_GLUSHORT	0xffff
- #define MAX_GLUINT	0xffffffff
- 
- /* Degrees to radians conversion: */
- #define DEG2RAD (M_PI/180.0)
- 
- 
- /**
-  * \name Work-arounds for platforms that lack C99 math functions
-  */
- /*@{*/
- #if (!defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE < 600)) && !defined(_ISOC99_SOURCE) \
-    && (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)) \
-    && (!defined(_MSC_VER) || (_MSC_VER < 1400))
- #define acosf(f) ((float) acos(f))
- #define asinf(f) ((float) asin(f))
- #define atan2f(x,y) ((float) atan2(x,y))
- #define atanf(f) ((float) atan(f))
- #define ceilf(f) ((float) ceil(f))
- #define cosf(f) ((float) cos(f))
- #define coshf(f) ((float) cosh(f))
- #define expf(f) ((float) exp(f))
- #define exp2f(f) ((float) exp2(f))
- #define floorf(f) ((float) floor(f))
- #define logf(f) ((float) log(f))
- 
- #ifdef ANDROID
- #define log2f(f) (logf(f) * (float) (1.0 / M_LN2))
- #else
- #define log2f(f) ((float) log2(f))
- #endif
- 
- #define powf(x,y) ((float) pow(x,y))
- #define sinf(f) ((float) sin(f))
- #define sinhf(f) ((float) sinh(f))
- #define sqrtf(f) ((float) sqrt(f))
- #define tanf(f) ((float) tan(f))
- #define tanhf(f) ((float) tanh(f))
- #define acoshf(f) ((float) acosh(f))
- #define asinhf(f) ((float) asinh(f))
- #define atanhf(f) ((float) atanh(f))
- #endif
- 
  #if defined(_MSC_VER)
  #if _MSC_VER < 1800  /* Not req'd on VS2013 and above */
- static inline float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
- static inline float exp2f(float x) { return powf(2.0f, x); }
- static inline float log2f(float x) { return logf(x) * 1.442695041f; }
- static inline float asinhf(float x) { return logf(x + sqrtf(x * x + 1.0f)); }
- static inline float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); }
- static inline float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; }
- static inline int isblank(int ch) { return ch == ' ' || ch == '\t'; }
  #define strtoll(p, e, b) _strtoi64(p, e, b)
  #endif /* _MSC_VER < 1800 */
 -#define strcasecmp(s1, s2) _stricmp(s1, s2)
  #endif
  /*@}*/
  
diff --cc mesalib/src/mesa/main/macros.h
index 45e35a7,2d7a6a1..b225109
mode 100755,100644..100755
--- a/mesalib/src/mesa/main/macros.h
+++ b/mesalib/src/mesa/main/macros.h
@@@ -165,27 -165,27 +165,27 @@@ extern GLfloat _mesa_ubyte_to_float_col
             UB = (GLubyte) __tmp.i;					\
          } while (0)
  #else
 -#define UNCLAMPED_FLOAT_TO_UBYTE(ub, f) \
 -	ub = ((GLubyte) F_TO_I(CLAMP((f), 0.0F, 1.0F) * 255.0F))
 -#define CLAMPED_FLOAT_TO_UBYTE(ub, f) \
 -	ub = ((GLubyte) F_TO_I((f) * 255.0F))
 +#define UNCLAMPED_FLOAT_TO_UBYTE(ub, FLT) \
 +	ub = ((GLubyte) F_TO_I(CLAMP((FLT), 0.0f, 1.0f) * 255.0f))
 +#define CLAMPED_FLOAT_TO_UBYTE(ub, FLT) \
 +	ub = ((GLubyte) F_TO_I((FLT) * 255.0f))
  #endif
  
- static inline GLfloat INT_AS_FLT(GLint i)
+ static fi_type UINT_AS_UNION(GLuint u)
  {
     fi_type tmp;
-    tmp.i = i;
-    return tmp.f;
+    tmp.u = u;
+    return tmp;
  }
  
- static inline GLfloat UINT_AS_FLT(GLuint u)
+ static inline fi_type INT_AS_UNION(GLint i)
  {
     fi_type tmp;
-    tmp.u = u;
-    return tmp.f;
+    tmp.i = i;
+    return tmp;
  }
  
- static inline unsigned FLT_AS_UINT(float f)
+ static inline fi_type FLOAT_AS_UNION(GLfloat f)
  {
     fi_type tmp;
     tmp.f = f;
diff --cc mesalib/src/mesa/main/queryobj.c
index 39c7053,0842b54..9ecc7d3
mode 100644,100644..100755
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
diff --cc mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
index 835b3ac,0000000..c4533b5
mode 100644,000000..100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@@ -1,301 -1,0 +1,302 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{98AB3D51-1820-4D14-9195-75FCA6997784}</ProjectGuid>
 +    <RootNamespace>glsl_apps_compile</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>Application</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>Application</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>Application</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>Application</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">compile</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">compile</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compile</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">compile</TargetName>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories>
 +    </ClCompile>
 +    <Link>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Console</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
-       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src;..\..\..\..\src\gallium\auxiliary;..\..\..\..\src\gallium\include</AdditionalIncludeDirectories>
 +    </ClCompile>
 +    <Link>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Console</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories>
 +    </ClCompile>
 +    <Link>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Console</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <ClCompile>
-       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src;..\..\..\..\src\gallium\auxiliary;..\..\..\..\src\gallium\include</AdditionalIncludeDirectories>
 +    </ClCompile>
 +    <Link>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Console</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function_detect_recursion.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_variables.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\main.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_array_splitting.cpp" />
++    <ClCompile Include="..\..\..\..\src\glsl\opt_conditional_discard.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\standalone_scaffolding.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />
 +    <ClCompile Include="..\..\..\..\src\util\hash_table.c" />
 +    <ClCompile Include="..\..\..\..\src\util\ralloc.c" />
 +    <ClCompile Include="..\..\..\..\src\util\strtod.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">
 +      <FileType>Document</FileType>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\doflexbison.bat</Command>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\doflexbison.bat</Command>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>
 +      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>
 +      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>
 +      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>
 +      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs>
 +    </CustomBuild>
 +    <None Include="..\..\..\..\src\glsl\glsl_parser.yy">
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\dobison.bat</Command>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\dobison.bat</Command>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\dobison.bat</Command>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\dobison.bat</Command>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs>
 +      <FileType>Document</FileType>
 +    </None>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
diff --cc mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
index bbf3c6d,0000000..19aa387
mode 100644,000000..100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@@ -1,332 -1,0 +1,335 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup>
 +    <Filter Include="Source Files">
 +      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
 +      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
 +    </Filter>
 +    <Filter Include="Header Files">
 +      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
 +      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
 +    </Filter>
 +    <Filter Include="Resource Files">
 +      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
 +      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
 +    </Filter>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function_detect_recursion.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_variables.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\main.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\standalone_scaffolding.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_array_splitting.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\hash_table.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\ralloc.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\strtod.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
++    <ClCompile Include="..\..\..\..\src\glsl\opt_conditional_discard.cpp">
++      <Filter>Source Files</Filter>
++    </ClCompile>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">
 +      <Filter>Source Files</Filter>
 +    </CustomBuild>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="..\..\..\..\src\glsl\glsl_parser.yy">
 +      <Filter>Source Files</Filter>
 +    </None>
 +  </ItemGroup>
 +</Project>
diff --cc mesalib/windows/VC8/mesa/makefile
index b8b58d7,0000000..6fed319
mode 100644,000000..100644
--- a/mesalib/windows/VC8/mesa/makefile
+++ b/mesalib/windows/VC8/mesa/makefile
@@@ -1,114 -1,0 +1,114 @@@
 +
 +MHMAKESLNFILE=mesavc10.sln
 +BUILDCMD=MSBuild.exe $(MHMAKESLNFILE) /t:Build
 +
 +ifdef IS64
 +TARGETDIR=x64
 +else
 +TARGETDIR=Win32
 +endif
 +DBGBUILDCMD=$(BUILDCMD) /p:Configuration=Debug /p:Platform=$(TARGETDIR)
 +RELBUILDCMD=$(BUILDCMD) /p:Configuration=Release /p:Platform=$(TARGETDIR)
 +
 +
 +DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \
 +      $(wildcard ..\..\..\src\mesa\swrast\*.h) \
 +      $(wildcard ..\..\..\src\mesa\swrast_setup\*.c) \
 +      $(wildcard ..\..\..\src\mesa\swrast_setup\*.h) \
 +      $(wildcard ..\..\..\src\mesa\main\*.c) \
 +      $(wildcard ..\..\..\src\mesa\main\*.h) \
 +      $(wildcard ..\..\..\src\mesa\math\*.c) \
 +      $(wildcard ..\..\..\src\mesa\math\*.h) \
 +      $(wildcard ..\..\..\src\mesa\program\*.c) \
 +      $(wildcard ..\..\..\src\mesa\program\*.cpp) \
 +      $(wildcard ..\..\..\src\mesa\program\*.h) \
 +      $(wildcard ..\..\..\src\mesa\shader\*.c) \
 +      $(wildcard ..\..\..\src\mesa\shader\*.h) \
 +      $(wildcard ..\..\..\src\mesa\shader\slang\*.c) \
 +      $(wildcard ..\..\..\src\mesa\shader\slang\*.h) \
 +      $(wildcard ..\..\..\src\mesa\shader\slang\library\*.c) \
 +      $(wildcard ..\..\..\src\mesa\shader\slang\library\*.h) \
 +      $(wildcard ..\..\..\src\mesa\glapi\*.c) \
 +      $(wildcard ..\..\..\src\mesa\glapi\*.h) \
 +      $(wildcard ..\..\..\src\mesa\math\*.c) \
 +      $(wildcard ..\..\..\src\mesa\math\*.h) \
 +      $(wildcard ..\..\..\src\mesa\tnl\*.c) \
 +      $(wildcard ..\..\..\src\mesa\tnl\*.h) \
 +      $(wildcard ..\..\..\src\mesa\vbo\*.c) \
 +      $(wildcard ..\..\..\src\mesa\vbo\*.h) \
 +      $(wildcard ..\..\..\src\glsl\glcpp\*.c) \
 +      $(wildcard ..\..\..\src\glsl\glcpp\*.h) \
 +      $(wildcard ..\..\..\src\glsl\*.c) \
 +      $(wildcard ..\..\..\src\glsl\*.h) \
 +      $(wildcard ..\..\..\src\glsl\*.cpp) \
 +      $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.c) \
 +      $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.h) \
 +      $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.c) \
 +      $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.h) \
 +      $(wildcard ..\..\..\src\mesa\drivers\common\*.c) \
 +      $(wildcard ..\..\..\src\mesa\drivers\common\*.h) \
 +      ..\..\..\src\mesa\main\dispatch.h \
 +      ..\..\..\src\mesa\main\glapitable.h \
 +      ..\..\..\src\mesa\main\enums.c \
 +      ..\..\..\src\mesa\main\api_exec.c \
 +      ..\..\..\src\mesa\main\get_hash.h \
-       ..\..\..\src\mesa\main\format_info.c \
++      ..\..\..\src\mesa\main\format_info.h \
 +      ..\..\..\src\mesa\main\format_unpack.c \
 +      ..\..\..\src\mesa\main\format_pack.c \
 +      ..\..\..\src\util\format_srgb.c \
 +      ..\..\..\src\mapi\glapi\gen\glapiTemp.h \
 +      ..\..\..\src\mesa\main\remap_helper.h \
 +      ..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h
 +
 +all: $(TARGETDIR)\Release\swrast_dri.dll $(TARGETDIR)\Debug\swrast_dri.dll
 +
 +..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h: ..\..\..\src\mesa\drivers\dri\common\xmlpool\t_options.h ..\..\..\src\mesa\drivers\dri\common\xmlpool\gen_xmlpool.py
 +	cd ..\..\..\src\mesa\drivers\dri\common\xmlpool & python gen_xmlpool.py t_options.h . > options.h
 +
 +..\..\..\src\mesa\main\dispatch.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_table.py
 +	cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml -m remap_table > ..\..\..\mesa\main\dispatch.h
 +
 +..\..\..\src\mesa\main\glapitable.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_table.py
 +	cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml > ..\..\..\mesa\main\glapitable.h
 +
 +..\..\..\src\mesa\main\enums.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_enums.py
 +	cd ..\..\..\src\mapi\glapi\gen & python gl_enums.py -f gl_and_es_API.xml > ..\..\..\mesa\main\enums.c
 +
 +..\..\..\src\mesa\main\api_exec.c: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_genexec.py
 +	cd ..\..\..\src\mapi\glapi\gen & python gl_genexec.py -f gl_and_es_API.xml > ..\..\..\mesa\main\api_exec.c
 +
 +GET_HASH_GEN = ../../../src/mesa/main/get_hash_generator.py
 +..\..\..\src\mesa\main\get_hash.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml ..\..\..\src\mesa\main\get_hash_params.py $(GET_HASH_GEN)
 +	python $(GET_HASH_GEN) -f $(subst $/,/,$<) > $@
 +
 +GEN_FORMAT_INFO=../../../src/mesa/main/format_info.py
- ..\..\..\src\mesa\main\format_info.c: ..\..\..\src\mesa\main\formats.csv ..\..\..\src\mesa\main\format_parser.py $(GEN_FORMAT_INFO)
++..\..\..\src\mesa\main\format_info.h: ..\..\..\src\mesa\main\formats.csv ..\..\..\src\mesa\main\format_parser.py $(GEN_FORMAT_INFO)
 +	python $(GEN_FORMAT_INFO) $< > $@
 +
 +..\..\..\src\util\format_srgb.c: ..\..\..\src\util\format_srgb.py
 +	python $< > $@
 +
 +..\..\..\src\mesa\main\format_unpack.c: ..\..\..\src\mesa\main\format_unpack.py  ..\..\..\src\mesa\main\formats.csv
 +	python ..\..\..\src\mesa\main\format_unpack.py  ..\..\..\src\mesa\main\formats.csv > $@ 
 +
 +..\..\..\src\mesa\main\format_pack.c: ..\..\..\src\mesa\main\format_pack.py  ..\..\..\src\mesa\main\formats.csv
 +	python ..\..\..\src\mesa\main\format_pack.py  ..\..\..\src\mesa\main\formats.csv > $@ 
 +
 +REMAP_HELPER = ../../../src/mapi/glapi/gen/remap_helper.py
 +..\..\..\src\mesa\main\remap_helper.h: ..\..\..\src\mapi\glapi\gen\gl_and_es_API.xml $(REMAP_HELPER)
 +	python $(REMAP_HELPER) -f $(subst $/,/,$<) > $@
 +
 +..\..\..\src\mapi\glapi\gen\glapiTemp.h: ../../../src/mapi/glapi/gen/gl_apitemp.py
 +	cd  ..\..\..\src\mapi\glapi\gen & python gl_apitemp.py -f gl_and_es_API.xml > glapiTemp.h
 +
 +$(TARGETDIR)\Debug\swrast_dri.dll: $(DEPS)
 +	$(DBGBUILDCMD)
 +
 +$(TARGETDIR)\Release\swrast_dri.dll: $(DEPS)
 +	$(RELBUILDCMD)
 +
 +clean: cleanthis
 +
 +cleanthis:
 +	del -e Debug
 +	del -e Release
diff --cc mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 84e779c,0000000..65a9746
mode 100644,000000..100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@@ -1,512 -1,0 +1,513 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{2120C974-2717-4709-B44F-D6E6D0A56448}</ProjectGuid>
 +    <RootNamespace>mesa</RootNamespace>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>StaticLibrary</ConfigurationType>
 +    <UseOfMfc>false</UseOfMfc>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>StaticLibrary</ConfigurationType>
 +    <UseOfMfc>false</UseOfMfc>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>StaticLibrary</ConfigurationType>
 +    <UseOfMfc>false</UseOfMfc>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>StaticLibrary</ConfigurationType>
 +    <UseOfMfc>false</UseOfMfc>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreBuildEventUseInBuild>
 +    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreBuildEventUseInBuild>
 +    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreLinkEventUseInBuild>
 +    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreLinkEventUseInBuild>
 +    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>
 +    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PostBuildEventUseInBuild>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 +      <OmitFramePointers>true</OmitFramePointers>
 +      <WholeProgramOptimization>true</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 +      <BufferSecurityCheck>false</BufferSecurityCheck>
 +      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
 +    </ClCompile>
 +    <ResourceCompile>
 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <Culture>0x0409</Culture>
 +    </ResourceCompile>
 +    <Lib>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
 +    </Lib>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <ClCompile>
 +      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 +      <OmitFramePointers>true</OmitFramePointers>
 +      <WholeProgramOptimization>true</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;../../../../src/gallium/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 +      <BufferSecurityCheck>false</BufferSecurityCheck>
 +      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
 +    </ClCompile>
 +    <ResourceCompile>
 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <Culture>0x0409</Culture>
 +    </ResourceCompile>
 +    <Lib>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
 +    </Lib>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <BrowseInformation>true</BrowseInformation>
 +      <WarningLevel>Level3</WarningLevel>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 +    </ClCompile>
 +    <ResourceCompile>
 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <Culture>0x0409</Culture>
 +    </ResourceCompile>
 +    <Lib>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +    </Lib>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;../../../../src/gallium/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <BrowseInformation>true</BrowseInformation>
 +      <WarningLevel>Level3</WarningLevel>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
 +    </ClCompile>
 +    <ResourceCompile>
 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <Culture>0x0409</Culture>
 +    </ResourceCompile>
 +    <Lib>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +    </Lib>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\glsl_apps_compile\glsl_apps_compile.vcxproj">
 +      <Project>{98ab3d51-1820-4d14-9195-75fca6997784}</Project>
 +      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
 +      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function_detect_recursion.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
 +      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +      </ForcedIncludeFiles>
 +      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +      </ForcedIncludeFiles>
 +      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +      </ForcedIncludeFiles>
 +      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +      </ForcedIncludeFiles>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_variables.cpp">
 +      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +      </ForcedIncludeFiles>
 +      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +      </ForcedIncludeFiles>
 +      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +      </ForcedIncludeFiles>
 +      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +      </ForcedIncludeFiles>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_array_splitting.cpp" />
++    <ClCompile Include="..\..\..\..\src\glsl\opt_conditional_discard.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" />
 +    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
 +    <ClCompile Include="..\..\..\..\src\mapi\glapi\glapi_nop.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_blit.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\blit.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\compute.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\copyimage.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\errors.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\formatquery.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\format_unpack.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\format_utils.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\genmipmap.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\objectlabel.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pack.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\performance_monitor.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pipelineobj.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\remap.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shader_query.cpp" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_bptc.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texstorage.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\textureview.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\uniform_query.cpp" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\vdpau.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\blend.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\clear.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\clip.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\context.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\debug.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\depth.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\enable.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\enums.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\eval.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texturebarrier.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\fog.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\formats.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\get.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\string_to_uint_map.cpp" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\program.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_opt_constant_fold.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp" />
 +    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\image.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\light.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pbo.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\points.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\state.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_etc.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\samplerobj.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_noop.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_primitive_restart.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\version.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c" />
 +    <ClCompile Include="..\..\..\..\src\util\format_srgb.c" />
 +    <ClCompile Include="..\..\..\..\src\util\hash_table.c" />
 +    <ClCompile Include="..\..\..\..\src\util\ralloc.c" />
 +    <ClCompile Include="..\..\..\..\src\util\rgtc.c" />
 +    <ClCompile Include="..\..\..\..\src\util\set.c" />
 +    <ClCompile Include="..\..\..\..\src\util\strtod.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">
 +      <FileType>Document</FileType>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\doflexbison.bat</Command>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>
 +      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>
 +      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>
 +      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>
 +      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs>
 +    </CustomBuild>
 +    <None Include="..\..\..\..\src\mesa\program\program_parse.y">
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\dobison.bat</Command>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command>
 +      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\dobison.bat</Command>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>
 +      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs>
 +      <FileType>Document</FileType>
 +    </None>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
diff --cc mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index f453cdf,0000000..ffce501
mode 100644,000000..100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@@ -1,838 -1,0 +1,841 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup>
 +    <Filter Include="Source Files">
 +      <UniqueIdentifier>{8411a2f0-9621-4bb9-9aec-30713df37794}</UniqueIdentifier>
 +      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
 +    </Filter>
 +    <Filter Include="Header Files">
 +      <UniqueIdentifier>{82940400-de84-4aa3-8c90-a68fc32ae059}</UniqueIdentifier>
 +      <Extensions>h;hpp;hxx;hm;inl</Extensions>
 +    </Filter>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\blend.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\clear.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\clip.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\context.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\debug.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\depth.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\enable.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\enums.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\eval.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texturebarrier.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\fog.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\formats.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\get.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\image.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\light.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\points.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\state.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_etc.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\samplerobj.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_noop.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\version.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\program.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_opt_constant_fold.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shader_query.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\uniform_query.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\string_to_uint_map.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_variables.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_function_detect_recursion.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\linker.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pack.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pbo.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texstorage.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\errors.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_array_splitting.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_primitive_restart.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\glformats.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\formatquery.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\remap.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\objectlabel.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\performance_monitor.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\vdpau.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\textureview.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\blit.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\compute.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\genmipmap.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_blit.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\pipelineobj.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\hash_table.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\ralloc.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\format_srgb.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\format_utils.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\copyimage.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_bptc.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\rgtc.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\strtod.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\util\set.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mesa\main\format_unpack.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="..\..\..\..\src\mapi\glapi\glapi_nop.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
++    <ClCompile Include="..\..\..\..\src\glsl\opt_conditional_discard.cpp">
++      <Filter>Source Files</Filter>
++    </ClCompile>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">
 +      <Filter>Source Files</Filter>
 +    </CustomBuild>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="..\..\..\..\src\mesa\program\program_parse.y">
 +      <Filter>Source Files</Filter>
 +    </None>
 +  </ItemGroup>
 +</Project>
diff --cc mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
index d11b021,0000000..8447411
mode 100644,000000..100644
--- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@@ -1,295 -1,0 +1,295 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}</ProjectGuid>
 +    <RootNamespace>swrast_dri</RootNamespace>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <UseOfMfc>false</UseOfMfc>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <UseOfMfc>false</UseOfMfc>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <UseOfMfc>false</UseOfMfc>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <UseOfMfc>false</UseOfMfc>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <PlatformToolset>v120</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <Midl>
 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MkTypLibCompatible>true</MkTypLibCompatible>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <TargetEnvironment>Win32</TargetEnvironment>
 +      <TypeLibraryName>.\Debug/swrast_dri.tlb</TypeLibraryName>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <BrowseInformation>true</BrowseInformation>
 +      <WarningLevel>Level3</WarningLevel>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <CompileAs>Default</CompileAs>
 +    </ClCompile>
 +    <ResourceCompile>
 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <Culture>0x0409</Culture>
 +    </ResourceCompile>
 +    <Link>
 +      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servdebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MkTypLibCompatible>true</MkTypLibCompatible>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <TypeLibraryName>.\Debug/swrast_dri.tlb</TypeLibraryName>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;../../../../src/gallium/auxiliary;../../../../src/gallium/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <BrowseInformation>true</BrowseInformation>
 +      <WarningLevel>Level3</WarningLevel>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <CompileAs>Default</CompileAs>
 +    </ClCompile>
 +    <ResourceCompile>
 +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <Culture>0x0409</Culture>
 +    </ResourceCompile>
 +    <Link>
 +      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj64\servdebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <Midl>
 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MkTypLibCompatible>true</MkTypLibCompatible>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <TargetEnvironment>Win32</TargetEnvironment>
 +      <TypeLibraryName>.\Release/swrast_dri.tlb</TypeLibraryName>
 +    </Midl>
 +    <ClCompile>
 +      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 +      <OmitFramePointers>true</OmitFramePointers>
 +      <WholeProgramOptimization>true</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>NDEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <ExceptionHandling>
 +      </ExceptionHandling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <BufferSecurityCheck>false</BufferSecurityCheck>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
 +      <PrecompiledHeaderOutputFile>.\Release/swrast_dri.pch</PrecompiledHeaderOutputFile>
 +      <WarningLevel>Level3</WarningLevel>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <CompileAs>Default</CompileAs>
 +    </ClCompile>
 +    <ResourceCompile>
 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <Culture>0x0409</Culture>
 +    </ResourceCompile>
 +    <Link>
 +      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servrelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 +      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>
 +      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MkTypLibCompatible>true</MkTypLibCompatible>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <TypeLibraryName>.\Release/swrast_dri.tlb</TypeLibraryName>
 +    </Midl>
 +    <ClCompile>
 +      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
 +      <OmitFramePointers>true</OmitFramePointers>
 +      <WholeProgramOptimization>true</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;../../../../src/gallium/auxiliary;../../../../src/gallium/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>NDEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <PreprocessorDefinitions>NDEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <ExceptionHandling>
 +      </ExceptionHandling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <BufferSecurityCheck>false</BufferSecurityCheck>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
 +      <PrecompiledHeaderOutputFile>.\Release/swrast_dri.pch</PrecompiledHeaderOutputFile>
 +      <WarningLevel>Level3</WarningLevel>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <CompileAs>Default</CompileAs>
 +    </ClCompile>
 +    <ResourceCompile>
 +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <Culture>0x0409</Culture>
 +    </ResourceCompile>
 +    <Link>
 +      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
 +      <SuppressStartupBanner>true</SuppressStartupBanner>
 +      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj64\servrelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 +      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>
 +      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\..\..\..\expat\lib\xmlparse.c" />
 +    <ClCompile Include="..\..\..\..\..\expat\lib\xmlrole.c" />
 +    <ClCompile Include="..\..\..\..\..\expat\lib\xmltok.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_generate_mipmap.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\dri_util.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\megadriver_stub.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\xmlconfig.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\utils.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aaline.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aatriangle.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_alpha.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_atifragshader.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_bitmap.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blend.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blit.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_clear.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_context.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_copypix.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_depth.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_drawpix.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_feedback.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fog.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fragprog.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_lines.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_logic.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_masking.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_points.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_renderbuffer.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_span.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_stencil.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texcombine.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texrender.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfetch.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfilter.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texture.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_triangle.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_zoom.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c" />
 +    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\mesa\mesa.vcxproj">
 +      <Project>{2120c974-2717-4709-b44f-d6e6d0a56448}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>

--
Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git


More information about the x2go-commits mailing list