diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-19 07:53:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-19 07:53:39 +0100 |
| commit | f75616ac3e99a6bb814803c823cb34533b9fc328 (patch) | |
| tree | 83e9fff2bbf6c94df686a938d00858e0a06adcf0 /mesalib/src | |
| parent | cb043e6091c966fa8b772ec86fbc026ddcac9d87 (diff) | |
| parent | 73db05c85f7a8cf2439f7c333ede6ff2dc4877d7 (diff) | |
| download | vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.tar.gz vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.tar.bz2 vcxsrv-f75616ac3e99a6bb814803c823cb34533b9fc328.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb xcb-proto xserver mesa git update 19 nov 2013
Diffstat (limited to 'mesalib/src')
| -rw-r--r-- | mesalib/src/gallium/Automake.inc | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/performance_monitor.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/mesalib/src/gallium/Automake.inc b/mesalib/src/gallium/Automake.inc index b6b9b367a..1e4a34f5d 100644 --- a/mesalib/src/gallium/Automake.inc +++ b/mesalib/src/gallium/Automake.inc @@ -65,11 +65,11 @@ GALLIUM_VDPAU_LINKER_FLAGS = \ -shared \ -no-undefined -# TODO: add -export-symbols-regex GALLIUM_XVMC_LINKER_FLAGS = \ -module \ -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \ -shared \ + -export-symbols-regex '^XvMC' \ -no-undefined GALLIUM_VDPAU_LIB_DEPS = \ diff --git a/mesalib/src/mesa/main/performance_monitor.c b/mesalib/src/mesa/main/performance_monitor.c index 6491b4200..4981e6fb2 100644 --- a/mesalib/src/mesa/main/performance_monitor.c +++ b/mesalib/src/mesa/main/performance_monitor.c @@ -547,6 +547,7 @@ _mesa_GetPerfMonitorCounterDataAMD(GLuint monitor, GLenum pname, GET_CURRENT_CONTEXT(ctx); struct gl_perf_monitor_object *m = lookup_monitor(ctx, monitor); + bool result_available; if (m == NULL) { _mesa_error(ctx, GL_INVALID_VALUE, @@ -569,7 +570,7 @@ _mesa_GetPerfMonitorCounterDataAMD(GLuint monitor, GLenum pname, } /* If the monitor has never ended, there is no result. */ - bool result_available = m->Ended && + result_available = m->Ended && ctx->Driver.IsPerfMonitorResultAvailable(ctx, m); /* AMD appears to return 0 for all queries unless a result is available. */ diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c index 33c2ca661..ec2552384 100644 --- a/mesalib/src/mesa/state_tracker/st_format.c +++ b/mesalib/src/mesa/state_tracker/st_format.c @@ -45,6 +45,7 @@ #include "pipe/p_defines.h" #include "pipe/p_screen.h" #include "util/u_format.h" +#include "st_cb_texture.h" #include "st_context.h" #include "st_format.h" @@ -1726,6 +1727,7 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLenum target, struct st_context *st = st_context(ctx); enum pipe_format pFormat; unsigned bindings; + enum pipe_texture_target pTarget = gl_target_to_pipe(target); if (target == GL_TEXTURE_1D || target == GL_TEXTURE_1D_ARRAY) { /* We don't do compression for these texture targets because of @@ -1782,12 +1784,12 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLenum target, } pFormat = st_choose_format(st, internalFormat, format, type, - PIPE_TEXTURE_2D, 0, bindings, ctx->Mesa_DXTn); + pTarget, 0, bindings, ctx->Mesa_DXTn); if (pFormat == PIPE_FORMAT_NONE) { /* try choosing format again, this time without render target bindings */ pFormat = st_choose_format(st, internalFormat, format, type, - PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW, + pTarget, 0, PIPE_BIND_SAMPLER_VIEW, ctx->Mesa_DXTn); } |