summaryrefslogtreecommitdiffstats
path: root/src/gallium/tests/trivial/quad-tex.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/tests/trivial/quad-tex.c')
-rw-r--r--src/gallium/tests/trivial/quad-tex.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c
index 522ff3cb42d..cf88edcdc56 100644
--- a/src/gallium/tests/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
@@ -58,18 +58,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;
@@ -98,10 +93,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);
@@ -201,8 +197,7 @@ static void init_prog(struct program *p)
/* rasterizer */
memset(&p->rasterizer, 0, sizeof(p->rasterizer));
- p->rasterizer.front_winding = PIPE_WINDING_CW;
- p->rasterizer.cull_mode = PIPE_WINDING_NONE;
+ p->rasterizer.cull_face = PIPE_FACE_NONE;
p->rasterizer.gl_rasterization_rules = 1;
/* sampler */
@@ -272,7 +267,7 @@ static void init_prog(struct program *p)
}
/* fragment shader */
- p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D);
+ p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D, TGSI_INTERPOLATE_LINEAR);
}
static void close_prog(struct program *p)