[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'upstream-experimental'



 .gitignore                                                              |    8 
 Makefile                                                                |   17 
 bin/minstall                                                            |    1 
 bin/mklib                                                               |   11 
 configs/.gitignore                                                      |    1 
 configs/default                                                         |    4 
 configs/freebsd-dri                                                     |    3 
 configs/linux-dri                                                       |    5 
 configs/linux-dri-debug                                                 |   16 
 docs/RELNOTES-6.4.1                                                     |   47 
 docs/RELNOTES-6.4.2                                                     |   47 
 docs/RELNOTES-6.5                                                       |   97 
 docs/RELNOTES-6.5.1                                                     |   60 
 docs/contents.html                                                      |    7 
 docs/custom.html                                                        |   27 
 docs/cvs_access.html                                                    |  106 
 docs/cvs_branches.html                                                  |   80 
 docs/developers.html                                                    |   51 
 docs/download.html                                                      |    2 
 docs/intro.html                                                         |   30 
 docs/license.html                                                       |   30 
 docs/lists.html                                                         |   67 
 docs/news.html                                                          |   34 
 docs/relnotes-6.5.2.html                                                |   10 
 docs/relnotes-6.5.3.html                                                |   94 
 docs/relnotes.html                                                      |    1 
 docs/repository.html                                                    |  111 
 docs/shading.html                                                       |  309 
 docs/thanks.html                                                        |    2 
 doxygen/.cvsignore                                                      |   15 
 doxygen/.gitignore                                                      |   15 
 doxygen/Makefile                                                        |    2 
 doxygen/array_cache.doxy                                                |   50 
 doxygen/common.doxy                                                     |    2 
 doxygen/doxy.bat                                                        |    4 
 doxygen/glapi.doxy                                                      |    2 
 doxygen/header.html                                                     |    2 
 doxygen/main.doxy                                                       |    2 
 doxygen/math.doxy                                                       |    2 
 doxygen/shader.doxy                                                     |    2 
 doxygen/swrast.doxy                                                     |    2 
 doxygen/swrast_setup.doxy                                               |    2 
 doxygen/tnl.doxy                                                        |    2 
 doxygen/tnl_dd.doxy                                                     |    2 
 doxygen/vbo.doxy                                                        |   50 
 include/GL/gl_mangle.h                                                  |    4 
 include/GL/glext.h                                                      |  627 +
 include/GL/glxext.h                                                     |  115 
 include/GL/internal/dri_interface.h                                     |   20 
 include/GL/internal/glcore.h                                            |  336 
 include/GL/xmesa.h                                                      |   15 
 include/GL/xmesa_xf86.h                                                 |    4 
 progs/demos/.cvsignore                                                  |   48 
 progs/demos/.gitignore                                                  |   48 
 progs/demos/Makefile                                                    |   20 
 progs/demos/fogcoord.c                                                  |  364 
 progs/demos/fslight.c                                                   |  393 
 progs/demos/texdown.c                                                   |    8 
 progs/demos/winpos.c                                                    |    2 
 progs/glsl/CH06-brick.frag.txt                                          |   36 
 progs/glsl/CH06-brick.vert.txt                                          |   41 
 progs/glsl/CH11-bumpmap.frag.txt                                        |   41 
 progs/glsl/CH11-bumpmap.vert.txt                                        |   38 
 progs/glsl/CH11-toyball.frag.txt                                        |   75 
 progs/glsl/CH11-toyball.vert.txt                                        |   24 
 progs/glsl/CH18-mandel.frag.txt                                         |   55 
 progs/glsl/CH18-mandel.vert.txt                                         |   35 
 progs/glsl/Makefile                                                     |   74 
 progs/glsl/brick.c                                                      |  311 
 progs/glsl/bump.c                                                       |  411 
 progs/glsl/cubemap.frag.txt                                             |   18 
 progs/glsl/mandelbrot.c                                                 |  328 
 progs/glsl/noise.c                                                      |  297 
 progs/glsl/reflect.vert.txt                                             |   19 
 progs/glsl/shadowtex.frag.txt                                           |   21 
 progs/glsl/simple.vert.txt                                              |    9 
 progs/glsl/texdemo1.c                                                   |  570 +
 progs/glsl/toyball.c                                                    |  339 
 progs/redbook/.cvsignore                                                |   64 
 progs/redbook/.gitignore                                                |   64 
 progs/samples/.cvsignore                                                |   45 
 progs/samples/.gitignore                                                |   45 
 progs/tests/.cvsignore                                                  |   54 
 progs/tests/.gitignore                                                  |   54 
 progs/tests/Makefile                                                    |    9 
 progs/tests/drawbuffers.c                                               |  298 
 progs/tests/fbotest1.c                                                  |    4 
 progs/tests/fbotest2.c                                                  |    4 
 progs/tests/fbotexture.c                                                |    5 
 progs/tests/mipmap_limits.c                                             |    2 
 progs/tests/sharedtex.c                                                 |   22 
 progs/tools/trace/gltrace_support.cc                                    |    3 
 progs/trivial/Makefile                                                  |   10 
 progs/trivial/dlist-dangling.c                                          |  149 
 progs/trivial/dlist-edgeflag-dangling.c                                 |  152 
 progs/trivial/dlist-edgeflag.c                                          |  156 
 progs/trivial/drawarrays.c                                              |  127 
 progs/trivial/drawelements.c                                            |  120 
 progs/trivial/drawrange.c                                               |  118 
 progs/trivial/vbo-drawarrays.c                                          |  133 
 progs/trivial/vbo-drawelements.c                                        |  137 
 progs/trivial/vbo-drawrange.c                                           |  145 
 progs/util/extfuncs.h                                                   |  136 
 progs/xdemos/.cvsignore                                                 |   16 
 progs/xdemos/.gitignore                                                 |   16 
 progs/xdemos/Makefile                                                   |    2 
 progs/xdemos/glthreads.c                                                |    2 
 progs/xdemos/glxcontexts.c                                              |    4 
 progs/xdemos/glxgears_fbconfig.c                                        |    2 
 progs/xdemos/glxheads.c                                                 |    2 
 progs/xdemos/glxinfo.c                                                  |   16 
 progs/xdemos/glxswapcontrol.c                                           |    2 
 progs/xdemos/manywin.c                                                  |    2 
 progs/xdemos/opencloseopen.c                                            |    2 
 progs/xdemos/pbinfo.c                                                   |    2 
 progs/xdemos/yuvrect_client.c                                           |    2 
 src/egl/docs/EGL_MESA_screen_surface                                    |   28 
 src/egl/main/egllog.c                                                   |   41 
 src/glut/fbdev/fbdev.c                                                  |   17 
 src/glut/fbdev/glut_fbdev.c                                             | 2199 -----
 src/glut/fbdev/input.c                                                  |   86 
 src/glx/mini/Makefile                                                   |    7 
 src/glx/mini/driver.h                                                   |    2 
 src/glx/x11/.gitignore                                                  |    1 
 src/glx/x11/Makefile                                                    |    6 
 src/glx/x11/dri_glx.c                                                   |   35 
 src/glx/x11/glcontextmodes.c                                            |  537 +
 src/glx/x11/glcontextmodes.h                                            |   52 
 src/glx/x11/glxcmds.c                                                   |    3 
 src/glx/x11/glxext.c                                                    |   84 
 src/glx/x11/indirect.c                                                  |   50 
 src/glx/x11/indirect.h                                                  |    2 
 src/glx/x11/indirect_vertex_array.c                                     |    6 
 src/glx/x11/single2.c                                                   |   18 
 src/mesa/.gitignore                                                     |    2 
 src/mesa/Makefile                                                       |    6 
 src/mesa/array_cache/ac_context.c                                       |  375 
 src/mesa/array_cache/ac_context.h                                       |   99 
 src/mesa/array_cache/ac_import.c                                        |  922 --
 src/mesa/array_cache/acache.h                                           |  132 
 src/mesa/array_cache/descrip.mms                                        |   37 
 src/mesa/array_cache/sources                                            |    7 
 src/mesa/drivers/allegro/amesa.c                                        |    2 
 src/mesa/drivers/beos/GLView.cpp                                        |    6 
 src/mesa/drivers/common/driverfuncs.c                                   |   49 
 src/mesa/drivers/common/driverfuncs.h                                   |    8 
 src/mesa/drivers/directfb/idirectfbgl_mesa.c                            |   31 
 src/mesa/drivers/dri/common/dri_bufmgr.c                                |   14 
 src/mesa/drivers/dri/common/dri_drmpool.c                               |    2 
 src/mesa/drivers/dri/common/dri_util.c                                  |   25 
 src/mesa/drivers/dri/common/dri_util.h                                  |    2 
 src/mesa/drivers/dri/common/drirenderbuffer.c                           |    2 
 src/mesa/drivers/dri/common/extension_helper.h                          |   22 
 src/mesa/drivers/dri/common/glcontextmodes.c                            |  533 -
 src/mesa/drivers/dri/common/glcontextmodes.h                            |   52 
 src/mesa/drivers/dri/common/xmlpool/.gitignore                          |    5 
 src/mesa/drivers/dri/common/xmlpool/Makefile                            |    2 
 src/mesa/drivers/dri/common/xmlpool/options.h                           |   69 
 src/mesa/drivers/dri/common/xmlpool/sv.po                               |  226 
 src/mesa/drivers/dri/fb/fb_dri.c                                        |   14 
 src/mesa/drivers/dri/fb/fb_egl.c                                        |    6 
 src/mesa/drivers/dri/ffb/ffb_state.c                                    |    4 
 src/mesa/drivers/dri/ffb/ffb_xmesa.c                                    |    8 
 src/mesa/drivers/dri/gamma/gamma_context.c                              |    4 
 src/mesa/drivers/dri/gamma/gamma_state.c                                |    4 
 src/mesa/drivers/dri/gamma/gamma_xmesa.c                                |    6 
 src/mesa/drivers/dri/i810/i810context.c                                 |   14 
 src/mesa/drivers/dri/i810/i810screen.c                                  |    2 
 src/mesa/drivers/dri/i810/i810state.c                                   |    4 
 src/mesa/drivers/dri/i915/i915_context.c                                |    9 
 src/mesa/drivers/dri/i915/i915_fragprog.c                               |    6 
 src/mesa/drivers/dri/i915/i915_program.c                                |   12 
 src/mesa/drivers/dri/i915/i915_reg.h                                    |    2 
 src/mesa/drivers/dri/i915/i915_state.c                                  |   53 
 src/mesa/drivers/dri/i915/i915_vtbl.c                                   |    4 
 src/mesa/drivers/dri/i915/intel_context.c                               |   17 
 src/mesa/drivers/dri/i915/intel_screen.c                                |    2 
 src/mesa/drivers/dri/i915tex/Makefile                                   |    6 
 src/mesa/drivers/dri/i915tex/i915_context.c                             |    7 
 src/mesa/drivers/dri/i915tex/i915_context.h                             |    1 
 src/mesa/drivers/dri/i915tex/i915_fragprog.c                            |    6 
 src/mesa/drivers/dri/i915tex/i915_program.c                             |   12 
 src/mesa/drivers/dri/i915tex/i915_reg.h                                 |    2 
 src/mesa/drivers/dri/i915tex/i915_state.c                               |   63 
 src/mesa/drivers/dri/i915tex/i915_tex.c                                 |   35 
 src/mesa/drivers/dri/i915tex/i915_tex_layout.c                          |   79 
 src/mesa/drivers/dri/i915tex/intel_batchbuffer.c                        |   18 
 src/mesa/drivers/dri/i915tex/intel_batchbuffer.h                        |    2 
 src/mesa/drivers/dri/i915tex/intel_batchpool.c                          |    2 
 src/mesa/drivers/dri/i915tex/intel_blit.c                               |  257 
 src/mesa/drivers/dri/i915tex/intel_buffer_objects.c                     |    9 
 src/mesa/drivers/dri/i915tex/intel_buffers.c                            |  382 
 src/mesa/drivers/dri/i915tex/intel_buffers.h                            |    3 
 src/mesa/drivers/dri/i915tex/intel_context.c                            |  140 
 src/mesa/drivers/dri/i915tex/intel_context.h                            |   17 
 src/mesa/drivers/dri/i915tex/intel_fbo.c                                |   75 
 src/mesa/drivers/dri/i915tex/intel_fbo.h                                |   35 
 src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c                        |   13 
 src/mesa/drivers/dri/i915tex/intel_reg.h                                |    4 
 src/mesa/drivers/dri/i915tex/intel_regions.c                            |   13 
 src/mesa/drivers/dri/i915tex/intel_regions.h                            |    2 
 src/mesa/drivers/dri/i915tex/intel_screen.c                             |  196 
 src/mesa/drivers/dri/i915tex/intel_screen.h                             |    5 
 src/mesa/drivers/dri/i915tex/intel_tex_image.c                          |   21 
 src/mesa/drivers/dri/i915tex/intel_tex_layout.c                         |    1 
 src/mesa/drivers/dri/i915tex/intel_tex_subimage.c                       |    3 
 src/mesa/drivers/dri/i915tex/intel_tex_validate.c                       |   19 
 src/mesa/drivers/dri/i915tex/intel_tris.c                               |    3 
 src/mesa/drivers/dri/i915tex/server/i830_common.h                       |    6 
 src/mesa/drivers/dri/i965/Makefile                                      |   14 
 src/mesa/drivers/dri/i965/brw_attrib.h                                  |  114 
 src/mesa/drivers/dri/i965/brw_attrib_tmp.h                              |  485 -
 src/mesa/drivers/dri/i965/brw_clip.c                                    |    2 
 src/mesa/drivers/dri/i965/brw_clip.h                                    |    2 
 src/mesa/drivers/dri/i965/brw_context.c                                 |   10 
 src/mesa/drivers/dri/i965/brw_context.h                                 |   28 
 src/mesa/drivers/dri/i965/brw_curbe.c                                   |    3 
 src/mesa/drivers/dri/i965/brw_draw.c                                    |  174 
 src/mesa/drivers/dri/i965/brw_draw.h                                    |   57 
 src/mesa/drivers/dri/i965/brw_draw_current.c                            |  103 
 src/mesa/drivers/dri/i965/brw_draw_upload.c                             |  130 
 src/mesa/drivers/dri/i965/brw_eu.h                                      |    3 
 src/mesa/drivers/dri/i965/brw_eu_emit.c                                 |  155 
 src/mesa/drivers/dri/i965/brw_exec.c                                    |  125 
 src/mesa/drivers/dri/i965/brw_exec.h                                    |  150 
 src/mesa/drivers/dri/i965/brw_exec_api.c                                |  716 -
 src/mesa/drivers/dri/i965/brw_exec_array.c                              |  283 
 src/mesa/drivers/dri/i965/brw_exec_draw.c                               |  227 
 src/mesa/drivers/dri/i965/brw_exec_eval.c                               |  255 
 src/mesa/drivers/dri/i965/brw_fallback.c                                |  349 
 src/mesa/drivers/dri/i965/brw_fallback.h                                |    4 
 src/mesa/drivers/dri/i965/brw_gs.c                                      |    9 
 src/mesa/drivers/dri/i965/brw_gs.h                                      |    1 
 src/mesa/drivers/dri/i965/brw_gs_emit.c                                 |   10 
 src/mesa/drivers/dri/i965/brw_metaops.c                                 |   75 
 src/mesa/drivers/dri/i965/brw_misc_state.c                              |    8 
 src/mesa/drivers/dri/i965/brw_program.c                                 |    6 
 src/mesa/drivers/dri/i965/brw_save.c                                    |  126 
 src/mesa/drivers/dri/i965/brw_save.h                                    |  171 
 src/mesa/drivers/dri/i965/brw_save_api.c                                | 1170 --
 src/mesa/drivers/dri/i965/brw_save_draw.c                               |  221 
 src/mesa/drivers/dri/i965/brw_structs.h                                 |   22 
 src/mesa/drivers/dri/i965/brw_tex.c                                     |    3 
 src/mesa/drivers/dri/i965/brw_tex_layout.c                              |   55 
 src/mesa/drivers/dri/i965/brw_urb.c                                     |    2 
 src/mesa/drivers/dri/i965/brw_util.c                                    |   32 
 src/mesa/drivers/dri/i965/brw_vs.c                                      |    8 
 src/mesa/drivers/dri/i965/brw_vs_constval.c                             |   11 
 src/mesa/drivers/dri/i965/brw_vs_emit.c                                 |   11 
 src/mesa/drivers/dri/i965/brw_vs_tnl.c                                  |  160 
 src/mesa/drivers/dri/i965/brw_vtbl.c                                    |   10 
 src/mesa/drivers/dri/i965/brw_wm.c                                      |   53 
 src/mesa/drivers/dri/i965/brw_wm.h                                      |    2 
 src/mesa/drivers/dri/i965/brw_wm_debug.c                                |    3 
 src/mesa/drivers/dri/i965/brw_wm_emit.c                                 |    4 
 src/mesa/drivers/dri/i965/brw_wm_fp.c                                   |   36 
 src/mesa/drivers/dri/i965/brw_wm_pass0.c                                |    4 
 src/mesa/drivers/dri/i965/brw_wm_pass1.c                                |    3 
 src/mesa/drivers/dri/i965/brw_wm_pass2.c                                |    4 
 src/mesa/drivers/dri/i965/brw_wm_state.c                                |    4 
 src/mesa/drivers/dri/i965/bufmgr.h                                      |    2 
 src/mesa/drivers/dri/i965/bufmgr_fake.c                                 |   18 
 src/mesa/drivers/dri/i965/intel_blit.c                                  |    4 
 src/mesa/drivers/dri/i965/intel_context.c                               |   84 
 src/mesa/drivers/dri/i965/intel_context.h                               |    4 
 src/mesa/drivers/dri/i965/intel_ioctl.c                                 |   38 
 src/mesa/drivers/dri/i965/intel_regions.c                               |    2 
 src/mesa/drivers/dri/i965/intel_regions.h                               |    1 
 src/mesa/drivers/dri/i965/intel_screen.c                                |   14 
 src/mesa/drivers/dri/i965/intel_screen.h                                |    1 
 src/mesa/drivers/dri/i965/intel_tex_layout.c                            |    1 
 src/mesa/drivers/dri/i965/server/i830_common.h                          |   19 
 src/mesa/drivers/dri/intel/intel_tex_layout.c                           |  102 
 src/mesa/drivers/dri/intel/intel_tex_layout.h                           |   41 
 src/mesa/drivers/dri/mach64/mach64_context.c                            |   82 
 src/mesa/drivers/dri/mach64/mach64_context.h                            |   57 
 src/mesa/drivers/dri/mach64/mach64_lock.c                               |    7 
 src/mesa/drivers/dri/mach64/mach64_native_vb.c                          |   20 
 src/mesa/drivers/dri/mach64/mach64_screen.c                             |    4 
 src/mesa/drivers/dri/mach64/mach64_state.c                              |    4 
 src/mesa/drivers/dri/mach64/mach64_tex.c                                |  131 
 src/mesa/drivers/dri/mach64/mach64_tex.h                                |   10 
 src/mesa/drivers/dri/mach64/mach64_texmem.c                             |  655 -
 src/mesa/drivers/dri/mach64/mach64_texstate.c                           |  135 
 src/mesa/drivers/dri/mach64/mach64_tris.c                               |   17 
 src/mesa/drivers/dri/mga/mga_xmesa.c                                    |   14 
 src/mesa/drivers/dri/mga/mgastate.c                                     |    4 
 src/mesa/drivers/dri/nouveau/Makefile                                   |   53 
 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c                        |  616 +
 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h                        |   77 
 src/mesa/drivers/dri/nouveau/nouveau_buffers.c                          |  434 
 src/mesa/drivers/dri/nouveau/nouveau_buffers.h                          |   48 
 src/mesa/drivers/dri/nouveau/nouveau_card.c                             |   17 
 src/mesa/drivers/dri/nouveau/nouveau_card.h                             |   49 
 src/mesa/drivers/dri/nouveau/nouveau_card_list.h                        |  232 
 src/mesa/drivers/dri/nouveau/nouveau_context.c                          |  378 
 src/mesa/drivers/dri/nouveau/nouveau_context.h                          |  236 
 src/mesa/drivers/dri/nouveau/nouveau_ctrlreg.h                          |   44 
 src/mesa/drivers/dri/nouveau/nouveau_dri.h                              |   28 
 src/mesa/drivers/dri/nouveau/nouveau_driver.c                           |  146 
 src/mesa/drivers/dri/nouveau/nouveau_driver.h                           |   42 
 src/mesa/drivers/dri/nouveau/nouveau_fifo.c                             |  142 
 src/mesa/drivers/dri/nouveau/nouveau_fifo.h                             |  195 
 src/mesa/drivers/dri/nouveau/nouveau_lock.c                             |   81 
 src/mesa/drivers/dri/nouveau/nouveau_lock.h                             |   69 
 src/mesa/drivers/dri/nouveau/nouveau_msg.h                              |   67 
 src/mesa/drivers/dri/nouveau/nouveau_object.c                           |  117 
 src/mesa/drivers/dri/nouveau/nouveau_object.h                           |   47 
 src/mesa/drivers/dri/nouveau/nouveau_query.c                            |  198 
 src/mesa/drivers/dri/nouveau/nouveau_query.h                            |   38 
 src/mesa/drivers/dri/nouveau/nouveau_reg.h                              | 1505 +++
 src/mesa/drivers/dri/nouveau/nouveau_screen.c                           |  382 
 src/mesa/drivers/dri/nouveau/nouveau_screen.h                           |   61 
 src/mesa/drivers/dri/nouveau/nouveau_shader.c                           |  833 +
 src/mesa/drivers/dri/nouveau/nouveau_shader.h                           |  454 +
 src/mesa/drivers/dri/nouveau/nouveau_shader_0.c                         | 1050 ++
 src/mesa/drivers/dri/nouveau/nouveau_shader_1.c                         |   16 
 src/mesa/drivers/dri/nouveau/nouveau_shader_2.c                         |  264 
 src/mesa/drivers/dri/nouveau/nouveau_span.c                             |  125 
 src/mesa/drivers/dri/nouveau/nouveau_span.h                             |   39 
 src/mesa/drivers/dri/nouveau/nouveau_state.c                            |  345 
 src/mesa/drivers/dri/nouveau/nouveau_state.h                            |   50 
 src/mesa/drivers/dri/nouveau/nouveau_state_cache.c                      |   69 
 src/mesa/drivers/dri/nouveau/nouveau_state_cache.h                      |   29 
 src/mesa/drivers/dri/nouveau/nouveau_swtcl.c                            |  127 
 src/mesa/drivers/dri/nouveau/nouveau_swtcl.h                            |   55 
 src/mesa/drivers/dri/nouveau/nouveau_sync.c                             |  194 
 src/mesa/drivers/dri/nouveau/nouveau_sync.h                             |   67 
 src/mesa/drivers/dri/nouveau/nouveau_tex.c                              |   49 
 src/mesa/drivers/dri/nouveau/nouveau_tex.h                              |   38 
 src/mesa/drivers/dri/nouveau/nv04_state.c                               |  540 +
 src/mesa/drivers/dri/nouveau/nv04_swtcl.c                               |  619 +
 src/mesa/drivers/dri/nouveau/nv04_swtcl.h                               |   12 
 src/mesa/drivers/dri/nouveau/nv10_state.c                               |  798 +
 src/mesa/drivers/dri/nouveau/nv10_swtcl.c                               |  656 +
 src/mesa/drivers/dri/nouveau/nv10_swtcl.h                               |   40 
 src/mesa/drivers/dri/nouveau/nv20_shader.h                              |  121 
 src/mesa/drivers/dri/nouveau/nv20_state.c                               |  824 +
 src/mesa/drivers/dri/nouveau/nv20_vertprog.c                            |  447 +
 src/mesa/drivers/dri/nouveau/nv30_fragprog.c                            |  742 +
 src/mesa/drivers/dri/nouveau/nv30_shader.h                              |  379 
 src/mesa/drivers/dri/nouveau/nv30_state.c                               |  980 ++
 src/mesa/drivers/dri/nouveau/nv30_vertprog.c                            |  367 
 src/mesa/drivers/dri/nouveau/nv40_fragprog.c                            |  224 
 src/mesa/drivers/dri/nouveau/nv40_shader.h                              |  467 +
 src/mesa/drivers/dri/nouveau/nv40_vertprog.c                            |  778 +
 src/mesa/drivers/dri/nouveau/nv50_state.c                               |  641 +
 src/mesa/drivers/dri/r128/r128_context.c                                |    8 
 src/mesa/drivers/dri/r128/r128_lock.c                                   |    6 
 src/mesa/drivers/dri/r128/r128_screen.c                                 |    2 
 src/mesa/drivers/dri/r128/r128_state.c                                  |    4 
 src/mesa/drivers/dri/r128/r128_tris.c                                   |    4 
 src/mesa/drivers/dri/r200/.gitignore                                    |    3 
 src/mesa/drivers/dri/r200/Makefile                                      |    6 
 src/mesa/drivers/dri/r200/r200_context.c                                |   33 
 src/mesa/drivers/dri/r200/r200_context.h                                |  135 
 src/mesa/drivers/dri/r200/r200_lock.c                                   |   12 
 src/mesa/drivers/dri/r200/r200_maos.h                                   |    2 
 src/mesa/drivers/dri/r200/r200_maos_arrays.c                            |  392 
 src/mesa/drivers/dri/r200/r200_state.c                                  |   55 
 src/mesa/drivers/dri/r200/r200_state.h                                  |    2 
 src/mesa/drivers/dri/r200/r200_state_init.c                             |    3 
 src/mesa/drivers/dri/r200/r200_swtcl.c                                  |    8 
 src/mesa/drivers/dri/r200/r200_swtcl.h                                  |    1 
 src/mesa/drivers/dri/r200/r200_tcl.c                                    |   44 
 src/mesa/drivers/dri/r200/r200_vertprog.c                               |   30 
 src/mesa/drivers/dri/r200/r200_vtxfmt.c                                 | 1234 --
 src/mesa/drivers/dri/r200/r200_vtxfmt.h                                 |  123 
 src/mesa/drivers/dri/r200/r200_vtxfmt_c.c                               | 1002 --
 src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c                             |  234 
 src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c                             |  440 -
 src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S                             |  499 -
 src/mesa/drivers/dri/r300/.gitignore                                    |    3 
 src/mesa/drivers/dri/r300/Makefile                                      |    8 
 src/mesa/drivers/dri/r300/r200_context.h                                |  822 -
 src/mesa/drivers/dri/r300/r200_ioctl.h                                  |  204 
 src/mesa/drivers/dri/r300/r200_reg.h                                    | 1423 ---
 src/mesa/drivers/dri/r300/r200_state.h                                  |   58 
 src/mesa/drivers/dri/r300/r300_cmdbuf.c                                 |  166 
 src/mesa/drivers/dri/r300/r300_context.c                                |   53 
 src/mesa/drivers/dri/r300/r300_context.h                                |  185 
 src/mesa/drivers/dri/r300/r300_emit.h                                   |    2 
 src/mesa/drivers/dri/r300/r300_fragprog.c                               | 2324 +++--
 src/mesa/drivers/dri/r300/r300_fragprog.h                               |   13 
 src/mesa/drivers/dri/r300/r300_fragprog_swz.c                           | 1328 ---
 src/mesa/drivers/dri/r300/r300_ioctl.c                                  |  259 
 src/mesa/drivers/dri/r300/r300_maos.c                                   |    1 
 src/mesa/drivers/dri/r300/r300_maos.h                                   |    1 
 src/mesa/drivers/dri/r300/r300_reg.h                                    |   42 
 src/mesa/drivers/dri/r300/r300_render.c                                 |  196 
 src/mesa/drivers/dri/r300/r300_shader.c                                 |   26 
 src/mesa/drivers/dri/r300/r300_state.c                                  |  455 -
 src/mesa/drivers/dri/r300/r300_state.h                                  |    1 
 src/mesa/drivers/dri/r300/r300_tex.c                                    |    1 
 src/mesa/drivers/dri/r300/r300_tex.h                                    |    1 
 src/mesa/drivers/dri/r300/r300_texmem.c                                 |  362 
 src/mesa/drivers/dri/r300/r300_texstate.c                               |  171 
 src/mesa/drivers/dri/r300/r300_vertexprog.c                             | 1175 --
 src/mesa/drivers/dri/r300/r300_vertprog.c                               | 1118 ++
 src/mesa/drivers/dri/r300/radeon_context.c                              |   12 
 src/mesa/drivers/dri/r300/radeon_lock.c                                 |    5 
 src/mesa/drivers/dri/r300/radeon_mm.c                                   |    4 
 src/mesa/drivers/dri/r300/radeon_span.c                                 |    1 
 src/mesa/drivers/dri/r300/radeon_state.c                                |    4 
 src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c                             |  304 
 src/mesa/drivers/dri/radeon/Makefile                                    |    9 
 src/mesa/drivers/dri/radeon/radeon_context.c                            |   38 
 src/mesa/drivers/dri/radeon/radeon_context.h                            |  111 
 src/mesa/drivers/dri/radeon/radeon_ioctl.c                              |    8 
 src/mesa/drivers/dri/radeon/radeon_lock.c                               |    7 
 src/mesa/drivers/dri/radeon/radeon_maos_verts.c                         |    2 
 src/mesa/drivers/dri/radeon/radeon_screen.c                             |   22 
 src/mesa/drivers/dri/radeon/radeon_state.c                              |    8 
 src/mesa/drivers/dri/radeon/radeon_state_init.c                         |    3 
 src/mesa/drivers/dri/radeon/radeon_swtcl.c                              |    9 
 src/mesa/drivers/dri/radeon/radeon_swtcl.h                              |    1 
 src/mesa/drivers/dri/radeon/radeon_tcl.c                                |    2 
 src/mesa/drivers/dri/radeon/radeon_vtxfmt.c                             | 1086 --
 src/mesa/drivers/dri/radeon/radeon_vtxfmt.h                             |  120 
 src/mesa/drivers/dri/radeon/radeon_vtxfmt_c.c                           |  924 --
 src/mesa/drivers/dri/radeon/radeon_vtxfmt_sse.c                         |  236 
 src/mesa/drivers/dri/radeon/radeon_vtxfmt_x86.c                         |  440 -
 src/mesa/drivers/dri/radeon/radeon_vtxtmp_x86.S                         |  498 -
 src/mesa/drivers/dri/s3v/s3v_context.c                                  |    4 
 src/mesa/drivers/dri/s3v/s3v_state.c                                    |    4 
 src/mesa/drivers/dri/s3v/s3v_tritmp.h                                   |   46 
 src/mesa/drivers/dri/s3v/s3v_xmesa.c                                    |    6 
 src/mesa/drivers/dri/savage/savage_xmesa.c                              |   10 
 src/mesa/drivers/dri/savage/savagestate.c                               |    4 
 src/mesa/drivers/dri/sis/sis6326_state.c                                |    4 
 src/mesa/drivers/dri/sis/sis_context.c                                  |    8 
 src/mesa/drivers/dri/sis/sis_screen.c                                   |    2 
 src/mesa/drivers/dri/sis/sis_state.c                                    |    4 
 src/mesa/drivers/dri/tdfx/tdfx_context.c                                |   12 
 src/mesa/drivers/dri/tdfx/tdfx_screen.c                                 |    2 
 src/mesa/drivers/dri/tdfx/tdfx_state.c                                  |    4 
 src/mesa/drivers/dri/tdfx/tdfx_tris.c                                   |   16 
 src/mesa/drivers/dri/trident/trident_context.c                          |    8 
 src/mesa/drivers/dri/trident/trident_context.h                          |    2 
 src/mesa/drivers/dri/trident/trident_state.c                            |    4 
 src/mesa/drivers/dri/unichrome/server/via_dri.c                         |    1 
 src/mesa/drivers/dri/unichrome/server/via_regs.h                        |    1 
 src/mesa/drivers/dri/unichrome/via_context.c                            |   39 
 src/mesa/drivers/dri/unichrome/via_context.h                            |    5 
 src/mesa/drivers/dri/unichrome/via_ioctl.c                              |   24 
 src/mesa/drivers/dri/unichrome/via_screen.c                             |    2 
 src/mesa/drivers/dri/unichrome/via_span.c                               |    4 
 src/mesa/drivers/dri/unichrome/via_state.c                              |   22 
 src/mesa/drivers/fbdev/glfbdev.c                                        |    6 
 src/mesa/drivers/ggi/default/.cvsignore                                 |    1 
 src/mesa/drivers/ggi/default/.gitignore                                 |    1 
 src/mesa/drivers/ggi/display/.cvsignore                                 |    1 
 src/mesa/drivers/ggi/display/.gitignore                                 |    1 
 src/mesa/drivers/ggi/ggimesa.c                                          |    4 
 src/mesa/drivers/glide/fxapi.c                                          |    4 
 src/mesa/drivers/glide/fxdd.c                                           |    9 
 src/mesa/drivers/glslcompiler/Makefile                                  |   44 
 src/mesa/drivers/glslcompiler/glslcompiler.c                            |  358 
 src/mesa/drivers/osmesa/osmesa.c                                        |   21 
 src/mesa/drivers/svga/svgamesa.c                                        |    1 
 src/mesa/drivers/svga/svgamesa15.c                                      |    2 
 src/mesa/drivers/svga/svgamesa16.c                                      |    2 
 src/mesa/drivers/svga/svgamesa24.c                                      |    2 
 src/mesa/drivers/svga/svgamesa32.c                                      |    2 
 src/mesa/drivers/svga/svgamesa8.c                                       |    2 
 src/mesa/drivers/windows/gdi/mesa.def                                   |    6 
 src/mesa/drivers/windows/gdi/wmesa.c                                    |    8 
 src/mesa/drivers/windows/gldirect/dglcontext.c                          |    2 
 src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c                  |    4 
 src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c                     |    2 
 src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c               |    2 
 src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c                  |    4 
 src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c                     |    2 
 src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c               |    2 
 src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c                  |    4 
 src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c                     |    2 
 src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c               |    2 
 src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c               |    6 
 src/mesa/drivers/windows/icd/mesa.def                                   |    6 
 src/mesa/drivers/x11/fakeglx.c                                          |   13 
 src/mesa/drivers/x11/glxapi.c                                           |    2 
 src/mesa/drivers/x11/glxheader.h                                        |    2 
 src/mesa/drivers/x11/xm_api.c                                           |  519 -
 src/mesa/drivers/x11/xm_buffer.c                                        |  124 
 src/mesa/drivers/x11/xm_dd.c                                            |    7 
 src/mesa/drivers/x11/xm_image.c                                         |  133 
 src/mesa/drivers/x11/xm_image.h                                         |   84 
 src/mesa/drivers/x11/xm_line.c                                          |   19 
 src/mesa/drivers/x11/xm_tri.c                                           |   43 
 src/mesa/drivers/x11/xmesaP.h                                           |   50 
 src/mesa/glapi/.cvsignore                                               |   11 
 src/mesa/glapi/.gitignore                                               |   11 
 src/mesa/glapi/Makefile                                                 |   10 
 src/mesa/glapi/glX_proto_recv.py                                        |   21 
 src/mesa/glapi/glX_proto_size.py                                        |   12 
 src/mesa/glapi/gl_API.xml                                               |   20 
 src/mesa/glapi/gl_table.py                                              |    6 
 src/mesa/glapi/glapi.c                                                  |    3 
 src/mesa/glapi/glapitable.h                                             |    8 
 src/mesa/glapi/glapitemp.h                                              |   14 
 src/mesa/glapi/glprocs.h                                                |   12 
 src/mesa/main/api_loopback.c                                            |    2 
 src/mesa/main/api_noop.c                                                |    2 
 src/mesa/main/arrayobj.c                                                |    9 
 src/mesa/main/attrib.c                                                  |   39 
 src/mesa/main/bufferobj.c                                               |    4 
 src/mesa/main/buffers.c                                                 |    3 
 src/mesa/main/colortab.c                                                |  325 
 src/mesa/main/config.h                                                  |   15 
 src/mesa/main/context.c                                                 |  425 
 src/mesa/main/context.h                                                 |   38 
 src/mesa/main/dd.h                                                      |   58 
 src/mesa/main/dlist.c                                                   |   53 
 src/mesa/main/enable.c                                                  |  111 
 src/mesa/main/enums.c                                                   |    6 
 src/mesa/main/execmem.c                                                 |    2 
 src/mesa/main/extensions.c                                              |    9 
 src/mesa/main/fbobject.c                                                |   64 
 src/mesa/main/framebuffer.c                                             |  157 
 src/mesa/main/framebuffer.h                                             |    6 
 src/mesa/main/get.c                                                     |  102 
 src/mesa/main/get_gen.py                                                |   39 
 src/mesa/main/getstring.c                                               |    7 
 src/mesa/main/glheader.h                                                |   12 
 src/mesa/main/image.c                                                   |  290 
 src/mesa/main/imports.c                                                 |  446 -
 src/mesa/main/imports.h                                                 |   37 
 src/mesa/main/light.c                                                   |   14 
 src/mesa/main/light.h                                                   |    3 
 src/mesa/main/lines.c                                                   |   23 
 src/mesa/main/matrix.c                                                  |   14 
 src/mesa/main/mipmap.c                                                  |    3 
 src/mesa/main/mtypes.h                                                  |  413 
 src/mesa/main/pixel.c                                                   |  495 -
 src/mesa/main/points.c                                                  |   41 
 src/mesa/main/points.h                                                  |    3 
 src/mesa/main/polygon.c                                                 |   39 
 src/mesa/main/polygon.h                                                 |    7 
 src/mesa/main/rastpos.c                                                 |   67 
 src/mesa/main/rbadaptors.c                                              |    6 
 src/mesa/main/renderbuffer.c                                            |  123 
 src/mesa/main/renderbuffer.h                                            |    6 
 src/mesa/main/shaders.c                                                 |  680 +
 src/mesa/main/shaders.h                                                 |  236 
 src/mesa/main/state.c                                                   |  200 
 src/mesa/main/stencil.c                                                 |   90 
 src/mesa/main/texcompress_fxt1.c                                        |   77 
 src/mesa/main/texcompress_s3tc.c                                        |    2 
 src/mesa/main/texenvprogram.c                                           |  110 
 src/mesa/main/teximage.c                                                |   12 
 src/mesa/main/texobj.c                                                  |    6 
 src/mesa/main/texrender.c                                               |    2 
 src/mesa/main/texstate.c                                                |   94 
 src/mesa/main/texstore.c                                                |   28 
 src/mesa/main/texstore.h                                                |    4 
 src/mesa/main/varray.c                                                  |    3 
 src/mesa/main/version.h                                                 |   14 
 src/mesa/shader/arbprogparse.c                                          |  304 
 src/mesa/shader/arbprogram.c                                            |   16 
 src/mesa/shader/asmopcodes.reg                                          |   78 
 src/mesa/shader/grammar/grammar.c                                       |   25 
 src/mesa/shader/nvfragparse.c                                           |   35 
 src/mesa/shader/nvprogram.c                                             |    7 
 src/mesa/shader/nvvertexec.c                                            |  835 -
 src/mesa/shader/nvvertexec.h                                            |   67 
 src/mesa/shader/nvvertparse.c                                           |   15 
 src/mesa/shader/prog_debug.c                                            |  259 
 src/mesa/shader/prog_debug.h                                            |   44 
 src/mesa/shader/prog_execute.c                                          | 1731 +++
 src/mesa/shader/prog_execute.h                                          |   81 
 src/mesa/shader/prog_instruction.c                                      |  239 
 src/mesa/shader/prog_instruction.h                                      |  447 +
 src/mesa/shader/prog_parameter.c                                        |  643 +
 src/mesa/shader/prog_parameter.h                                        |  143 
 src/mesa/shader/prog_print.c                                            |  758 +
 src/mesa/shader/prog_print.h                                            |   72 
 src/mesa/shader/prog_statevars.c                                        |  824 +
 src/mesa/shader/prog_statevars.h                                        |  129 
 src/mesa/shader/program.c                                               | 1813 ----
 src/mesa/shader/program.h                                               |  215 
 src/mesa/shader/program_instruction.h                                   |  360 
 src/mesa/shader/programopt.c                                            |  192 
 src/mesa/shader/programopt.h                                            |   10 
 src/mesa/shader/shader_api.c                                            | 1215 ++
 src/mesa/shader/shader_api.h                                            |  185 
 src/mesa/shader/shaderobjects.c                                         | 1191 --
 src/mesa/shader/shaderobjects.h                                         |  353 
 src/mesa/shader/shaderobjects_3dlabs.c                                  | 2144 ----
 src/mesa/shader/shaderobjects_3dlabs.h                                  |   51 
 src/mesa/shader/slang/Include/BaseTypes.h                               |  133 
 src/mesa/shader/slang/Include/Common.h                                  |  288 
 src/mesa/shader/slang/Include/ConstantUnion.h                           |   50 
 src/mesa/shader/slang/Include/InfoSink.h                                |  135 
 src/mesa/shader/slang/Include/InitializeGlobals.h                       |   43 
 src/mesa/shader/slang/Include/InitializeParseContext.h                  |   44 
 src/mesa/shader/slang/Include/PoolAlloc.h                               |  346 
 src/mesa/shader/slang/Include/ResourceLimits.h                          |   61 
 src/mesa/shader/slang/Include/ShHandle.h                                |  177 
 src/mesa/shader/slang/Include/Types.h                                   |  297 
 src/mesa/shader/slang/Include/intermediate.h                            |  516 -
 src/mesa/shader/slang/MachineIndependent/Gen_glslang.cpp                | 2942 ------
 src/mesa/shader/slang/MachineIndependent/Gen_glslang_tab.cpp            | 4354 ----------
 src/mesa/shader/slang/MachineIndependent/InfoSink.cpp                   |  107 
 src/mesa/shader/slang/MachineIndependent/Initialize.cpp                 |  948 --
 src/mesa/shader/slang/MachineIndependent/Initialize.h                   |   58 
 src/mesa/shader/slang/MachineIndependent/IntermTraverse.cpp             |  243 
 src/mesa/shader/slang/MachineIndependent/Intermediate.cpp               | 2110 ----
 src/mesa/shader/slang/MachineIndependent/MMap.h                         |   84 
 src/mesa/shader/slang/MachineIndependent/ParseHelper.cpp                | 1452 ---
 src/mesa/shader/slang/MachineIndependent/ParseHelper.h                  |  143 
 src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp                  |  349 
 src/mesa/shader/slang/MachineIndependent/QualifierAlive.cpp             |   91 
 src/mesa/shader/slang/MachineIndependent/QualifierAlive.h               |   35 
 src/mesa/shader/slang/MachineIndependent/RemoveTree.cpp                 |   98 
 src/mesa/shader/slang/MachineIndependent/RemoveTree.h                   |   35 
 src/mesa/shader/slang/MachineIndependent/ShaderLang.cpp                 |  607 -
 src/mesa/shader/slang/MachineIndependent/SymbolTable.cpp                |  235 
 src/mesa/shader/slang/MachineIndependent/SymbolTable.h                  |  320 
 src/mesa/shader/slang/MachineIndependent/glslang.l                      |  614 -
 src/mesa/shader/slang/MachineIndependent/glslang.y                      | 2009 ----
 src/mesa/shader/slang/MachineIndependent/glslang_tab.h                  |  260 
 src/mesa/shader/slang/MachineIndependent/intermOut.cpp                  |  496 -
 src/mesa/shader/slang/MachineIndependent/localintermediate.h            |   91 
 src/mesa/shader/slang/MachineIndependent/parseConst.cpp                 |  344 
 src/mesa/shader/slang/MachineIndependent/preprocessor/atom.c            |  768 -
 src/mesa/shader/slang/MachineIndependent/preprocessor/atom.h            |   96 
 src/mesa/shader/slang/MachineIndependent/preprocessor/compile.h         |  132 
 src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.c             | 1037 --
 src/mesa/shader/slang/MachineIndependent/preprocessor/cpp.h             |  119 
 src/mesa/shader/slang/MachineIndependent/preprocessor/cpp_comment_fix.c |   76 
 src/mesa/shader/slang/MachineIndependent/preprocessor/cppstruct.c       |  185 
 src/mesa/shader/slang/MachineIndependent/preprocessor/memory.c          |  191 
 src/mesa/shader/slang/MachineIndependent/preprocessor/memory.h          |   89 
 src/mesa/shader/slang/MachineIndependent/preprocessor/parser.h          |  126 
 src/mesa/shader/slang/MachineIndependent/preprocessor/preprocess.h      |   84 
 src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.c         |  789 -
 src/mesa/shader/slang/MachineIndependent/preprocessor/scanner.h         |  118 
 src/mesa/shader/slang/MachineIndependent/preprocessor/slglobals.h       |  115 
 src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.c         |  318 
 src/mesa/shader/slang/MachineIndependent/preprocessor/symbols.h         |  145 
 src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.c          |  462 -
 src/mesa/shader/slang/MachineIndependent/preprocessor/tokens.h          |  122 
 src/mesa/shader/slang/MachineIndependent/unistd.h                       |    1 
 src/mesa/shader/slang/OGLCompilersDLL/Initialisation.cpp                |  151 
 src/mesa/shader/slang/OGLCompilersDLL/Initialisation.h                  |   47 
 src/mesa/shader/slang/OSDependent/Linux/osinclude.h                     |   78 
 src/mesa/shader/slang/OSDependent/Linux/ossource.cpp                    |  140 
 src/mesa/shader/slang/OSDependent/Windows/osinclude.h                   |   68 
 src/mesa/shader/slang/OSDependent/Windows/ossource.cpp                  |  119 
 src/mesa/shader/slang/Public/ShaderLang.h                               |  212 
 src/mesa/shader/slang/Public/ShaderLangExt.h                            |   57 
 src/mesa/shader/slang/library/Makefile                                  |    8 
 src/mesa/shader/slang/library/gc_to_bin.c                               |    5 
 src/mesa/shader/slang/library/slang_120_core.gc                         | 1398 +--
 src/mesa/shader/slang/library/slang_120_core_gc.h                       |  730 +
 src/mesa/shader/slang/library/slang_builtin_vec4.gc                     |  220 
 src/mesa/shader/slang/library/slang_builtin_vec4_gc.h                   |   62 
 src/mesa/shader/slang/library/slang_common_builtin.gc                   | 1775 ++--
 src/mesa/shader/slang/library/slang_common_builtin_gc.h                 | 1379 +--
 src/mesa/shader/slang/library/slang_core.gc                             | 2738 ++++--
 src/mesa/shader/slang/library/slang_core_gc.h                           | 1351 +--
 src/mesa/shader/slang/library/slang_fragment_builtin.gc                 |  223 
 src/mesa/shader/slang/library/slang_fragment_builtin_gc.h               |  156 
 src/mesa/shader/slang/library/slang_shader.syn                          |   42 
 src/mesa/shader/slang/library/slang_shader_syn.h                        |   28 
 src/mesa/shader/slang/library/slang_vertex_builtin.gc                   |  139 
 src/mesa/shader/slang/library/slang_vertex_builtin_gc.h                 |  129 
 src/mesa/shader/slang/slang_analyse.c                                   |  100 
 src/mesa/shader/slang/slang_analyse.h                                   |   50 
 src/mesa/shader/slang/slang_assemble.c                                  | 1542 ---
 src/mesa/shader/slang/slang_assemble.h                                  |  278 
 src/mesa/shader/slang/slang_assemble_assignment.c                       |  223 
 src/mesa/shader/slang/slang_assemble_assignment.h                       |   45 
 src/mesa/shader/slang/slang_assemble_conditional.c                      |  448 -
 src/mesa/shader/slang/slang_assemble_conditional.h                      |   51 
 src/mesa/shader/slang/slang_assemble_constructor.c                      |  401 
 src/mesa/shader/slang/slang_assemble_constructor.h                      |   57 
 src/mesa/shader/slang/slang_assemble_typeinfo.c                         |  625 -
 src/mesa/shader/slang/slang_assemble_typeinfo.h                         |  152 
 src/mesa/shader/slang/slang_builtin.c                                   |  440 +
 src/mesa/shader/slang/slang_builtin.h                                   |   39 
 src/mesa/shader/slang/slang_codegen.c                                   | 3079 +++++++
 src/mesa/shader/slang/slang_codegen.h                                   |   45 
 src/mesa/shader/slang/slang_compile.c                                   |  797 -
 src/mesa/shader/slang/slang_compile.h                                   |   47 
 src/mesa/shader/slang/slang_compile_function.c                          |   85 
 src/mesa/shader/slang/slang_compile_function.h                          |   22 
 src/mesa/shader/slang/slang_compile_operation.c                         |  129 
 src/mesa/shader/slang/slang_compile_operation.h                         |  155 
 src/mesa/shader/slang/slang_compile_struct.c                            |  218 
 src/mesa/shader/slang/slang_compile_variable.c                          |  261 
 src/mesa/shader/slang/slang_compile_variable.h                          |   36 
 src/mesa/shader/slang/slang_emit.c                                      | 1839 ++++
 src/mesa/shader/slang/slang_emit.h                                      |   49 
 src/mesa/shader/slang/slang_execute.c                                   |  783 -
 src/mesa/shader/slang/slang_execute.h                                   |  105 
 src/mesa/shader/slang/slang_execute_x86.c                               |  754 -
 src/mesa/shader/slang/slang_export.c                                    |  386 
 src/mesa/shader/slang/slang_export.h                                    |  183 
 src/mesa/shader/slang/slang_ir.c                                        |  377 
 src/mesa/shader/slang/slang_ir.h                                        |  205 
 src/mesa/shader/slang/slang_label.c                                     |   98 
 src/mesa/shader/slang/slang_label.h                                     |   45 
 src/mesa/shader/slang/slang_library_noise.c                             |    4 
 src/mesa/shader/slang/slang_library_texsample.c                         |  172 
 src/mesa/shader/slang/slang_library_texsample.h                         |   44 
 src/mesa/shader/slang/slang_link.c                                      | 1165 +-
 src/mesa/shader/slang/slang_link.h                                      |  334 
 src/mesa/shader/slang/slang_log.c                                       |  131 
 src/mesa/shader/slang/slang_log.h                                       |   57 
 src/mesa/shader/slang/slang_mesa.cpp                                    |  144 
 src/mesa/shader/slang/slang_mesa.h                                      |   36 
 src/mesa/shader/slang/slang_preprocess.h                                |   23 
 src/mesa/shader/slang/slang_print.c                                     |  813 +
 src/mesa/shader/slang/slang_print.h                                     |   29 
 src/mesa/shader/slang/slang_simplify.c                                  |  449 +
 src/mesa/shader/slang/slang_simplify.h                                  |   22 
 src/mesa/shader/slang/slang_storage.c                                   |  411 
 src/mesa/shader/slang/slang_storage.h                                   |  121 
 src/mesa/shader/slang/slang_typeinfo.c                                  | 1022 ++
 src/mesa/shader/slang/slang_typeinfo.h                                  |  202 
 src/mesa/shader/slang/slang_utility.c                                   |   15 
 src/mesa/shader/slang/slang_utility.h                                   |    6 
 src/mesa/shader/slang/slang_vartable.c                                  |  328 
 src/mesa/shader/slang/slang_vartable.h                                  |   42 
 src/mesa/shader/slang/traverse_wrap.h                                   |  112 
 src/mesa/sources                                                        |  109 
 src/mesa/sparc/glapi_sparc.S                                            |    1 
 src/mesa/swrast/s_aaline.c                                              |   51 
 src/mesa/swrast/s_aalinetemp.h                                          |  123 
 src/mesa/swrast/s_aatriangle.c                                          |   52 
 src/mesa/swrast/s_aatritemp.h                                           |  224 
 src/mesa/swrast/s_accum.c                                               |    4 
 src/mesa/swrast/s_alpha.c                                               |    2 
 src/mesa/swrast/s_arbshader.c                                           |  124 
 src/mesa/swrast/s_arbshader.h                                           |   38 
 src/mesa/swrast/s_atifragshader.c                                       |   16 
 src/mesa/swrast/s_bitmap.c                                              |    2 
 src/mesa/swrast/s_buffers.c                                             |    5 
 src/mesa/swrast/s_context.c                                             |  177 
 src/mesa/swrast/s_context.h                                             |  216 
 src/mesa/swrast/s_copypix.c                                             |  121 
 src/mesa/swrast/s_depth.c                                               |    6 
 src/mesa/swrast/s_drawpix.c                                             |   36 
 src/mesa/swrast/s_feedback.c                                            |   17 
 src/mesa/swrast/s_fog.c                                                 |   58 
 src/mesa/swrast/s_fragprog.c                                            |  224 
 src/mesa/swrast/s_fragprog.h                                            |   38 
 src/mesa/swrast/s_lines.c                                               |    7 
 src/mesa/swrast/s_linetemp.h                                            |  103 
 src/mesa/swrast/s_logic.c                                               |    2 
 src/mesa/swrast/s_masking.c                                             |    2 
 src/mesa/swrast/s_nvfragprog.c                                          | 1665 ---
 src/mesa/swrast/s_nvfragprog.h                                          |   37 
 src/mesa/swrast/s_pointtemp.h                                           |   76 
 src/mesa/swrast/s_readpix.c                                             |   57 
 src/mesa/swrast/s_span.c                                                |  816 -
 src/mesa/swrast/s_span.h                                                |  182 
 src/mesa/swrast/s_stencil.c                                             |   14 
 src/mesa/swrast/s_texcombine.c                                          |    6 
 src/mesa/swrast/s_texfilter.c                                           |  119 
 src/mesa/swrast/s_triangle.c                                            |   52 
 src/mesa/swrast/s_tritemp.h                                             |  439 -
 src/mesa/swrast/s_zoom.c                                                |   45 
 src/mesa/swrast/swrast.h                                                |    3 
 src/mesa/swrast_setup/ss_context.c                                      |   29 
 src/mesa/swrast_setup/ss_triangle.c                                     |    4 
 src/mesa/swrast_setup/ss_tritmp.h                                       |   46 
 src/mesa/tnl/sources                                                    |   14 
 src/mesa/tnl/t_array_api.c                                              |  432 
 src/mesa/tnl/t_array_api.h                                              |   46 
 src/mesa/tnl/t_array_import.c                                           |  376 
 src/mesa/tnl/t_array_import.h                                           |   36 
 src/mesa/tnl/t_context.c                                                |  125 
 src/mesa/tnl/t_context.h                                                |  341 
 src/mesa/tnl/t_draw.c                                                   |  409 
 src/mesa/tnl/t_pipeline.c                                               |   15 
 src/mesa/tnl/t_pipeline.h                                               |    9 
 src/mesa/tnl/t_save_api.c                                               |  163 
 src/mesa/tnl/t_save_api.h                                               |   57 
 src/mesa/tnl/t_save_loopback.c                                          |  330 
 src/mesa/tnl/t_save_playback.c                                          |  216 
 src/mesa/tnl/t_vb_arbprogram.c                                          | 1539 ---
 src/mesa/tnl/t_vb_arbprogram.h                                          |  189 
 src/mesa/tnl/t_vb_arbprogram_sse.c                                      | 1330 ---
 src/mesa/tnl/t_vb_arbshader.c                                           |  301 
 src/mesa/tnl/t_vb_cull.c                                                |    5 
 src/mesa/tnl/t_vb_fog.c                                                 |    5 
 src/mesa/tnl/t_vb_light.c                                               |   10 
 src/mesa/tnl/t_vb_normals.c                                             |    7 
 src/mesa/tnl/t_vb_points.c                                              |    5 
 src/mesa/tnl/t_vb_program.c                                             |  321 
 src/mesa/tnl/t_vb_render.c                                              |    2 
 src/mesa/tnl/t_vb_rendertmp.h                                           |    4 
 src/mesa/tnl/t_vb_texgen.c                                              |   10 
 src/mesa/tnl/t_vb_texmat.c                                              |    5 
 src/mesa/tnl/t_vb_vertex.c                                              |    5 
 src/mesa/tnl/t_vp_build.c                                               |  173 
 src/mesa/tnl/t_vtx_api.c                                                | 1046 --
 src/mesa/tnl/t_vtx_api.h                                                |   86 
 src/mesa/tnl/t_vtx_eval.c                                               |  265 
 src/mesa/tnl/t_vtx_exec.c                                               |  293 
 src/mesa/tnl/t_vtx_generic.c                                            |  615 -
 src/mesa/tnl/t_vtx_x86.c                                                |  396 
 src/mesa/tnl/t_vtx_x86_gcc.S                                            |  561 -
 src/mesa/tnl/tnl.h                                                      |   33 
 src/mesa/tnl_dd/t_dd_vb.c                                               |   48 
 src/mesa/vbo/descrip.mms                                                |   60 
 src/mesa/vbo/vbo.h                                                      |  117 
 src/mesa/vbo/vbo_attrib.h                                               |  107 
 src/mesa/vbo/vbo_attrib_tmp.h                                           |  486 +
 src/mesa/vbo/vbo_context.c                                              |  247 
 src/mesa/vbo/vbo_context.h                                              |  108 
 src/mesa/vbo/vbo_exec.c                                                 |   97 
 src/mesa/vbo/vbo_exec.h                                                 |  165 
 src/mesa/vbo/vbo_exec_api.c                                             |  703 +
 src/mesa/vbo/vbo_exec_array.c                                           |  387 
 src/mesa/vbo/vbo_exec_draw.c                                            |  228 
 src/mesa/vbo/vbo_exec_eval.c                                            |  255 
 src/mesa/vbo/vbo_rebase.c                                               |  222 
 src/mesa/vbo/vbo_save.c                                                 |   89 
 src/mesa/vbo/vbo_save.h                                                 |  177 
 src/mesa/vbo/vbo_save_api.c                                             | 1147 ++
 src/mesa/vbo/vbo_save_draw.c                                            |  230 
 src/mesa/vbo/vbo_save_loopback.c                                        |  194 
 src/mesa/vbo/vbo_split.c                                                |  161 
 src/mesa/vbo/vbo_split.h                                                |   72 
 src/mesa/vbo/vbo_split_copy.c                                           |  551 +
 src/mesa/vbo/vbo_split_inplace.c                                        |  286 
 src/mesa/x86-64/glapi_x86-64.S                                          |    1 
 src/mesa/x86/common_x86.c                                               |  146 
 src/mesa/x86/glapi_x86.S                                                |    1 
 src/mesa/x86/mmx_blend.S                                                |   41 
 src/mesa/x86/read_rgba_span_x86.S                                       |   86 
 834 files changed, 69438 insertions(+), 88780 deletions(-)

New commits:
commit 5ca8d4ccf24af1c174ff791f15cf9f19defd9b7e
Author: Brian <brian@yutani.localnet.net>
Date:   Wed Apr 18 18:05:33 2007 -0600

    fix an uninitialized variable and a warning

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 2f7002c..a928abd 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1752,7 +1752,7 @@ static slang_ir_node *
 _slang_gen_temporary(GLint size)
 {
    slang_ir_storage *store;
-   slang_ir_node *n;
+   slang_ir_node *n = NULL;
 
    store = _slang_new_ir_storage(PROGRAM_TEMPORARY, -1, size);
    if (store) {
@@ -2905,7 +2905,7 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
       if (dbg) printf("ATTRIB ");
    }
    else if (var->type.qualifier == SLANG_QUAL_FIXEDINPUT) {
-      GLuint swizzle;
+      GLuint swizzle = SWIZZLE_XYZW; /* silence compiler warning */
       GLint index = _slang_input_index(varName, GL_FRAGMENT_PROGRAM_ARB,
                                        &swizzle);
       GLint size = 4; /* XXX? */

commit 6b3027e291baf6a7dc5e63780d05f89753a13d74
Author: Brian <brian@yutani.localnet.net>
Date:   Wed Apr 18 16:48:55 2007 -0600

    comments, assertions

diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index a01a645..9e3d3fe 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -274,7 +274,6 @@ _mesa_add_uniform(struct gl_program_parameter_list *paramList,
    else {
       i = _mesa_add_parameter(paramList, PROGRAM_UNIFORM, name,
                               size, datatype, NULL, NULL);
-                              
       return i;
    }
 }
@@ -291,11 +290,13 @@ _mesa_add_sampler(struct gl_program_parameter_list *paramList,
 {
    GLint i = _mesa_lookup_parameter_index(paramList, -1, name);
    if (i >= 0 && paramList->Parameters[i].Type == PROGRAM_SAMPLER) {
+      ASSERT(paramList->Parameters[i].Size == 1);
+      ASSERT(paramList->Parameters[i].DataType == datatype);
       /* already in list */
       return i;
    }
    else {
-      const GLint size = 1;
+      const GLint size = 1; /* a sampler is basically a texture unit number */
       i = _mesa_add_parameter(paramList, PROGRAM_SAMPLER, name,
                               size, datatype, NULL, NULL);
       return i;

commit 8d370fb2eee702e1ba2c622716645d450272549a
Author: Brian <brian@yutani.localnet.net>
Date:   Wed Apr 18 16:46:53 2007 -0600

    new comments

diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 7f17be7..a01a645 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -251,6 +251,14 @@ _mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,
 }
 
 
+/**
+ * Add a uniform to the parameter list.
+ * Note that if the uniform is an array, size may be greater than
+ * what's implied by the datatype.
+ * \param name  uniform's name
+ * \param size  number of floats to allocate
+ * \param datatype  GL_FLOAT_VEC3, GL_FLOAT_MAT4, etc.
+ */
 GLint
 _mesa_add_uniform(struct gl_program_parameter_list *paramList,
                   const char *name, GLuint size, GLenum datatype)
@@ -272,6 +280,11 @@ _mesa_add_uniform(struct gl_program_parameter_list *paramList,
 }
 
 
+/**
+ * Add a sampler to the parameter list.
+ * \param name  uniform's name
+ * \param datatype  GL_SAMPLER_2D, GL_SAMPLER_2D_RECT_ARB, etc.
+ */
 GLint
 _mesa_add_sampler(struct gl_program_parameter_list *paramList,
                   const char *name, GLenum datatype)

commit 36a6a59972857676108c4ee72e677734848d3056
Author: Brian <brian@yutani.localnet.net>
Date:   Wed Apr 18 16:44:02 2007 -0600

    record proper datatypes for uniforms/samplers

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index d8c06f0..2f7002c 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2817,11 +2817,10 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
    struct gl_program *prog = A->program;
    const char *varName = (char *) var->a_name;
    GLboolean success = GL_TRUE;
-   GLint texIndex;
    slang_ir_storage *store = NULL;
    int dbg = 0;
-
-   texIndex = sampler_to_texture_index(var->type.specifier.type);
+   const GLenum datatype = _slang_gltype_from_specifier(&var->type.specifier);
+   const GLint texIndex = sampler_to_texture_index(var->type.specifier.type);
 
    if (texIndex != -1) {
       /* Texture sampler:
@@ -2829,8 +2828,8 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
        * store->Index = sampler uniform location
        * store->Size = texture type index (1D, 2D, 3D, cube, etc)
        */
-      GLenum datatype = GL_SAMPLER_2D;
-      GLint samplerUniform = _mesa_add_sampler(prog->Parameters, varName, datatype);
+      GLint samplerUniform
+         = _mesa_add_sampler(prog->Parameters, varName, datatype);
       store = _slang_new_ir_storage(PROGRAM_SAMPLER, samplerUniform, texIndex);
       if (dbg) printf("SAMPLER ");
    }
@@ -2840,7 +2839,6 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
                          * MAX2(var->array_len, 1);
       if (prog) {
          /* user-defined uniform */
-         GLenum datatype = GL_FLOAT_VEC4; /* XXX */
          GLint uniformLoc = _mesa_add_uniform(prog->Parameters, varName,
                                               size, datatype);
          store = _slang_new_ir_storage(PROGRAM_UNIFORM, uniformLoc, size);

commit addd03da2e254d16088171012c9ca0d157b0d4c2
Author: Brian <brian@yutani.localnet.net>
Date:   Wed Apr 18 16:43:40 2007 -0600

    added _slang_gltype_from_specifier()

diff --git a/src/mesa/shader/slang/slang_compile_variable.c b/src/mesa/shader/slang/slang_compile_variable.c
index 664fd9b..6632da9 100644
--- a/src/mesa/shader/slang/slang_compile_variable.c
+++ b/src/mesa/shader/slang/slang_compile_variable.c
@@ -337,71 +337,3 @@ _slang_locate_variable(const slang_variable_scope * scope,
       return _slang_locate_variable(scope->outer_scope, a_name, 1);
    return NULL;
 }
-
-#if 0
-static GLenum
-gl_type_from_specifier(const slang_type_specifier * type)



Reply to: