gallium: Make trivial examples use target helpers

1 files changed, 9 insertions, 13 deletions

diff --git a/src/gallium/tests/trivial/tri.c b/src/gallium/tests/trivial/tri.c
index 7823c27727d..667a27b28ab 100644
--- a/src/gallium/tests/trivial/tri.c
+++ b/src/gallium/tests/trivial/tri.c
@@ -56,18 +56,13 @@
 /* util_make_[fragment|vertex]_passthrough_shader */
 #include "util/u_simple_shaders.h"
 
-/* softpipe software driver */
-#include "softpipe/sp_public.h"
-
+/* sw_screen_create: to get a software pipe driver */
+#include "target-helpers/inline_sw_helper.h"
+/* debug_screen_wrap: to wrap with debug pipe drivers */
+#include "target-helpers/inline_debug_helper.h"
 /* null software winsys */
 #include "sw/null/null_sw_winsys.h"
 
-/* traceing support see src/gallium/drivers/trace/README for more info. */
-#if USE_TRACE
-#include "trace/tr_screen.h"
-#include "trace/tr_context.h"
-#endif
-
 struct program
 {
 	struct pipe_screen *screen;
@@ -93,10 +88,11 @@ struct program
 static void init_prog(struct program *p)
 {
 	/* create the software rasterizer */
-	p->screen = softpipe_create_screen(null_sw_create());
-#if USE_TRACE
-	p->screen = trace_screen_create(p->screen);
-#endif
+	p->screen = sw_screen_create(null_sw_create());
+	/* wrap the screen with any debugger */
+	p->screen = debug_screen_wrap(p->screen);
+
+	/* create the pipe driver context and cso context */
 	p->pipe = p->screen->context_create(p->screen, NULL);
 	p->cso = cso_create_context(p->pipe);