summaryrefslogtreecommitdiff
path: root/src/mesa/main/mtypes.h
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2008-03-31 16:27:47 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2008-03-31 16:27:47 +0800
commitaef47c4dc87075fd63002b50c4b32b1049e5e4d1 (patch)
treed1b1fbc27253e4cd7d0c44ec52ce2944e1927b5c /src/mesa/main/mtypes.h
parentd30d9e42b758db452bfdb482b619a5f4c6d01037 (diff)
Revert "mesa: separate shader program object from shader object." (bug#15244)
This reverts commit 3ffd11f71d021f672b9bc15b3c39c155a0e2fecb.
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r--src/mesa/main/mtypes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index da60a469a4..c8718a7f63 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2202,8 +2202,8 @@ struct gl_shared_state
#endif
#if FEATURE_ARB_shader_objects
+ /** Table of both gl_shader and gl_shader_program objects */
struct _mesa_HashTable *ShaderObjects;
- struct _mesa_HashTable *ShaderProgramObjects;
#endif
#if FEATURE_EXT_framebuffer_object