aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-15 08:12:01 +0100
committermarha <marha@users.sourceforge.net>2013-01-15 08:12:01 +0100
commit15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (patch)
treee95bdde41b08c417f162e21471def49b08fed4fd /mesalib/src
parent7fbec6dbb6e061fe5b8c592dd602cf4b4c65155a (diff)
parent2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9 (diff)
downloadvcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.tar.gz
vcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.tar.bz2
vcxsrv-15cdb95b194cb051a5d469cc9eb73eb0eed4db41.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa fontconfig xkeyboard-config git update 15 jan 2013
Diffstat (limited to 'mesalib/src')
-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
5 files changed, 22 insertions, 0 deletions
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);
}