[Mesa-dev] [PATCH] gallium/test/trivial: make it build

[Brian Paul]

On 06/22/2011 06:31 AM, Alon Levy wrote:
> Signed-off-by: Alon Levy<alevy at redhat.com>
> ---
>   src/gallium/tests/trivial/Makefile   |    9 +++++++--
>   src/gallium/tests/trivial/quad-tex.c |    4 ++--
>   src/gallium/tests/trivial/tri.c      |    4 ++--
>   3 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/src/gallium/tests/trivial/Makefile b/src/gallium/tests/trivial/Makefile
> index 2ed6341..e820000 100644
> --- a/src/gallium/tests/trivial/Makefile
> +++ b/src/gallium/tests/trivial/Makefile
> @@ -11,7 +11,12 @@ INCLUDES = \
>   	-I$(TOP)/src/gallium/winsys \
>   	$(PROG_INCLUDES)
>
> -LINKS = \
> +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 \
> @@ -46,4 +51,4 @@ $(OBJECTS): %.o: %.c
>   	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $(PROG_DEFINES) $<  -o $@
>
>   $(PROGS): %: %.o $(LINKS)
> -	$(CC) $(LDFLAGS) $<  $(LINKS) -lm -lpthread -ldl -o $@
> +	$(CC) $(LDFLAGS) $<  $(LINKS) $(LLVM_LIBS) -lm -lpthread -ldl -o $@
> diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c
> index 3a64b1c..6c38b10 100644
> --- a/src/gallium/tests/trivial/quad-tex.c
> +++ b/src/gallium/tests/trivial/quad-tex.c
> @@ -212,7 +212,7 @@ static void init_prog(struct program *p)
>   	p->sampler.mag_img_filter = PIPE_TEX_MIPFILTER_LINEAR;
>   	p->sampler.normalized_coords = 1;
>
> -	surf_tmpl.format = templat.format;
> +	surf_tmpl.format = PIPE_FORMAT_B8G8R8A8_UNORM; /* All drivers support this */
>   	surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
>   	surf_tmpl.u.tex.level = 0;
>   	surf_tmpl.u.tex.first_layer = 0;
> @@ -329,7 +329,7 @@ static void draw(struct program *p)
>   	/* vertex element data */
>   	cso_set_vertex_elements(p->cso, 2, p->velem);
>
> -	util_draw_vertex_buffer(p->pipe,
> +	util_draw_vertex_buffer(p->pipe, p->cso,
>   	                        p->vbuf, 0,
>   	                        PIPE_PRIM_QUADS,
>   	                        4,  /* verts */
> diff --git a/src/gallium/tests/trivial/tri.c b/src/gallium/tests/trivial/tri.c
> index bfd2f3c..656e92e 100644
> --- a/src/gallium/tests/trivial/tri.c
> +++ b/src/gallium/tests/trivial/tri.c
> @@ -153,7 +153,7 @@ static void init_prog(struct program *p)
>   	p->rasterizer.cull_face = PIPE_FACE_NONE;
>   	p->rasterizer.gl_rasterization_rules = 1;
>
> -	surf_tmpl.format = templat.format;
> +	surf_tmpl.format = PIPE_FORMAT_B8G8R8A8_UNORM;
>   	surf_tmpl.usage = PIPE_BIND_RENDER_TARGET;
>   	surf_tmpl.u.tex.level = 0;
>   	surf_tmpl.u.tex.first_layer = 0;
> @@ -258,7 +258,7 @@ static void draw(struct program *p)
>   	/* vertex element data */
>   	cso_set_vertex_elements(p->cso, 2, p->velem);
>
> -	util_draw_vertex_buffer(p->pipe,
> +	util_draw_vertex_buffer(p->pipe, p->cso,
>   	                        p->vbuf, 0,
>   	                        PIPE_PRIM_TRIANGLES,
>   	                        3,  /* verts */

Thanks.  I'll commit this soon.  Though, I had to use g++ to do the 
final link.  Otherwise I was getting undefined references to 'delete', 
etc.

-Brian