Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/main/dlist.c | 10 +++++-----
src/mesa/main/extensions.c | 2 +-
src/mesa/main/mfeatures.h | 1 -
src/mesa/main/queryobj.c | 4 ++--
src/mesa/main/queryobj.h | 6 +++---
src/mesa/state_tracker/st_cb_queryobj.c | 4 ++--
src/mesa/state_tracker/st_cb_queryobj.h | 4 ++--
7 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 5103e46..1d192a7 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -5334,7 +5334,7 @@ save_ProgramStringARB(GLenum target, GLenum format,
GLsizei len,
#endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */
-#if FEATURE_queryobj
+#if FEATURE_GL
static void GLAPIENTRY
save_BeginQueryARB(GLenum target, GLuint id)
@@ -5416,7 +5416,7 @@ save_EndQueryIndexed(GLenum target, GLuint index)
}
}
-#endif /* FEATURE_queryobj */
+#endif /* FEATURE_GL */
static void GLAPIENTRY
@@ -8474,7 +8474,7 @@ execute_list(struct gl_context *ctx, GLuint list)
n[6].f));
break;
#endif
-#if FEATURE_queryobj
+#if FEATURE_GL
case OPCODE_BEGIN_QUERY_ARB:
CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui));
break;
@@ -10466,7 +10466,7 @@ _mesa_create_save_table(void)
SET_MapBufferARB(table, _mesa_MapBufferARB);
SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);
-#if FEATURE_queryobj
+#if FEATURE_GL
_mesa_init_queryobj_dispatch(table); /* glGetQuery, etc */
SET_BeginQueryARB(table, save_BeginQueryARB);
SET_EndQueryARB(table, save_EndQueryARB);
@@ -10604,7 +10604,7 @@ _mesa_create_save_table(void)
save_DrawTransformFeedbackInstanced);
SET_DrawTransformFeedbackStreamInstanced(table,
save_DrawTransformFeedbackStreamInstanced);
-#if FEATURE_queryobj
+#if FEATURE_GL
SET_BeginQueryIndexed(table, save_BeginQueryIndexed);
SET_EndQueryIndexed(table, save_EndQueryIndexed);
#endif
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index e6f4541..4b69661 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -416,7 +416,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
-#if FEATURE_queryobj
+#if FEATURE_GL
ctx->Extensions.ARB_occlusion_query = GL_TRUE;
ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;
#endif
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 73f7074..cb7cce1 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
#define FEATURE_remap_table 0
#endif
-#define FEATURE_queryobj FEATURE_GL
#define FEATURE_rastpos FEATURE_GL
#define FEATURE_texture_fxt1 FEATURE_GL
#define FEATURE_texture_s3tc FEATURE_GL
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 407a761..e7070a5 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -34,7 +34,7 @@
#include "main/dispatch.h"
-#if FEATURE_queryobj
+#if FEATURE_GL
/**
@@ -734,7 +734,7 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp)
}
-#endif /* FEATURE_queryobj */
+#endif /* FEATURE_GL */
/**
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index e7a133b..239b99b 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -32,7 +32,7 @@
#include "main/hash.h"
-#if FEATURE_queryobj
+#if FEATURE_GL
static inline struct gl_query_object *
_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
@@ -48,7 +48,7 @@ _mesa_init_query_object_functions(struct dd_function_table
*driver);
extern void
_mesa_init_queryobj_dispatch(struct _glapi_table *disp);
-#else /* FEATURE_queryobj */
+#else /* FEATURE_GL */
static inline struct gl_query_object *
_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
@@ -66,7 +66,7 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp)
{
}
-#endif /* FEATURE_queryobj */
+#endif /* FEATURE_GL */
extern void
_mesa_init_queryobj(struct gl_context *ctx);
diff --git a/src/mesa/state_tracker/st_cb_queryobj.c
b/src/mesa/state_tracker/st_cb_queryobj.c
index e5e4a81..760f4f6 100644
--- a/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/src/mesa/state_tracker/st_cb_queryobj.c
@@ -45,7 +45,7 @@
#include "st_cb_bitmap.h"
-#if FEATURE_queryobj
+#if FEATURE_GL
static struct gl_query_object *
st_NewQueryObject(struct gl_context *ctx, GLuint id)
@@ -195,4 +195,4 @@ void st_init_query_functions(struct dd_function_table
*functions)
functions->GetTimestamp = st_GetTimestamp;
}
-#endif /* FEATURE_queryobj */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/state_tracker/st_cb_queryobj.h
b/src/mesa/state_tracker/st_cb_queryobj.h
index 03f0be8..d6b34cb 100644
--- a/src/mesa/state_tracker/st_cb_queryobj.h
+++ b/src/mesa/state_tracker/st_cb_queryobj.h
@@ -53,7 +53,7 @@ st_query_object(struct gl_query_object *q)
}
-#if FEATURE_queryobj
+#if FEATURE_GL
extern void
st_init_query_functions(struct dd_function_table *functions);
@@ -65,6 +65,6 @@ st_init_query_functions(struct dd_function_table *functions)
{
}
-#endif /* FEATURE_queryobj */
+#endif /* FEATURE_GL */
#endif
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
