diff options
| author | Michal Krol <[email protected]> | 2006-08-01 20:07:31 +0000 |
|---|---|---|
| committer | Michal Krol <[email protected]> | 2006-08-01 20:07:31 +0000 |
| commit | 365582dd6f632aafbc1c817aa57926d679bb2efc (patch) | |
| tree | 75f3184e471793c06cd16ef1bdd3e10629f2a28a /src/mesa/shader/shaderobjects.h | |
| parent | cc738e004f083566f3e1723f72623ef9875f72ec (diff) | |
Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492.
Diffstat (limited to 'src/mesa/shader/shaderobjects.h')
| -rw-r--r-- | src/mesa/shader/shaderobjects.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/mesa/shader/shaderobjects.h b/src/mesa/shader/shaderobjects.h index 818049d17b2..cc670216292 100644 --- a/src/mesa/shader/shaderobjects.h +++ b/src/mesa/shader/shaderobjects.h @@ -27,6 +27,8 @@ #include "context.h" +#if FEATURE_ARB_shader_objects + /** * gl2 unique interface identifier. * Each gl2 interface has its own interface id used for object queries. @@ -40,7 +42,8 @@ enum gl2_uiid UIID_FRAGMENT_SHADER, /* fragment shader */ UIID_VERTEX_SHADER, /* vertex shader */ UIID_PROGRAM, /* program object */ - UIID_3DLABS_SHHANDLE /* encapsulates 3dlabs' ShHandle */ + UIID_3DLABS_SHHANDLE, /* encapsulates 3DLabs' ShHandle */ + UIID_DEBUG /* debug object */ }; struct gl2_unknown_intf @@ -127,8 +130,15 @@ struct gl2_3dlabs_shhandle_intf GLvoid *(* GetShHandle) (struct gl2_3dlabs_shhandle_intf **); }; +struct gl2_debug_intf +{ + struct gl2_generic_intf _generic; + GLvoid (* ClearDebugLog) (struct gl2_debug_intf **, GLenum logType, GLenum shaderType); + GLvoid (* GetDebugLog) (struct gl2_debug_intf **, GLenum logType, GLenum shaderType, + GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); + GLsizei (* GetDebugLogLength) (struct gl2_debug_intf **, GLenum logType, GLenum shaderType); +}; -#if FEATURE_ARB_shader_objects extern void GLAPIENTRY _mesa_DeleteObjectARB(GLhandleARB obj); @@ -260,9 +270,9 @@ _mesa_GetAttribLocationARB (GLhandleARB, const GLcharARB *); #endif /* FEATURE_ARB_vertex_shader */ +#endif /* FEATURE_ARB_shader_objects */ + extern void _mesa_init_shaderobjects (GLcontext *ctx); -#endif /* FEATURE_ARB_shader_objects */ - #endif /* SHADEROBJECTS_H */ |