KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: remove FEATURE_queryobj define. 

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Oliver McFadden 2012-09-11 09:19:19 +03:00
parent 0ba82f9108
commit 25ee9617ff
7 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesa/main/dlist.c
View File

@ -5331,8 +5331,6 @@ save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
#endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */ #endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */
#if FEATURE_queryobj
static void GLAPIENTRY static void GLAPIENTRY
save_BeginQueryARB(GLenum target, GLuint id) save_BeginQueryARB(GLenum target, GLuint id)
{ {
@ -5413,8 +5411,6 @@ save_EndQueryIndexed(GLenum target, GLuint index)
} }
} }
#endif /* FEATURE_queryobj */
static void GLAPIENTRY static void GLAPIENTRY
save_DrawBuffersARB(GLsizei count, const GLenum * buffers) save_DrawBuffersARB(GLsizei count, const GLenum * buffers)
@ -8471,7 +8467,6 @@ execute_list(struct gl_context *ctx, GLuint list)
n[6].f)); n[6].f));
break; break;
#endif #endif
#if FEATURE_queryobj
case OPCODE_BEGIN_QUERY_ARB: case OPCODE_BEGIN_QUERY_ARB:
CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui)); CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui));
break; break;
@ -8487,7 +8482,6 @@ execute_list(struct gl_context *ctx, GLuint list)
case OPCODE_END_QUERY_INDEXED: case OPCODE_END_QUERY_INDEXED:
CALL_EndQueryIndexed(ctx->Exec, (n[1].e, n[2].ui)); CALL_EndQueryIndexed(ctx->Exec, (n[1].e, n[2].ui));
break; break;
#endif
case OPCODE_DRAW_BUFFERS_ARB: case OPCODE_DRAW_BUFFERS_ARB:
{ {
GLenum buffers[MAX_DRAW_BUFFERS]; GLenum buffers[MAX_DRAW_BUFFERS];
@ -10463,12 +10457,10 @@ _mesa_create_save_table(void)
SET_MapBufferARB(table, _mesa_MapBufferARB); SET_MapBufferARB(table, _mesa_MapBufferARB);
SET_UnmapBufferARB(table, _mesa_UnmapBufferARB); SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);
#if FEATURE_queryobj
_mesa_init_queryobj_dispatch(table); /* glGetQuery, etc */ _mesa_init_queryobj_dispatch(table); /* glGetQuery, etc */
SET_BeginQueryARB(table, save_BeginQueryARB); SET_BeginQueryARB(table, save_BeginQueryARB);
SET_EndQueryARB(table, save_EndQueryARB); SET_EndQueryARB(table, save_EndQueryARB);
SET_QueryCounter(table, save_QueryCounter); SET_QueryCounter(table, save_QueryCounter);
#endif
SET_DrawBuffersARB(table, save_DrawBuffersARB); SET_DrawBuffersARB(table, save_DrawBuffersARB);
@ -10601,10 +10593,8 @@ _mesa_create_save_table(void)
save_DrawTransformFeedbackInstanced); save_DrawTransformFeedbackInstanced);
SET_DrawTransformFeedbackStreamInstanced(table, SET_DrawTransformFeedbackStreamInstanced(table,
save_DrawTransformFeedbackStreamInstanced); save_DrawTransformFeedbackStreamInstanced);
#if FEATURE_queryobj
SET_BeginQueryIndexed(table, save_BeginQueryIndexed); SET_BeginQueryIndexed(table, save_BeginQueryIndexed);
SET_EndQueryIndexed(table, save_EndQueryIndexed); SET_EndQueryIndexed(table, save_EndQueryIndexed);
#endif
#endif #endif
/* GL_ARB_instanced_arrays */ /* GL_ARB_instanced_arrays */

2
src/mesa/main/extensions.c
View File

@ -416,10 +416,8 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.ARB_half_float_pixel = GL_TRUE; ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
ctx->Extensions.ARB_half_float_vertex = GL_TRUE; ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
ctx->Extensions.ARB_map_buffer_range = GL_TRUE; ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
#if FEATURE_queryobj
ctx->Extensions.ARB_occlusion_query = GL_TRUE; ctx->Extensions.ARB_occlusion_query = GL_TRUE;
ctx->Extensions.ARB_occlusion_query2 = GL_TRUE; ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;
#endif
ctx->Extensions.ARB_point_sprite = GL_TRUE; ctx->Extensions.ARB_point_sprite = GL_TRUE;
#if FEATURE_ARB_shader_objects #if FEATURE_ARB_shader_objects
ctx->Extensions.ARB_shader_objects = GL_TRUE; ctx->Extensions.ARB_shader_objects = GL_TRUE;

1
src/mesa/main/mfeatures.h
View File

@ -84,7 +84,6 @@
#define FEATURE_remap_table 0 #define FEATURE_remap_table 0
#endif #endif
#define FEATURE_queryobj FEATURE_GL
#define FEATURE_rastpos FEATURE_GL #define FEATURE_rastpos FEATURE_GL
#define FEATURE_texture_fxt1 FEATURE_GL #define FEATURE_texture_fxt1 FEATURE_GL
#define FEATURE_texture_s3tc FEATURE_GL #define FEATURE_texture_s3tc FEATURE_GL

6
src/mesa/main/queryobj.c
View File

@ -34,9 +34,6 @@
#include "main/dispatch.h" #include "main/dispatch.h"
#if FEATURE_queryobj
/** /**
* Allocate a new query object. This is a fallback routine called via * Allocate a new query object. This is a fallback routine called via
* ctx->Driver.NewQueryObject(). * ctx->Driver.NewQueryObject().
@ -734,9 +731,6 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp)
} }
#endif /* FEATURE_queryobj */
/** /**
* Allocate/init the context state related to query objects. * Allocate/init the context state related to query objects.
*/ */

22
src/mesa/main/queryobj.h
View File

@ -32,8 +32,6 @@
#include "main/hash.h" #include "main/hash.h"
#if FEATURE_queryobj
static inline struct gl_query_object * static inline struct gl_query_object *
_mesa_lookup_query_object(struct gl_context *ctx, GLuint id) _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 extern void
_mesa_init_queryobj_dispatch(struct _glapi_table *disp); _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 extern void
_mesa_init_queryobj(struct gl_context *ctx); _mesa_init_queryobj(struct gl_context *ctx);

4
src/mesa/state_tracker/st_cb_queryobj.c
View File

@ -45,8 +45,6 @@
#include "st_cb_bitmap.h" #include "st_cb_bitmap.h"
#if FEATURE_queryobj
static struct gl_query_object * static struct gl_query_object *
st_NewQueryObject(struct gl_context *ctx, GLuint id) st_NewQueryObject(struct gl_context *ctx, GLuint id)
{ {
@ -194,5 +192,3 @@ void st_init_query_functions(struct dd_function_table *functions)
functions->CheckQuery = st_CheckQuery; functions->CheckQuery = st_CheckQuery;
functions->GetTimestamp = st_GetTimestamp; functions->GetTimestamp = st_GetTimestamp;
} }
#endif /* FEATURE_queryobj */

10
src/mesa/state_tracker/st_cb_queryobj.h
View File

@ -53,18 +53,8 @@ st_query_object(struct gl_query_object *q)
} }
#if FEATURE_queryobj
extern void extern void
st_init_query_functions(struct dd_function_table *functions); 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