Revert "mesa: separate shader program object from shader object." (bug#15244)
authorXiang, Haihao <haihao.xiang@intel.com>
Mon, 31 Mar 2008 08:27:47 +0000 (16:27 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Mon, 31 Mar 2008 08:27:47 +0000 (16:27 +0800)
commitaef47c4dc87075fd63002b50c4b32b1049e5e4d1
treed1b1fbc27253e4cd7d0c44ec52ce2944e1927b5c
parentd30d9e42b758db452bfdb482b619a5f4c6d01037
Revert "mesa: separate shader program object from shader object." (bug#15244)

This reverts commit 3ffd11f71d021f672b9bc15b3c39c155a0e2fecb.
src/mesa/main/context.c
src/mesa/main/mtypes.h
src/mesa/shader/shader_api.c