diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2006-11-01 14:21:57 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2006-11-01 14:21:57 +0000 |
| commit | 5ac93f86210eb5c2a8dee74ec19b0ecd54376863 (patch) | |
| tree | ea7acd0170a8b35a4a331b05c5910bc574c8f050 /src/mesa/main/mtypes.h | |
| parent | 232a489b41097b462fc0ad2b88f0df75a1abd4c3 (diff) | |
Merge texmem-0-3-branch.
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 4803d0c047..1399dddf50 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2063,6 +2063,19 @@ struct gl_shared_state /*@}*/ /** + * \name Thread safety and statechange notification for texture + * objects. + * + * \todo Improve the granularity of locking. + */ + /*@{*/ + _glthread_Mutex TexMutex; /**< texobj thread safety */ + GLuint TextureStateStamp; /**< state notification for shared tex */ + /*@}*/ + + + + /** * \name Vertex/fragment programs */ /*@{*/ @@ -2931,6 +2944,8 @@ struct __GLcontextRec GLboolean _ForceEyeCoords; GLenum _CurrentProgram; /* currently executing program */ + GLuint TextureStateTimestamp; /* detect changes to shared state */ + struct gl_shine_tab *_ShineTable[2]; /**< Active shine tables */ struct gl_shine_tab *_ShineTabList; /**< MRU list of inactive shine tables */ /**@}*/ |