diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
| commit | c72f683c50e774b21967f0121245a286539fa555 (patch) | |
| tree | fa5e86f04a33b8bcebf937d1966052ccf1fefbeb /mesalib/src/mesa/main/syncobj.h | |
| parent | 86fb7e4a298199b30bd16565569a9b3dfe7a1f11 (diff) | |
| parent | e3c4aa34268f99562e66b43a7d9efcd16ca072e6 (diff) | |
| download | vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.gz vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.bz2 vcxsrv-c72f683c50e774b21967f0121245a286539fa555.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/syncobj.h
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/main/syncobj.h')
| -rw-r--r-- | mesalib/src/mesa/main/syncobj.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/mesalib/src/mesa/main/syncobj.h b/mesalib/src/mesa/main/syncobj.h index e2e92b0ac..b0e09a605 100644 --- a/mesalib/src/mesa/main/syncobj.h +++ b/mesalib/src/mesa/main/syncobj.h @@ -39,8 +39,6 @@ struct dd_function_table; struct gl_context; struct gl_sync_object; -#if FEATURE_ARB_sync - extern void GLAPIENTRY _mesa_init_sync_object_functions(struct dd_function_table *driver); @@ -78,42 +76,4 @@ extern void GLAPIENTRY _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#else /* FEATURE_ARB_sync */ - -#include "main/compiler.h" - -static inline void -_mesa_init_sync_object_functions(struct dd_function_table *driver) -{ -} - -static inline void -_mesa_init_sync_dispatch(struct _glapi_table *disp) -{ -} - -static inline void -_mesa_init_sync(struct gl_context *ctx) -{ -} - -static inline void -_mesa_free_sync_data(struct gl_context *ctx) -{ -} - -static inline void -_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj) -{ - ASSERT_NO_FEATURE(); -} - -static inline void -_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj) -{ - ASSERT_NO_FEATURE(); -} - -#endif /* FEATURE_ARB_sync */ - #endif /* SYNCOBJ_H */ |