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/queryobj.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/queryobj.h')
| -rw-r--r-- | mesalib/src/mesa/main/queryobj.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h index e7a133b59..0f662fb57 100644 --- a/mesalib/src/mesa/main/queryobj.h +++ b/mesalib/src/mesa/main/queryobj.h @@ -32,8 +32,6 @@ #include "main/hash.h" -#if FEATURE_queryobj - static inline struct gl_query_object * _mesa_lookup_query_object(struct gl_context *ctx, GLuint id) { @@ -48,26 +46,6 @@ _mesa_init_query_object_functions(struct dd_function_table *driver); extern void _mesa_init_queryobj_dispatch(struct _glapi_table *disp); -#else /* FEATURE_queryobj */ - -static inline struct gl_query_object * -_mesa_lookup_query_object(struct gl_context *ctx, GLuint id) -{ - return NULL; -} - -static inline void -_mesa_init_query_object_functions(struct dd_function_table *driver) -{ -} - -static inline void -_mesa_init_queryobj_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_queryobj */ - extern void _mesa_init_queryobj(struct gl_context *ctx); |