mesa: Changes to 'master'

[Haihao Xiang]

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

Summary of changes:
 src/mesa/main/context.c      |   38 +++++++++++++++++++++++---------------
 src/mesa/main/mtypes.h       |    2 +-
 src/mesa/shader/shader_api.c |   10 ++++++----
 3 files changed, 30 insertions(+), 20 deletions(-)

       via  63d8a8417d68365cd10c11178516378411c09f87 (commit)
       via  aef47c4dc87075fd63002b50c4b32b1049e5e4d1 (commit)
      from  d30d9e42b758db452bfdb482b619a5f4c6d01037 (commit)


- Commits -----------------------------------------------
commit 63d8a8417d68365cd10c11178516378411c09f87
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Mon Mar 31 17:02:47 2008 +0800

    mesa: Free all shader program data before deleting all
    shader/shader program objects to avoid memory access error.

commit aef47c4dc87075fd63002b50c4b32b1049e5e4d1
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Mon Mar 31 16:27:47 2008 +0800

    Revert "mesa: separate shader program object from shader object." (bug#15244)
    
    This reverts commit 3ffd11f71d021f672b9bc15b3c39c155a0e2fecb.

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