aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-02-24 07:44:41 +0100
committermarha <marha@users.sourceforge.net>2015-02-24 07:44:41 +0100
commitf64e43decd0fdac938feddeedee255dc4508aaa5 (patch)
tree34e1cfaaea9ad73d9335197ee79b4f99affe4ea9 /mesalib/src
parent462f18c7b25fe3e467f837647d07ab0a78aa8d2b (diff)
parentac2c8a704aac7569f4ae85b890a546644bd86c60 (diff)
downloadvcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.tar.gz
vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.tar.bz2
vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.zip
Merge remote-tracking branch 'origin/released'
Conflicts: apps/xcalc/math.c freetype/src/base/ftbdf.c freetype/src/base/fttype1.c freetype/src/pfr/pfrobjs.c mesalib/src/mesa/main/.gitignore openssl/Configure openssl/Makefile openssl/crypto/cryptlib.c openssl/crypto/opensslconf.h openssl/test/v3nametest.c openssl/util/mk1mf.pl openssl/util/pl/VC-32.pl xorg-server/Xi/xipassivegrab.c xorg-server/dix/dispatch.c xorg-server/dix/getevents.c xorg-server/glx/glxcmds.c xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/hw/xwin/winclipboard/internal.h xorg-server/hw/xwin/winclipboard/thread.c xorg-server/hw/xwin/winclipboard/wndproc.c xorg-server/hw/xwin/winclipboard/xevents.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winprocarg.c xorg-server/render/render.c
Diffstat (limited to 'mesalib/src')
-rw-r--r--mesalib/src/mapi/glapi/glapi_nop.c4
-rw-r--r--mesalib/src/mesa/main/queryobj.c4
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];
}