From b172aebfdf288d3487876f7cb01c62582920d4c2 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 27 Jul 2010 18:13:47 -0700
Subject: scons: Fix sunos5 build.

---
 src/gallium/tests/graw/SConscript | 3 +++
 src/gallium/tests/unit/SConscript | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/graw/SConscript b/src/gallium/tests/graw/SConscript
index 61121732e3..7e39ec21a4 100644
--- a/src/gallium/tests/graw/SConscript
+++ b/src/gallium/tests/graw/SConscript
@@ -11,6 +11,9 @@ env = env.Clone()
 env.Prepend(LIBPATH = [graw.dir])
 env.Prepend(LIBS = ['graw'] + gallium)
 
+if platform == 'sunos5':
+    env.Append(LIBS = ['m'])
+
 progs = [
     'clear',
     'tri',
diff --git a/src/gallium/tests/unit/SConscript b/src/gallium/tests/unit/SConscript
index 8a9f3504c7..a200123f44 100644
--- a/src/gallium/tests/unit/SConscript
+++ b/src/gallium/tests/unit/SConscript
@@ -4,6 +4,9 @@ env = env.Clone()
 
 env.Prepend(LIBS = [gallium])
 
+if platform == 'sunos5':
+    env.Append(LIBS = ['m'])
+
 progs = [
     'pipe_barrier_test',
     'u_cache_test',
-- 
cgit v1.2.3


From d4d62b6178c43cff9a0de522c4cf512109cb4b03 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Thu, 29 Jul 2010 16:04:28 +0800
Subject: graw/tests: Use pipe_context::draw_vbo.

The other drawing variants such as draw_arrays or
draw_elements_instanced were removed.

This fixes fdo bug #29287.
---
 src/gallium/tests/graw/fs-test.c       |  3 ++-
 src/gallium/tests/graw/gs-test.c       |  5 +++--
 src/gallium/tests/graw/quad-tex.c      |  3 ++-
 src/gallium/tests/graw/tri-gs.c        |  3 ++-
 src/gallium/tests/graw/tri-instanced.c | 25 +++++++++++++++----------
 src/gallium/tests/graw/tri.c           |  3 ++-
 src/gallium/tests/graw/vs-test.c       |  3 ++-
 7 files changed, 28 insertions(+), 17 deletions(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c
index dea087357d..53fbb744d8 100644
--- a/src/gallium/tests/graw/fs-test.c
+++ b/src/gallium/tests/graw/fs-test.c
@@ -13,6 +13,7 @@
 #include "util/u_debug.h"       /* debug_dump_surface_bmp() */
 #include "util/u_inlines.h"
 #include "util/u_memory.h"      /* Offset() */
+#include "util/u_draw_quad.h"
 #include "util/u_box.h"    
 
 static const char *filename = NULL;
@@ -275,7 +276,7 @@ static void draw( void )
    float clear_color[4] = {.1,.3,.5,0};
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
-   ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
+   util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
    ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
 
 #if 0
diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c
index 3087d446fc..62714900bd 100644
--- a/src/gallium/tests/graw/gs-test.c
+++ b/src/gallium/tests/graw/gs-test.c
@@ -13,6 +13,7 @@
 #include "util/u_debug.h"       /* debug_dump_surface_bmp() */
 #include "util/u_inlines.h"
 #include "util/u_memory.h"      /* Offset() */
+#include "util/u_draw_quad.h"
 #include "util/u_box.h"    
 
 static const char *filename = NULL;
@@ -336,9 +337,9 @@ static void draw( void )
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
    if (draw_strip)
-      ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLE_STRIP, 0, 4);
+      util_draw_arrays(ctx, PIPE_PRIM_TRIANGLE_STRIP, 0, 4);
    else
-      ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
+      util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
 
    ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
 
diff --git a/src/gallium/tests/graw/quad-tex.c b/src/gallium/tests/graw/quad-tex.c
index 6a0a2ba295..c50ef12ab5 100644
--- a/src/gallium/tests/graw/quad-tex.c
+++ b/src/gallium/tests/graw/quad-tex.c
@@ -12,6 +12,7 @@
 #include "util/u_debug.h"       /* debug_dump_surface_bmp() */
 #include "util/u_inlines.h"
 #include "util/u_memory.h"      /* Offset() */
+#include "util/u_draw_quad.h"
 #include "util/u_box.h"    
 
 enum pipe_format formats[] = {
@@ -146,7 +147,7 @@ static void draw( void )
    float clear_color[4] = {.5,.5,.5,1};
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
-   ctx->draw_arrays(ctx, PIPE_PRIM_QUADS, 0, 4);
+   util_draw_arrays(ctx, PIPE_PRIM_QUADS, 0, 4);
    ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
 
 #if 0
diff --git a/src/gallium/tests/graw/tri-gs.c b/src/gallium/tests/graw/tri-gs.c
index d187505f8d..152ae408eb 100644
--- a/src/gallium/tests/graw/tri-gs.c
+++ b/src/gallium/tests/graw/tri-gs.c
@@ -10,6 +10,7 @@
 
 #include "util/u_debug.h"       /* debug_dump_surface_bmp() */
 #include "util/u_memory.h"      /* Offset() */
+#include "util/u_draw_quad.h"
 
 enum pipe_format formats[] = {
    PIPE_FORMAT_R8G8B8A8_UNORM,
@@ -161,7 +162,7 @@ static void draw( void )
    float clear_color[4] = {1,0,1,1};
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
-   ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
+   util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
    ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
 
    screen->flush_frontbuffer(screen, surf, window);
diff --git a/src/gallium/tests/graw/tri-instanced.c b/src/gallium/tests/graw/tri-instanced.c
index 30e205f143..8859f745fd 100644
--- a/src/gallium/tests/graw/tri-instanced.c
+++ b/src/gallium/tests/graw/tri-instanced.c
@@ -13,6 +13,7 @@
 
 #include "util/u_debug.h"       /* debug_dump_surface_bmp() */
 #include "util/u_memory.h"      /* Offset() */
+#include "util/u_draw_quad.h"
 
 
 enum pipe_format formats[] = {
@@ -27,7 +28,6 @@ static const int HEIGHT = 300;
 static struct pipe_screen *screen = NULL;
 static struct pipe_context *ctx = NULL;
 static struct pipe_surface *surf = NULL;
-static struct pipe_resource *indexBuffer = NULL;
 static void *window = NULL;
 
 struct vertex {
@@ -105,6 +105,7 @@ static void set_vertices( void )
 {
    struct pipe_vertex_element ve[3];
    struct pipe_vertex_buffer vbuf[2];
+   struct pipe_index_buffer ibuf;
    void *handle;
 
    memset(ve, 0, sizeof ve);
@@ -151,11 +152,14 @@ static void set_vertices( void )
    ctx->set_vertex_buffers(ctx, 2, vbuf);
 
    /* index data */
-   indexBuffer = screen->user_buffer_create(screen,
+   ibuf.buffer = screen->user_buffer_create(screen,
                                             indices,
                                             sizeof(indices),
                                             PIPE_BIND_VERTEX_BUFFER);
+   ibuf.offset = 0;
+   ibuf.index_size = 2;
 
+   ctx->set_index_buffer(ctx, &ibuf);
 
 }
 
@@ -195,18 +199,19 @@ static void set_fragment_shader( void )
 static void draw( void )
 {
    float clear_color[4] = {1,0,1,1};
+   struct pipe_draw_info info;
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
 
+   util_draw_init_info(&info);
+   info.indexed = (draw_elements != 0);
+   info.mode = PIPE_PRIM_TRIANGLES;
+   info.start = 0;
+   info.count = 3;
    /* draw NUM_INST triangles */
-   if (draw_elements)
-      ctx->draw_elements_instanced(ctx, indexBuffer, 2,
-                                   0, /* indexBias */
-                                   PIPE_PRIM_TRIANGLES,
-                                   0, 3, /* start, count */
-                                   0, NUM_INST); /* startInst, instCount */
-   else
-      ctx->draw_arrays_instanced(ctx, PIPE_PRIM_TRIANGLES, 0, 3, 0, NUM_INST);
+   info.instance_count = NUM_INST;
+
+   ctx->draw_vbo(ctx, &info);
 
    ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
 
diff --git a/src/gallium/tests/graw/tri.c b/src/gallium/tests/graw/tri.c
index 80377f526d..4dbd2c062a 100644
--- a/src/gallium/tests/graw/tri.c
+++ b/src/gallium/tests/graw/tri.c
@@ -10,6 +10,7 @@
 
 #include "util/u_debug.h"       /* debug_dump_surface_bmp() */
 #include "util/u_memory.h"      /* Offset() */
+#include "util/u_draw_quad.h"
 
 enum pipe_format formats[] = {
    PIPE_FORMAT_R8G8B8A8_UNORM,
@@ -134,7 +135,7 @@ static void draw( void )
    float clear_color[4] = {1,0,1,1};
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
-   ctx->draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
+   util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3);
    ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
 
 #if 0
diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c
index 7f93db42c0..e1cd814bf7 100644
--- a/src/gallium/tests/graw/vs-test.c
+++ b/src/gallium/tests/graw/vs-test.c
@@ -14,6 +14,7 @@
 #include "util/u_debug.h"       /* debug_dump_surface_bmp() */
 #include "util/u_inlines.h"
 #include "util/u_memory.h"      /* Offset() */
+#include "util/u_draw_quad.h"
 #include "util/u_box.h"    
 
 static const char *filename = NULL;
@@ -226,7 +227,7 @@ static void draw( void )
    float clear_color[4] = {.1,.3,.5,0};
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, clear_color, 0, 0);
-   ctx->draw_arrays(ctx, PIPE_PRIM_POINTS, 0, Elements(vertices));
+   util_draw_arrays(ctx, PIPE_PRIM_POINTS, 0, Elements(vertices));
    ctx->flush(ctx, PIPE_FLUSH_RENDER_CACHE, NULL);
 
 #if 0
-- 
cgit v1.2.3


From 945e38c73b46afc12b0655f9fc8200f216a8f8c1 Mon Sep 17 00:00:00 2001
From: Luca Barbieri <luca@luca-barbieri.com>
Date: Wed, 11 Aug 2010 15:57:37 +0200
Subject: translate: add testsuite

Currently only checks all possible format conversions, and doesn't
attempt to test whether multiple buffers/elements or indices work.
---
 src/gallium/tests/unit/Makefile         |   3 +-
 src/gallium/tests/unit/translate_test.c | 170 ++++++++++++++++++++++++++++++++
 2 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100644 src/gallium/tests/unit/translate_test.c

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/unit/Makefile b/src/gallium/tests/unit/Makefile
index f65958dadd..345bd1f694 100644
--- a/src/gallium/tests/unit/Makefile
+++ b/src/gallium/tests/unit/Makefile
@@ -22,7 +22,8 @@ SOURCES = \
 	pipe_barrier_test.c \
 	u_cache_test.c \
 	u_half_test.c \
-	u_format_test.c
+	u_format_test.c \
+	translate_test.c
 
 
 OBJECTS = $(SOURCES:.c=.o)
diff --git a/src/gallium/tests/unit/translate_test.c b/src/gallium/tests/unit/translate_test.c
new file mode 100644
index 0000000000..473c73afaa
--- /dev/null
+++ b/src/gallium/tests/unit/translate_test.c
@@ -0,0 +1,170 @@
+/**************************************************************************
+ *
+ * Copyright © 2010 Luca Barbieri
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#include <stdio.h>
+#include <translate/translate.h>
+#include <util/u_memory.h>
+#include <util/u_format.h>
+
+int main(int argc, char** argv)
+{
+	struct translate *(*create_fn)( const struct translate_key *key ) = 0;
+
+	struct translate_key key;
+	unsigned output_format;
+	unsigned input_format;
+	unsigned char* buffer[5];
+	unsigned count = 4;
+	unsigned i, j, k;
+	unsigned passed = 0;
+	unsigned total = 0;
+
+	create_fn = 0;
+
+	if(argc > 1 && !strcmp(argv[1], "generic"))
+		create_fn = translate_generic_create;
+	else if(argc > 1 && !strcmp(argv[1], "x86"))
+		create_fn = translate_sse2_create;
+
+	if(!create_fn)
+	{
+		printf("Usage: ./translate_test [generic|x86]\n");
+		return 1;
+	}
+
+	for(i = 0; i < Elements(buffer); ++i)
+		buffer[i] = align_malloc(4096, 4096);
+
+	key.nr_elements = 1;
+	key.element[0].input_buffer = 0;
+	key.element[0].input_offset = 0;
+	key.element[0].output_offset = 0;
+	key.element[0].type = TRANSLATE_ELEMENT_NORMAL;
+	key.element[0].instance_divisor = 0;
+
+	srand(4359025);
+	for(i = 0; i < 4096; ++i)
+		buffer[0][i] = rand() & 0x7f; /* avoid negative values that work badly when converted to unsigned format*/
+
+	for(output_format = 0; output_format < PIPE_FORMAT_COUNT; ++output_format)
+	{
+		const struct util_format_description* output_format_desc = util_format_description(output_format);
+		unsigned output_format_size = util_format_get_stride(output_format, 1);
+		if(!output_format_desc
+			|| !output_format_desc->fetch_rgba_float
+			|| !output_format_desc->pack_rgba_float
+			|| output_format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB
+			|| output_format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN
+		)
+			continue;
+
+		for(input_format = 0; input_format < PIPE_FORMAT_COUNT; ++input_format)
+		{
+			const struct util_format_description* input_format_desc = util_format_description(input_format);
+			unsigned input_format_size = util_format_get_stride(input_format, 1);
+			struct translate* translate[2];
+			unsigned fail = 0;
+
+			if(!input_format_desc
+				|| !input_format_desc->fetch_rgba_float
+				|| !input_format_desc->pack_rgba_float
+				|| input_format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB
+				|| input_format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN
+			)
+				continue;
+
+			key.element[0].input_format = input_format;
+			key.element[0].output_format = output_format;
+			key.output_stride = output_format_size;
+			translate[0] = create_fn(&key);
+			if(!translate[0])
+				continue;
+
+			key.element[0].input_format = output_format;
+			key.element[0].output_format = input_format;
+			key.output_stride = input_format_size;
+			translate[1] = create_fn(&key);
+			if(!translate[1])
+				goto free_translate0;
+
+			translate[0]->set_buffer(translate[0], 0, buffer[0], input_format_size, ~0);
+			translate[0]->run(translate[0], 0, count, 0, buffer[1]);
+			translate[1]->set_buffer(translate[1], 0, buffer[1], output_format_size, ~0);
+			translate[1]->run(translate[1], 0, count, 0, buffer[2]);
+			translate[0]->set_buffer(translate[0], 0, buffer[2], input_format_size, ~0);
+			translate[0]->run(translate[0], 0, count, 0, buffer[3]);
+			translate[1]->set_buffer(translate[1], 0, buffer[3], output_format_size, ~0);
+			translate[1]->run(translate[1], 0, count, 0, buffer[4]);
+
+			for(i = 0; i < count; ++i)
+			{
+				float a[4];
+				float b[4];
+				float error = 0.03125;
+				input_format_desc->fetch_rgba_float(a, buffer[2] + i * input_format_size, 0, 0);
+				input_format_desc->fetch_rgba_float(b, buffer[4] + i * input_format_size, 0, 0);
+
+				for(j = 0; j < count; ++j)
+				{
+					float d = a[j] - b[j];
+					if(d > error || d < -error)
+					{
+						fail = 1;
+						break;
+					}
+				}
+			}
+
+			if(fail)
+			{
+				printf("FAIL: %s -> %s -> %s -> %s -> %s\n", input_format_desc->name, output_format_desc->name, input_format_desc->name, output_format_desc->name, input_format_desc->name);
+				for(i = 0; i < Elements(buffer); ++i)
+				{
+					unsigned format_size = (i & 1) ? output_format_size : input_format_size;
+					printf("%c ",  (i == 2 || i == 4) ? '*' : ' ');
+					for(j = 0; j < count; ++j)
+					{
+						for(k = 0; k < format_size; ++k)
+						{
+							printf("%02x", buffer[i][j * format_size + k]);
+						}
+						printf(" ");
+					}
+					printf("\n");
+				}
+			}
+			else
+				++passed;
+			++total;
+
+			translate[1]->release(translate[1]);
+free_translate0:
+			translate[0]->release(translate[0]);
+		}
+	}
+
+	printf("%u/%u tests passed for translate_%s\n", passed, total, argv[1]);
+	return 0;
+}
-- 
cgit v1.2.3


From f7d7b080a17abc1bb25b0d076c8ba275c3fc1cec Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Wed, 11 Aug 2010 12:18:25 -0700
Subject: translate: Add translate_test.c to SCons.

This is a follow-up to commit 945e38c73b46afc12b0655f9fc8200f216a8f8c1,
which added translate_test.c to make.
---
 src/gallium/tests/unit/SConscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/unit/SConscript b/src/gallium/tests/unit/SConscript
index a200123f44..a0ad58ffa2 100644
--- a/src/gallium/tests/unit/SConscript
+++ b/src/gallium/tests/unit/SConscript
@@ -11,7 +11,8 @@ progs = [
     'pipe_barrier_test',
     'u_cache_test',
     'u_format_test',
-    'u_half_test'
+    'u_half_test',
+    'translate_test'
 ]
 
 for prog in progs:
-- 
cgit v1.2.3


From 99cc6d70a4dc87c67f3eec9b118a853947718373 Mon Sep 17 00:00:00 2001
From: Luca Barbieri <luca@luca-barbieri.com>
Date: Wed, 11 Aug 2010 21:28:33 +0200
Subject: translate_test: fix, reindent, and improve

1. Fix the segfault due to the reverted commit using the new interface
2. Reindent to Mesa 3 spaces style
3. Improve output and return success/failure with error code
4. Add much better support for testing translate_sse
---
 src/gallium/tests/unit/translate_test.c | 341 +++++++++++++++++++-------------
 1 file changed, 204 insertions(+), 137 deletions(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/unit/translate_test.c b/src/gallium/tests/unit/translate_test.c
index 473c73afaa..a934a6abf4 100644
--- a/src/gallium/tests/unit/translate_test.c
+++ b/src/gallium/tests/unit/translate_test.c
@@ -27,144 +27,211 @@
 #include <translate/translate.h>
 #include <util/u_memory.h>
 #include <util/u_format.h>
+#include <util/u_cpu_detect.h>
+#include <rtasm/rtasm_cpu.h>
 
 int main(int argc, char** argv)
 {
-	struct translate *(*create_fn)( const struct translate_key *key ) = 0;
-
-	struct translate_key key;
-	unsigned output_format;
-	unsigned input_format;
-	unsigned char* buffer[5];
-	unsigned count = 4;
-	unsigned i, j, k;
-	unsigned passed = 0;
-	unsigned total = 0;
-
-	create_fn = 0;
-
-	if(argc > 1 && !strcmp(argv[1], "generic"))
-		create_fn = translate_generic_create;
-	else if(argc > 1 && !strcmp(argv[1], "x86"))
-		create_fn = translate_sse2_create;
-
-	if(!create_fn)
-	{
-		printf("Usage: ./translate_test [generic|x86]\n");
-		return 1;
-	}
-
-	for(i = 0; i < Elements(buffer); ++i)
-		buffer[i] = align_malloc(4096, 4096);
-
-	key.nr_elements = 1;
-	key.element[0].input_buffer = 0;
-	key.element[0].input_offset = 0;
-	key.element[0].output_offset = 0;
-	key.element[0].type = TRANSLATE_ELEMENT_NORMAL;
-	key.element[0].instance_divisor = 0;
-
-	srand(4359025);
-	for(i = 0; i < 4096; ++i)
-		buffer[0][i] = rand() & 0x7f; /* avoid negative values that work badly when converted to unsigned format*/
-
-	for(output_format = 0; output_format < PIPE_FORMAT_COUNT; ++output_format)
-	{
-		const struct util_format_description* output_format_desc = util_format_description(output_format);
-		unsigned output_format_size = util_format_get_stride(output_format, 1);
-		if(!output_format_desc
-			|| !output_format_desc->fetch_rgba_float
-			|| !output_format_desc->pack_rgba_float
-			|| output_format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB
-			|| output_format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN
-		)
-			continue;
-
-		for(input_format = 0; input_format < PIPE_FORMAT_COUNT; ++input_format)
-		{
-			const struct util_format_description* input_format_desc = util_format_description(input_format);
-			unsigned input_format_size = util_format_get_stride(input_format, 1);
-			struct translate* translate[2];
-			unsigned fail = 0;
-
-			if(!input_format_desc
-				|| !input_format_desc->fetch_rgba_float
-				|| !input_format_desc->pack_rgba_float
-				|| input_format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB
-				|| input_format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN
-			)
-				continue;
-
-			key.element[0].input_format = input_format;
-			key.element[0].output_format = output_format;
-			key.output_stride = output_format_size;
-			translate[0] = create_fn(&key);
-			if(!translate[0])
-				continue;
-
-			key.element[0].input_format = output_format;
-			key.element[0].output_format = input_format;
-			key.output_stride = input_format_size;
-			translate[1] = create_fn(&key);
-			if(!translate[1])
-				goto free_translate0;
-
-			translate[0]->set_buffer(translate[0], 0, buffer[0], input_format_size, ~0);
-			translate[0]->run(translate[0], 0, count, 0, buffer[1]);
-			translate[1]->set_buffer(translate[1], 0, buffer[1], output_format_size, ~0);
-			translate[1]->run(translate[1], 0, count, 0, buffer[2]);
-			translate[0]->set_buffer(translate[0], 0, buffer[2], input_format_size, ~0);
-			translate[0]->run(translate[0], 0, count, 0, buffer[3]);
-			translate[1]->set_buffer(translate[1], 0, buffer[3], output_format_size, ~0);
-			translate[1]->run(translate[1], 0, count, 0, buffer[4]);
-
-			for(i = 0; i < count; ++i)
-			{
-				float a[4];
-				float b[4];
-				float error = 0.03125;
-				input_format_desc->fetch_rgba_float(a, buffer[2] + i * input_format_size, 0, 0);
-				input_format_desc->fetch_rgba_float(b, buffer[4] + i * input_format_size, 0, 0);
-
-				for(j = 0; j < count; ++j)
-				{
-					float d = a[j] - b[j];
-					if(d > error || d < -error)
-					{
-						fail = 1;
-						break;
-					}
-				}
-			}
-
-			if(fail)
-			{
-				printf("FAIL: %s -> %s -> %s -> %s -> %s\n", input_format_desc->name, output_format_desc->name, input_format_desc->name, output_format_desc->name, input_format_desc->name);
-				for(i = 0; i < Elements(buffer); ++i)
-				{
-					unsigned format_size = (i & 1) ? output_format_size : input_format_size;
-					printf("%c ",  (i == 2 || i == 4) ? '*' : ' ');
-					for(j = 0; j < count; ++j)
-					{
-						for(k = 0; k < format_size; ++k)
-						{
-							printf("%02x", buffer[i][j * format_size + k]);
-						}
-						printf(" ");
-					}
-					printf("\n");
-				}
-			}
-			else
-				++passed;
-			++total;
-
-			translate[1]->release(translate[1]);
-free_translate0:
-			translate[0]->release(translate[0]);
-		}
-	}
-
-	printf("%u/%u tests passed for translate_%s\n", passed, total, argv[1]);
-	return 0;
+   struct translate *(*create_fn)(const struct translate_key *key) = 0;
+
+   struct translate_key key;
+   unsigned output_format;
+   unsigned input_format;
+   unsigned char* buffer[5];
+   unsigned count = 4;
+   unsigned i, j, k;
+   unsigned passed = 0;
+   unsigned total = 0;
+   const float error = 0.03125;
+
+   create_fn = 0;
+
+   util_cpu_detect();
+
+   if(argc <= 1)
+   {}
+   else if (!strcmp(argv[1], "generic"))
+      create_fn = translate_generic_create;
+   else if (!strcmp(argv[1], "x86"))
+      create_fn = translate_sse2_create;
+   else if (!strcmp(argv[1], "nosse"))
+   {
+      util_cpu_caps.has_sse = 0;
+      util_cpu_caps.has_sse2 = 0;
+      util_cpu_caps.has_sse3 = 0;
+      util_cpu_caps.has_sse4_1 = 0;
+      create_fn = translate_sse2_create;
+   }
+   else if (!strcmp(argv[1], "sse"))
+   {
+      if(!util_cpu_caps.has_sse || !rtasm_cpu_has_sse())
+      {
+         printf("Error: CPU doesn't support SSE (test with qemu)\n");
+         return 2;
+      }
+      util_cpu_caps.has_sse2 = 0;
+      util_cpu_caps.has_sse3 = 0;
+      util_cpu_caps.has_sse4_1 = 0;
+      create_fn = translate_sse2_create;
+   }
+   else if (!strcmp(argv[1], "sse2"))
+   {
+      if(!util_cpu_caps.has_sse2 || !rtasm_cpu_has_sse())
+      {
+         printf("Error: CPU doesn't support SSE2 (test with qemu)\n");
+         return 2;
+      }
+      util_cpu_caps.has_sse3 = 0;
+      util_cpu_caps.has_sse4_1 = 0;
+      create_fn = translate_sse2_create;
+   }
+   else if (!strcmp(argv[1], "sse3"))
+   {
+      if(!util_cpu_caps.has_sse3 || !rtasm_cpu_has_sse())
+      {
+         printf("Error: CPU doesn't support SSE3 (test with qemu)\n");
+         return 2;
+      }
+      util_cpu_caps.has_sse4_1 = 0;
+      create_fn = translate_sse2_create;
+   }
+   else if (!strcmp(argv[1], "sse4.1"))
+   {
+      if(!util_cpu_caps.has_sse4_1 || !rtasm_cpu_has_sse())
+      {
+         printf("Error: CPU doesn't support SSE4.1 (test with qemu)\n");
+         return 2;
+      }
+      create_fn = translate_sse2_create;
+   }
+
+   if (!create_fn)
+   {
+      printf("Usage: ./translate_test [generic|x86|nosse|sse|sse2|sse3|sse4.1]\n");
+      return 2;
+   }
+
+   for (i = 0; i < Elements(buffer); ++i)
+      buffer[i] = align_malloc(4096, 4096);
+
+   key.nr_elements = 1;
+   key.element[0].input_buffer = 0;
+   key.element[0].input_offset = 0;
+   key.element[0].output_offset = 0;
+   key.element[0].type = TRANSLATE_ELEMENT_NORMAL;
+   key.element[0].instance_divisor = 0;
+
+   srand(4359025);
+   for (i = 0; i < 4096; ++i)
+      buffer[0][i] = rand() & 0x7f; /* avoid negative values that work badly when converted to unsigned format*/
+
+   for (output_format = 1; output_format < PIPE_FORMAT_COUNT; ++output_format)
+   {
+      const struct util_format_description* output_format_desc = util_format_description(output_format);
+      unsigned output_format_size = util_format_get_stride(output_format, 1);
+      if (!output_format_desc
+            || !output_format_desc->fetch_rgba_float
+            || !output_format_desc->pack_rgba_float
+            || output_format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB
+            || output_format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN
+            || !translate_is_output_format_supported(output_format))
+         continue;
+
+      for (input_format = 1; input_format < PIPE_FORMAT_COUNT; ++input_format)
+      {
+         const struct util_format_description* input_format_desc = util_format_description(input_format);
+         unsigned input_format_size = util_format_get_stride(input_format, 1);
+         struct translate* translate[2];
+         unsigned fail = 0;
+         unsigned used_generic = 0;
+
+         if (!input_format_desc
+               || !input_format_desc->fetch_rgba_float
+               || !input_format_desc->pack_rgba_float
+               || input_format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB
+               || input_format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN
+               || !translate_is_output_format_supported(input_format))
+            continue;
+
+         key.element[0].input_format = input_format;
+         key.element[0].output_format = output_format;
+         key.output_stride = output_format_size;
+         translate[0] = create_fn(&key);
+         if (!translate[0])
+            continue;
+
+         key.element[0].input_format = output_format;
+         key.element[0].output_format = input_format;
+         key.output_stride = input_format_size;
+         translate[1] = create_fn(&key);
+         if(!translate[1])
+         {
+            used_generic = 1;
+            translate[1] = translate_generic_create(&key);
+            if(!translate[1])
+               continue;
+         }
+
+         translate[0]->set_buffer(translate[0], 0, buffer[0], input_format_size, ~0);
+         translate[0]->run(translate[0], 0, count, 0, buffer[1]);
+         translate[1]->set_buffer(translate[1], 0, buffer[1], output_format_size, ~0);
+         translate[1]->run(translate[1], 0, count, 0, buffer[2]);
+         translate[0]->set_buffer(translate[0], 0, buffer[2], input_format_size, ~0);
+         translate[0]->run(translate[0], 0, count, 0, buffer[3]);
+         translate[1]->set_buffer(translate[1], 0, buffer[3], output_format_size, ~0);
+         translate[1]->run(translate[1], 0, count, 0, buffer[4]);
+
+         for (i = 0; i < count; ++i)
+         {
+            float a[4];
+            float b[4];
+            input_format_desc->fetch_rgba_float(a, buffer[2] + i * input_format_size, 0, 0);
+            input_format_desc->fetch_rgba_float(b, buffer[4] + i * input_format_size, 0, 0);
+
+            for (j = 0; j < count; ++j)
+            {
+               float d = a[j] - b[j];
+               if (d > error || d < -error)
+               {
+                  fail = 1;
+                  break;
+               }
+            }
+         }
+
+         printf("%s%s: %s -> %s -> %s -> %s -> %s\n",
+               fail ? "FAIL" : "PASS",
+               used_generic ? "[GENERIC]" : "",
+               input_format_desc->name, output_format_desc->name, input_format_desc->name, output_format_desc->name, input_format_desc->name);
+
+         if (fail)
+         {
+            for (i = 0; i < Elements(buffer); ++i)
+            {
+               unsigned format_size = (i & 1) ? output_format_size : input_format_size;
+               printf("%c ", (i == 2 || i == 4) ? '*' : ' ');
+               for (j = 0; j < count; ++j)
+               {
+                  for (k = 0; k < format_size; ++k)
+                  {
+                     printf("%02x", buffer[i][j * format_size + k]);
+                  }
+                  printf(" ");
+               }
+               printf("\n");
+            }
+         }
+
+         if (!fail)
+            ++passed;
+         ++total;
+
+         if(translate[1])
+            translate[1]->release(translate[1]);
+         translate[0]->release(translate[0]);
+      }
+   }
+
+   printf("%u/%u tests passed for translate_%s\n", passed, total, argv[1]);
+   return passed != total;
 }
-- 
cgit v1.2.3


From 39cd4f7ceb09dc3050f93d1fb326faf24c11150e Mon Sep 17 00:00:00 2001
From: Luca Barbieri <luca@luca-barbieri.com>
Date: Wed, 11 Aug 2010 22:26:57 +0200
Subject: translate_test: fix segfault on x86-64

---
 src/gallium/tests/unit/translate_test.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/unit/translate_test.c b/src/gallium/tests/unit/translate_test.c
index a934a6abf4..097a5fd937 100644
--- a/src/gallium/tests/unit/translate_test.c
+++ b/src/gallium/tests/unit/translate_test.c
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
    for (output_format = 1; output_format < PIPE_FORMAT_COUNT; ++output_format)
    {
       const struct util_format_description* output_format_desc = util_format_description(output_format);
-      unsigned output_format_size = util_format_get_stride(output_format, 1);
+      unsigned output_format_size;
       if (!output_format_desc
             || !output_format_desc->fetch_rgba_float
             || !output_format_desc->pack_rgba_float
@@ -137,10 +137,12 @@ int main(int argc, char** argv)
             || !translate_is_output_format_supported(output_format))
          continue;
 
+      output_format_size = util_format_get_stride(output_format, 1);
+
       for (input_format = 1; input_format < PIPE_FORMAT_COUNT; ++input_format)
       {
          const struct util_format_description* input_format_desc = util_format_description(input_format);
-         unsigned input_format_size = util_format_get_stride(input_format, 1);
+         unsigned input_format_size;
          struct translate* translate[2];
          unsigned fail = 0;
          unsigned used_generic = 0;
@@ -153,6 +155,8 @@ int main(int argc, char** argv)
                || !translate_is_output_format_supported(input_format))
             continue;
 
+         input_format_size = util_format_get_stride(input_format, 1);
+
          key.element[0].input_format = input_format;
          key.element[0].output_format = output_format;
          key.output_stride = output_format_size;
-- 
cgit v1.2.3


From e1bb9ee7a6b7dea0e0388ffb375447ad40f38499 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Wed, 11 Aug 2010 18:57:27 -0700
Subject: scons: Fix freebsd8 build.

---
 src/gallium/tests/graw/SConscript | 5 ++++-
 src/gallium/tests/unit/SConscript | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/graw/SConscript b/src/gallium/tests/graw/SConscript
index 7e39ec21a4..860a17e13e 100644
--- a/src/gallium/tests/graw/SConscript
+++ b/src/gallium/tests/graw/SConscript
@@ -11,9 +11,12 @@ env = env.Clone()
 env.Prepend(LIBPATH = [graw.dir])
 env.Prepend(LIBS = ['graw'] + gallium)
 
-if platform == 'sunos5':
+if platform in ('freebsd8', 'sunos5'):
     env.Append(LIBS = ['m'])
 
+if platform == 'freebsd8':
+    env.Append(LIBS = ['pthread'])
+
 progs = [
     'clear',
     'tri',
diff --git a/src/gallium/tests/unit/SConscript b/src/gallium/tests/unit/SConscript
index a0ad58ffa2..edc68e34d9 100644
--- a/src/gallium/tests/unit/SConscript
+++ b/src/gallium/tests/unit/SConscript
@@ -4,9 +4,12 @@ env = env.Clone()
 
 env.Prepend(LIBS = [gallium])
 
-if platform == 'sunos5':
+if platform in ('freebsd8', 'sunos5'):
     env.Append(LIBS = ['m'])
 
+if platform == 'freebsd8':
+    env.Append(LIBS = ['pthread'])
+
 progs = [
     'pipe_barrier_test',
     'u_cache_test',
-- 
cgit v1.2.3


From 4d946c4e8adf3f0ac447b6a9a6caf17392b816cd Mon Sep 17 00:00:00 2001
From: Luca Barbieri <luca@luca-barbieri.com>
Date: Thu, 12 Aug 2010 18:18:41 +0200
Subject: translate_test: improve

1. Generate random data specifically for float and doubles, so that
   they end up in [0, 1] range
2. Don't test useless conversions like SCALED <-> NORM
3. Poison the buffers before testing
---
 src/gallium/tests/unit/translate_test.c | 66 ++++++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 6 deletions(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/unit/translate_test.c b/src/gallium/tests/unit/translate_test.c
index 097a5fd937..a6f0f54897 100644
--- a/src/gallium/tests/unit/translate_test.c
+++ b/src/gallium/tests/unit/translate_test.c
@@ -37,7 +37,11 @@ int main(int argc, char** argv)
    struct translate_key key;
    unsigned output_format;
    unsigned input_format;
+   unsigned buffer_size = 4096;
    unsigned char* buffer[5];
+   unsigned char* byte_buffer;
+   float* float_buffer;
+   double* double_buffer;
    unsigned count = 4;
    unsigned i, j, k;
    unsigned passed = 0;
@@ -111,8 +115,12 @@ int main(int argc, char** argv)
       return 2;
    }
 
-   for (i = 0; i < Elements(buffer); ++i)
-      buffer[i] = align_malloc(4096, 4096);
+   for (i = 1; i < Elements(buffer); ++i)
+      buffer[i] = align_malloc(buffer_size, 4096);
+
+   byte_buffer = align_malloc(buffer_size, 4096);
+   float_buffer = align_malloc(buffer_size, 4096);
+   double_buffer = align_malloc(buffer_size, 4096);
 
    key.nr_elements = 1;
    key.element[0].input_buffer = 0;
@@ -121,14 +129,24 @@ int main(int argc, char** argv)
    key.element[0].type = TRANSLATE_ELEMENT_NORMAL;
    key.element[0].instance_divisor = 0;
 
-   srand(4359025);
-   for (i = 0; i < 4096; ++i)
-      buffer[0][i] = rand() & 0x7f; /* avoid negative values that work badly when converted to unsigned format*/
+   srand48(4359025);
+
+   /* avoid negative values that work badly when converted to unsigned format*/
+   for (i = 0; i < buffer_size / sizeof(unsigned); ++i)
+      ((unsigned*)byte_buffer)[i] = mrand48() & 0x7f7f7f7f;
+
+   for (i = 0; i < buffer_size / sizeof(float); ++i)
+      float_buffer[i] = (float)drand48();
+
+   for (i = 0; i < buffer_size / sizeof(double); ++i)
+      double_buffer[i] = drand48();
 
    for (output_format = 1; output_format < PIPE_FORMAT_COUNT; ++output_format)
    {
       const struct util_format_description* output_format_desc = util_format_description(output_format);
       unsigned output_format_size;
+      unsigned output_normalized = 0;
+
       if (!output_format_desc
             || !output_format_desc->fetch_rgba_float
             || !output_format_desc->pack_rgba_float
@@ -137,6 +155,12 @@ int main(int argc, char** argv)
             || !translate_is_output_format_supported(output_format))
          continue;
 
+      for(i = 0; i < output_format_desc->nr_channels; ++i)
+      {
+         if(output_format_desc->channel[i].type != UTIL_FORMAT_TYPE_FLOAT)
+            output_normalized |= (1 << output_format_desc->channel[i].normalized);
+      }
+
       output_format_size = util_format_get_stride(output_format, 1);
 
       for (input_format = 1; input_format < PIPE_FORMAT_COUNT; ++input_format)
@@ -146,6 +170,8 @@ int main(int argc, char** argv)
          struct translate* translate[2];
          unsigned fail = 0;
          unsigned used_generic = 0;
+         unsigned input_normalized = 0;
+         boolean input_is_float = FALSE;
 
          if (!input_format_desc
                || !input_format_desc->fetch_rgba_float
@@ -157,6 +183,22 @@ int main(int argc, char** argv)
 
          input_format_size = util_format_get_stride(input_format, 1);
 
+         for(i = 0; i < input_format_desc->nr_channels; ++i)
+         {
+            if(input_format_desc->channel[i].type == UTIL_FORMAT_TYPE_FLOAT)
+            {
+               input_is_float = 1;
+               input_normalized |= 1 << 1;
+            }
+            else
+               input_normalized |= (1 << input_format_desc->channel[i].normalized);
+         }
+
+         if(((input_normalized | output_normalized) == 3)
+               || ((input_normalized & 1) && (output_normalized & 1)
+                     && input_format_size * output_format_desc->nr_channels > output_format_size * input_format_desc->nr_channels))
+            continue;
+
          key.element[0].input_format = input_format;
          key.element[0].output_format = output_format;
          key.output_stride = output_format_size;
@@ -176,6 +218,18 @@ int main(int argc, char** argv)
                continue;
          }
 
+         for(i = 1; i < 5; ++i)
+            memset(buffer[i], 0xcd - (0x22 * i), 4096);
+
+         if(input_is_float && input_format_desc->channel[0].size == 32)
+            buffer[0] = (unsigned char*)float_buffer;
+         else if(input_is_float && input_format_desc->channel[0].size == 64)
+            buffer[0] = (unsigned char*)double_buffer;
+         else if(input_is_float)
+            abort();
+         else
+            buffer[0] = byte_buffer;
+
          translate[0]->set_buffer(translate[0], 0, buffer[0], input_format_size, ~0);
          translate[0]->run(translate[0], 0, count, 0, buffer[1]);
          translate[1]->set_buffer(translate[1], 0, buffer[1], output_format_size, ~0);
@@ -208,7 +262,7 @@ int main(int argc, char** argv)
                used_generic ? "[GENERIC]" : "",
                input_format_desc->name, output_format_desc->name, input_format_desc->name, output_format_desc->name, input_format_desc->name);
 
-         if (fail)
+         if (1)
          {
             for (i = 0; i < Elements(buffer); ++i)
             {
-- 
cgit v1.2.3


From b9abe7f62c09c0395214b9447032323b3846b2cf Mon Sep 17 00:00:00 2001
From: Luca Barbieri <luca@luca-barbieri.com>
Date: Thu, 12 Aug 2010 22:07:37 +0200
Subject: translate_test: fix compilation on non-POSIX platforms

Use a kludgy function based on rand() instead of drand48()
---
 src/gallium/tests/unit/translate_test.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/unit/translate_test.c b/src/gallium/tests/unit/translate_test.c
index a6f0f54897..960c70f2b5 100644
--- a/src/gallium/tests/unit/translate_test.c
+++ b/src/gallium/tests/unit/translate_test.c
@@ -30,6 +30,20 @@
 #include <util/u_cpu_detect.h>
 #include <rtasm/rtasm_cpu.h>
 
+/* don't use this for serious use */
+static double rand_double()
+{
+   const double rm = (double)RAND_MAX + 1;
+   double div = 1;
+   double v = 0;
+   for(unsigned i = 0; i < 4; ++i)
+   {
+      div *= rm;
+      v += (double)rand() / div;
+   }
+   return v;
+}
+
 int main(int argc, char** argv)
 {
    struct translate *(*create_fn)(const struct translate_key *key) = 0;
@@ -129,17 +143,17 @@ int main(int argc, char** argv)
    key.element[0].type = TRANSLATE_ELEMENT_NORMAL;
    key.element[0].instance_divisor = 0;
 
-   srand48(4359025);
+   srand(4359025);
 
    /* avoid negative values that work badly when converted to unsigned format*/
-   for (i = 0; i < buffer_size / sizeof(unsigned); ++i)
-      ((unsigned*)byte_buffer)[i] = mrand48() & 0x7f7f7f7f;
+   for (i = 0; i < buffer_size; ++i)
+      byte_buffer[i] = rand() & 0x7f7f7f7f;
 
    for (i = 0; i < buffer_size / sizeof(float); ++i)
-      float_buffer[i] = (float)drand48();
+      float_buffer[i] = (float)rand_double();
 
    for (i = 0; i < buffer_size / sizeof(double); ++i)
-      double_buffer[i] = drand48();
+      double_buffer[i] = rand_double();
 
    for (output_format = 1; output_format < PIPE_FORMAT_COUNT; ++output_format)
    {
-- 
cgit v1.2.3


From 26c042c30aa3a2ec7eaf1a2b766bc4fd2bfcdb84 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Thu, 12 Aug 2010 17:12:56 -0700
Subject: translate_test: Fix compilation with MSVC.

---
 src/gallium/tests/unit/translate_test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/unit/translate_test.c b/src/gallium/tests/unit/translate_test.c
index 960c70f2b5..d0946a91a2 100644
--- a/src/gallium/tests/unit/translate_test.c
+++ b/src/gallium/tests/unit/translate_test.c
@@ -36,7 +36,8 @@ static double rand_double()
    const double rm = (double)RAND_MAX + 1;
    double div = 1;
    double v = 0;
-   for(unsigned i = 0; i < 4; ++i)
+   unsigned i;
+   for(i = 0; i < 4; ++i)
    {
       div *= rm;
       v += (double)rand() / div;
-- 
cgit v1.2.3