aboutsummaryrefslogtreecommitdiff
path: root/mesalib
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-15 08:09:32 +0100
committermarha <marha@users.sourceforge.net>2013-01-15 08:09:32 +0100
commit2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9 (patch)
tree4187fe77e92137ba4bcdb59e3c1c00034270f7de /mesalib
parent2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff)
downloadvcxsrv-2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9.tar.gz
vcxsrv-2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9.tar.bz2
vcxsrv-2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9.zip
mesa fontconfig xkeyboard-config git update 15 jan 2013
mesa: 1c9833ba70466906d3d2ad3aee6a10642a39abdd fontconfig: 8b8f0d21534aa9b82276815c84429ffca8941d2a xkeyboard-config: 89f25045cb14ff9f08a047494a0d5966f2c1727d
Diffstat (limited to 'mesalib')
-rw-r--r--mesalib/configure.ac4
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_debug.c4
-rw-r--r--mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c5
-rw-r--r--mesalib/src/mesa/state_tracker/st_debug.c2
-rw-r--r--mesalib/src/mesa/state_tracker/st_debug.h2
-rw-r--r--mesalib/src/mesa/state_tracker/st_draw.c9
6 files changed, 25 insertions, 1 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 5072ee007..2d74b825d 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -645,13 +645,15 @@ AC_ARG_ENABLE([gallium_tests],
[enable_gallium_tests=no])
# Option for Gallium drivers
+
+# Keep this in sync with the --with-gallium-drivers help string default value
GALLIUM_DRIVERS_DEFAULT="r300,r600,svga,swrast"
AC_ARG_WITH([gallium-drivers],
[AS_HELP_STRING([--with-gallium-drivers@<:@=DIRS...@:>@],
[comma delimited Gallium drivers list, e.g.
"i915,nouveau,r300,r600,radeonsi,svga,swrast"
- @<:@default=r300,r600,swrast@:>@])],
+ @<:@default=r300,r600,svga,swrast@:>@])],
[with_gallium_drivers="$withval"],
[with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT"])
diff --git a/mesalib/src/gallium/auxiliary/util/u_debug.c b/mesalib/src/gallium/auxiliary/util/u_debug.c
index ce472b020..6e8c5b993 100644
--- a/mesalib/src/gallium/auxiliary/util/u_debug.c
+++ b/mesalib/src/gallium/auxiliary/util/u_debug.c
@@ -386,6 +386,10 @@ static const struct debug_named_value pipe_prim_names[] = {
DEBUG_NAMED_VALUE(PIPE_PRIM_QUADS),
DEBUG_NAMED_VALUE(PIPE_PRIM_QUAD_STRIP),
DEBUG_NAMED_VALUE(PIPE_PRIM_POLYGON),
+ DEBUG_NAMED_VALUE(PIPE_PRIM_LINES_ADJACENCY),
+ DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP_ADJACENCY),
+ DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES_ADJACENCY),
+ DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY),
#endif
DEBUG_NAMED_VALUE_END
};
diff --git a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
index cf291c1c1..d5167352c 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -38,6 +38,7 @@
#include "st_context.h"
#include "st_cb_bufferobjects.h"
+#include "st_debug.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
@@ -230,6 +231,10 @@ st_bufferobj_data(struct gl_context *ctx,
pipe_resource_reference( &st_obj->buffer, NULL );
+ if (ST_DEBUG & DEBUG_BUFFER) {
+ debug_printf("Create buffer size %lu bind 0x%x\n", size, bind);
+ }
+
if (size != 0) {
st_obj->buffer = pipe_buffer_create(pipe->screen, bind,
pipe_usage, size);
diff --git a/mesalib/src/mesa/state_tracker/st_debug.c b/mesalib/src/mesa/state_tracker/st_debug.c
index 850fab925..d0abf5f8c 100644
--- a/mesalib/src/mesa/state_tracker/st_debug.c
+++ b/mesalib/src/mesa/state_tracker/st_debug.c
@@ -53,6 +53,8 @@ static const struct debug_named_value st_debug_flags[] = {
{ "fallback", DEBUG_FALLBACK, NULL },
{ "screen", DEBUG_SCREEN, NULL },
{ "query", DEBUG_QUERY, NULL },
+ { "draw", DEBUG_DRAW, NULL },
+ { "buffer", DEBUG_BUFFER, NULL },
DEBUG_NAMED_VALUE_END
};
diff --git a/mesalib/src/mesa/state_tracker/st_debug.h b/mesalib/src/mesa/state_tracker/st_debug.h
index 4a060d775..1c6e9eea1 100644
--- a/mesalib/src/mesa/state_tracker/st_debug.h
+++ b/mesalib/src/mesa/state_tracker/st_debug.h
@@ -44,6 +44,8 @@ st_print_current(void);
#define DEBUG_FALLBACK 0x20
#define DEBUG_QUERY 0x40
#define DEBUG_SCREEN 0x80
+#define DEBUG_DRAW 0x100
+#define DEBUG_BUFFER 0x200
#ifdef DEBUG
extern int ST_DEBUG;
diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index 7de2bb9b8..de539ca5a 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -48,6 +48,7 @@
#include "st_atom.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_xformfb.h"
+#include "st_debug.h"
#include "st_draw.h"
#include "st_program.h"
@@ -254,6 +255,14 @@ st_draw_vbo(struct gl_context *ctx,
info.max_index = info.start + info.count - 1;
}
+ if (ST_DEBUG & DEBUG_DRAW) {
+ debug_printf("st/draw: mode %s start %u count %u indexed %d\n",
+ u_prim_name(info.mode),
+ info.start,
+ info.count,
+ info.indexed);
+ }
+
if (info.count_from_stream_output) {
cso_draw_vbo(st->cso_context, &info);
}