From: Richard Sandiford <r.sandif...@uk.ibm.com>
Reviewed-by: Adam Jackson <a...@redhat.com>
---
src/gallium/tests/graw/clear.c | 4 ++--
src/gallium/tests/graw/fs-test.c | 4 ++--
src/gallium/tests/graw/graw_util.h | 6 +++---
src/gallium/tests/graw/quad-sample.c | 4 ++--
src/gallium/tests/graw/shader-leak.c | 4 ++--
src/gallium/tests/graw/tri-gs.c | 4 ++--
src/gallium/tests/graw/tri-instanced.c | 4 ++--
src/gallium/tests/graw/vs-test.c | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/gallium/tests/graw/clear.c b/src/gallium/tests/graw/clear.c
index 6afdf40..e591d90 100644
--- a/src/gallium/tests/graw/clear.c
+++ b/src/gallium/tests/graw/clear.c
@@ -10,8 +10,8 @@
#include "pipe/p_defines.h"
enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_ABGR8888_UNORM,
+ PIPE_FORMAT_ARGB8888_UNORM,
PIPE_FORMAT_NONE
};
diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c
index e59377f..0269ae0 100644
--- a/src/gallium/tests/graw/fs-test.c
+++ b/src/gallium/tests/graw/fs-test.c
@@ -31,8 +31,8 @@ static void usage(char *name)
enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_ABGR8888_UNORM,
+ PIPE_FORMAT_ARGB8888_UNORM,
PIPE_FORMAT_NONE
};
diff --git a/src/gallium/tests/graw/graw_util.h
b/src/gallium/tests/graw/graw_util.h
index febdf44..08f18f7 100644
--- a/src/gallium/tests/graw/graw_util.h
+++ b/src/gallium/tests/graw/graw_util.h
@@ -32,8 +32,8 @@ graw_util_create_window(struct graw_info *info,
int num_cbufs, bool zstencil_buf)
{
static const enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_ABGR8888_UNORM,
+ PIPE_FORMAT_ARGB8888_UNORM,
PIPE_FORMAT_NONE
};
enum pipe_format format;
@@ -226,7 +226,7 @@ graw_util_create_tex2d(const struct graw_info *info,
struct pipe_box box;
temp.target = PIPE_TEXTURE_2D;
- temp.format = PIPE_FORMAT_B8G8R8A8_UNORM;
+ temp.format = format;
temp.width0 = width;
temp.height0 = height;
temp.depth0 = 1;
diff --git a/src/gallium/tests/graw/quad-sample.c
b/src/gallium/tests/graw/quad-sample.c
index dd2865d..cfc4129 100644
--- a/src/gallium/tests/graw/quad-sample.c
+++ b/src/gallium/tests/graw/quad-sample.c
@@ -18,8 +18,8 @@
#include <stdio.h>
enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_ABGR8888_UNORM,
+ PIPE_FORMAT_ARGB8888_UNORM,
PIPE_FORMAT_NONE
};
diff --git a/src/gallium/tests/graw/shader-leak.c
b/src/gallium/tests/graw/shader-leak.c
index 9c6e0eb..1fdfb95 100644
--- a/src/gallium/tests/graw/shader-leak.c
+++ b/src/gallium/tests/graw/shader-leak.c
@@ -18,8 +18,8 @@ static int num_iters = 100;
enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_ABGR8888_UNORM,
+ PIPE_FORMAT_ARGB8888_UNORM,
PIPE_FORMAT_NONE
};
diff --git a/src/gallium/tests/graw/tri-gs.c b/src/gallium/tests/graw/tri-gs.c
index 03b5234..0bb45fb 100644
--- a/src/gallium/tests/graw/tri-gs.c
+++ b/src/gallium/tests/graw/tri-gs.c
@@ -14,8 +14,8 @@
#include "util/u_inlines.h"
enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_ABGR8888_UNORM,
+ PIPE_FORMAT_ARGB8888_UNORM,
PIPE_FORMAT_NONE
};
diff --git a/src/gallium/tests/graw/tri-instanced.c
b/src/gallium/tests/graw/tri-instanced.c
index 901ac86..41caae9 100644
--- a/src/gallium/tests/graw/tri-instanced.c
+++ b/src/gallium/tests/graw/tri-instanced.c
@@ -17,8 +17,8 @@
enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_ABGR8888_UNORM,
+ PIPE_FORMAT_ARGB8888_UNORM,
PIPE_FORMAT_NONE
};
diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c
index 1ab6732..d63372d 100644
--- a/src/gallium/tests/graw/vs-test.c
+++ b/src/gallium/tests/graw/vs-test.c
@@ -32,8 +32,8 @@ static void usage(char *name)
enum pipe_format formats[] = {
- PIPE_FORMAT_R8G8B8A8_UNORM,
- PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_ABGR8888_UNORM,
+ PIPE_FORMAT_ARGB8888_UNORM,
PIPE_FORMAT_NONE
};
--
1.8.2.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
