diff options
Diffstat (limited to 'mesalib/src')
| -rw-r--r-- | mesalib/src/mapi/glapi/glapi_nop.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/queryobj.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/src/mapi/glapi/glapi_nop.c b/mesalib/src/mapi/glapi/glapi_nop.c index 946e35980..cbfbd2433 100644 --- a/mesalib/src/mapi/glapi/glapi_nop.c +++ b/mesalib/src/mapi/glapi/glapi_nop.c @@ -40,6 +40,8 @@ #include "glapi/glapi_priv.h" +#undef _GLAPI_EXPORT +#define _GLAPI_EXPORT void _GLAPI_EXPORT _glapi_noop_enable_warnings(unsigned char enable) @@ -116,4 +118,4 @@ NoOpGeneric(void) #define DISPATCH_TABLE_NAME __glapi_noop_table #define UNUSED_TABLE_NAME __unused_noop_functions -#include "glapi/glapitemp.h" +#include "glapi/gen/glapitemp.h" diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c index 842d8dda5..39c70535a 100644 --- a/mesalib/src/mesa/main/queryobj.c +++ b/mesalib/src/mesa/main/queryobj.c @@ -146,11 +146,11 @@ static struct gl_query_object ** get_pipe_stats_binding_point(struct gl_context *ctx, GLenum target) { - if (!_mesa_is_desktop_gl(ctx) || + const int which = target - GL_VERTICES_SUBMITTED_ARB; + if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_pipeline_statistics_query) return NULL; - const int which = target - GL_VERTICES_SUBMITTED_ARB; assert(which < MAX_PIPELINE_STATISTICS); return &ctx->Query.pipeline_stats[which]; } |