projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: fix comments, whitespace
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_queryobj.h
diff --git
a/src/mesa/state_tracker/st_cb_queryobj.h
b/src/mesa/state_tracker/st_cb_queryobj.h
index fa256b71824606ca0bdd8086c43b2b0865789b08..03f0be8372b400f75c6629232f3d5256f1380194 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_queryobj.h
+++ b/
src/mesa/state_tracker/st_cb_queryobj.h
@@
-29,6
+29,9
@@
#define ST_CB_QUERYOBJ_H
#define ST_CB_QUERYOBJ_H
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+
/**
* Subclass of gl_query_object
*/
/**
* Subclass of gl_query_object
*/
@@
-36,6
+39,7
@@
struct st_query_object
{
struct gl_query_object base;
struct pipe_query *pq;
{
struct gl_query_object base;
struct pipe_query *pq;
+ unsigned type; /**< PIPE_QUERY_x */
};
};
@@
-49,9
+53,18
@@
st_query_object(struct gl_query_object *q)
}
}
+#if FEATURE_queryobj
extern void
st_init_query_functions(struct dd_function_table *functions);
extern void
st_init_query_functions(struct dd_function_table *functions);
+#else
+
+static INLINE void
+st_init_query_functions(struct dd_function_table *functions)
+{
+}
+
+#endif /* FEATURE_queryobj */
#endif
#endif