Mesa (master): st/mesa: move st_query_object type to header to make it public
Brian Paul
brianp at kemper.freedesktop.org
Mon Jan 4 18:50:04 UTC 2010
Module: Mesa
Branch: master
Commit: f1b382d2e66855d49354356f2d3209652aaf5987
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1b382d2e66855d49354356f2d3209652aaf5987
Author: Brian Paul <brianp at vmware.com>
Date: Thu Dec 31 14:46:57 2009 -0700
st/mesa: move st_query_object type to header to make it public
---
src/mesa/state_tracker/st_cb_queryobj.c | 17 -----------------
src/mesa/state_tracker/st_cb_queryobj.h | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c
index dcf4c38..10629e9 100644
--- a/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/src/mesa/state_tracker/st_cb_queryobj.c
@@ -44,23 +44,6 @@
#include "st_public.h"
-struct st_query_object
-{
- struct gl_query_object base;
- struct pipe_query *pq;
-};
-
-
-/**
- * Cast wrapper
- */
-static struct st_query_object *
-st_query_object(struct gl_query_object *q)
-{
- return (struct st_query_object *) q;
-}
-
-
static struct gl_query_object *
st_NewQueryObject(GLcontext *ctx, GLuint id)
{
diff --git a/src/mesa/state_tracker/st_cb_queryobj.h b/src/mesa/state_tracker/st_cb_queryobj.h
index 9220a21..fa256b7 100644
--- a/src/mesa/state_tracker/st_cb_queryobj.h
+++ b/src/mesa/state_tracker/st_cb_queryobj.h
@@ -29,6 +29,27 @@
#define ST_CB_QUERYOBJ_H
+/**
+ * Subclass of gl_query_object
+ */
+struct st_query_object
+{
+ struct gl_query_object base;
+ struct pipe_query *pq;
+};
+
+
+/**
+ * Cast wrapper
+ */
+static INLINE struct st_query_object *
+st_query_object(struct gl_query_object *q)
+{
+ return (struct st_query_object *) q;
+}
+
+
+
extern void
st_init_query_functions(struct dd_function_table *functions);
More information about the mesa-commit
mailing list