diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/tests/trivial/Makefile | 27 | ||||
| -rw-r--r-- | src/gallium/tests/trivial/quad-tex.c | 24 | ||||
| -rw-r--r-- | src/gallium/tests/trivial/tri.c | 24 |
3 files changed, 39 insertions, 36 deletions
diff --git a/src/gallium/tests/trivial/Makefile b/src/gallium/tests/trivial/Makefile index 4ddbb0b73dc..bfe186b1607 100644 --- a/src/gallium/tests/trivial/Makefile +++ b/src/gallium/tests/trivial/Makefile @@ -11,19 +11,10 @@ INCLUDES = \ -I$(TOP)/src/gallium/winsys \ $(PROG_INCLUDES) -ifeq ($(MESA_LLVM),1) -LINKS = $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a -LDFLAGS += $(LLVM_LDFLAGS) -endif - LINKS += \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/galahad/libgalahad.a \ - $(TOP)/src/gallium/winsys/sw/null/libws_null.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ + $(GALLIUM_PIPE_LOADER_LIBS) \ $(GALLIUM_AUXILIARIES) \ - $(PROG_LINKS) + $(PROG_LINKS) $(LIBUDEV_LIBS) SOURCES = \ tri.c \ @@ -33,17 +24,25 @@ OBJECTS = $(SOURCES:.c=.o) PROGS = $(OBJECTS:.o=) -PROG_DEFINES = \ - -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD +PROG_DEFINES = -DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)\" \ + $(GALLIUM_PIPE_LOADER_DEFINES) + +PIPE_SRC_DIR = $(TOP)/src/gallium/targets/pipe-loader ##### TARGETS ##### -default: $(PROGS) +default: $(PROGS) pipes + +install: clean: -rm -f $(PROGS) -rm -f *.o -rm -f result.bmp + @$(MAKE) -C $(PIPE_SRC_DIR) clean + +pipes: + @$(MAKE) -C $(PIPE_SRC_DIR) ##### RULES ##### diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c index cc19e8d5eec..7caac29299f 100644 --- a/src/gallium/tests/trivial/quad-tex.c +++ b/src/gallium/tests/trivial/quad-tex.c @@ -57,16 +57,12 @@ #include "util/u_memory.h" /* util_make_[fragment|vertex]_passthrough_shader */ #include "util/u_simple_shaders.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" +/* to get a hardware pipe driver */ +#include "pipe-loader/pipe_loader.h" struct program { + struct pipe_loader_device *dev; struct pipe_screen *screen; struct pipe_context *pipe; struct cso_context *cso; @@ -93,10 +89,15 @@ struct program static void init_prog(struct program *p) { struct pipe_surface surf_tmpl; - /* create the software rasterizer */ - p->screen = sw_screen_create(null_sw_create()); - /* wrap the screen with any debugger */ - p->screen = debug_screen_wrap(p->screen); + int ret; + + /* find a hardware device */ + ret = pipe_loader_probe(&p->dev, 1); + assert(ret); + + /* init a pipe screen */ + p->screen = pipe_loader_create_screen(p->dev, PIPE_SEARCH_DIR); + assert(p->screen); /* create the pipe driver context and cso context */ p->pipe = p->screen->context_create(p->screen, NULL); @@ -298,6 +299,7 @@ static void close_prog(struct program *p) cso_destroy_context(p->cso); p->pipe->destroy(p->pipe); p->screen->destroy(p->screen); + pipe_loader_release(&p->dev, 1); FREE(p); } diff --git a/src/gallium/tests/trivial/tri.c b/src/gallium/tests/trivial/tri.c index 9190f7824e9..f3e1e944154 100644 --- a/src/gallium/tests/trivial/tri.c +++ b/src/gallium/tests/trivial/tri.c @@ -55,16 +55,12 @@ #include "util/u_memory.h" /* util_make_[fragment|vertex]_passthrough_shader */ #include "util/u_simple_shaders.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" +/* to get a hardware pipe driver */ +#include "pipe-loader/pipe_loader.h" struct program { + struct pipe_loader_device *dev; struct pipe_screen *screen; struct pipe_context *pipe; struct cso_context *cso; @@ -88,10 +84,15 @@ struct program static void init_prog(struct program *p) { struct pipe_surface surf_tmpl; - /* create the software rasterizer */ - p->screen = sw_screen_create(null_sw_create()); - /* wrap the screen with any debugger */ - p->screen = debug_screen_wrap(p->screen); + int ret; + + /* find a hardware device */ + ret = pipe_loader_probe(&p->dev, 1); + assert(ret); + + /* init a pipe screen */ + p->screen = pipe_loader_create_screen(p->dev, PIPE_SEARCH_DIR); + assert(p->screen); /* create the pipe driver context and cso context */ p->pipe = p->screen->context_create(p->screen, NULL); @@ -234,6 +235,7 @@ static void close_prog(struct program *p) cso_destroy_context(p->cso); p->pipe->destroy(p->pipe); p->screen->destroy(p->screen); + pipe_loader_release(&p->dev, 1); FREE(p); } |