mesa: Changes to 'master'

[Brian Paul]

The branch, master has been updated
        Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master

Summary of changes:
 src/mesa/drivers/dri/i965/brw_context.c |    2 +-
 src/mesa/shader/slang/slang_link.c      |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

       via  6befdca6a3d65d7e49c0c54a7a8f091cd05034ea (commit)
       via  43346fb1fb43f91cb3e90d84b442dc08d6c9550d (commit)
      from  ea190fe05098d166c38d168d6a3d743c3acfe722 (commit)


- Commits -----------------------------------------------
commit 6befdca6a3d65d7e49c0c54a7a8f091cd05034ea
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed Jul 2 09:16:10 2008 -0600

    generate a link error if the vertex shader references too many textures

commit 43346fb1fb43f91cb3e90d84b442dc08d6c9550d
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed Jul 2 09:14:53 2008 -0600

    set ctx->Const.MaxVertexTextureImageUnits = 0
    
    This disallows vertex shader texture sampling.  See bugs 16157, 13838.

---------------------------------