progs/gallium/python: Rename pipe formats.

10 files changed, 45 insertions, 45 deletions

diff --git a/progs/gallium/python/retrace/interpreter.py b/progs/gallium/python/retrace/interpreter.py
index d0ada7decdc..b30469dfaee 100755
--- a/progs/gallium/python/retrace/interpreter.py
+++ b/progs/gallium/python/retrace/interpreter.py
@@ -543,7 +543,7 @@ class Context(Object):
                     gallium.PIPE_FORMAT_R32G32_FLOAT: '2f',
                     gallium.PIPE_FORMAT_R32G32B32_FLOAT: '3f',
                     gallium.PIPE_FORMAT_R32G32B32A32_FLOAT: '4f',
-                    gallium.PIPE_FORMAT_B8G8R8A8_UNORM: '4B',
+                    gallium.PIPE_FORMAT_A8R8G8B8_UNORM: '4B',
                     gallium.PIPE_FORMAT_R8G8B8A8_UNORM: '4B',
                     gallium.PIPE_FORMAT_R16G16B16_SNORM: '3h',
                 }[velem.src_format]
diff --git a/progs/gallium/python/samples/gs.py b/progs/gallium/python/samples/gs.py
index cd68abac9a1..5c22269b183 100644
--- a/progs/gallium/python/samples/gs.py
+++ b/progs/gallium/python/samples/gs.py
@@ -134,7 +134,7 @@ def test(dev):
 
     # framebuffer
     cbuf = dev.texture_create(
-        PIPE_FORMAT_X8R8G8B8_UNORM,
+        PIPE_FORMAT_B8G8R8X8_UNORM,
         width, height,
         tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
     ).get_surface()
diff --git a/progs/gallium/python/samples/tri.py b/progs/gallium/python/samples/tri.py
index f0b5e3dc984..d7fbdb10ac3 100644
--- a/progs/gallium/python/samples/tri.py
+++ b/progs/gallium/python/samples/tri.py
@@ -134,7 +134,7 @@ def test(dev):
 
     # framebuffer
     cbuf = dev.texture_create(
-        PIPE_FORMAT_X8R8G8B8_UNORM, 
+        PIPE_FORMAT_B8G8R8X8_UNORM, 
         width, height,
         tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
     ).get_surface()
diff --git a/progs/gallium/python/tests/base.py b/progs/gallium/python/tests/base.py
index b022d073fda..bd82f50811f 100755
--- a/progs/gallium/python/tests/base.py
+++ b/progs/gallium/python/tests/base.py
@@ -50,8 +50,8 @@ def is_depth_stencil_format(format):
     # FIXME: make and use binding to util_format_is_depth_or_stencil
     return format in (
         PIPE_FORMAT_Z32_UNORM,
-        PIPE_FORMAT_Z24S8_UNORM,
-        PIPE_FORMAT_Z24X8_UNORM,
+        PIPE_FORMAT_S8Z24_UNORM,
+        PIPE_FORMAT_X8Z24_UNORM,
         PIPE_FORMAT_Z16_UNORM,
     )
 
diff --git a/progs/gallium/python/tests/regress/fragment-shader/fragment-shader.py b/progs/gallium/python/tests/regress/fragment-shader/fragment-shader.py
index 41dd69d2542..b758b4c6221 100644
--- a/progs/gallium/python/tests/regress/fragment-shader/fragment-shader.py
+++ b/progs/gallium/python/tests/regress/fragment-shader/fragment-shader.py
@@ -113,7 +113,7 @@ def test(dev, name):
 
     # framebuffer
     cbuf = dev.texture_create(
-        PIPE_FORMAT_X8R8G8B8_UNORM,
+        PIPE_FORMAT_B8G8R8X8_UNORM,
         width, height,
         tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
     ).get_surface()
diff --git a/progs/gallium/python/tests/regress/vertex-shader/vertex-shader.py b/progs/gallium/python/tests/regress/vertex-shader/vertex-shader.py
index 2c44f872e1d..bd838cc282b 100644
--- a/progs/gallium/python/tests/regress/vertex-shader/vertex-shader.py
+++ b/progs/gallium/python/tests/regress/vertex-shader/vertex-shader.py
@@ -114,7 +114,7 @@ def test(dev, name):
 
     # framebuffer
     cbuf = dev.texture_create(
-        PIPE_FORMAT_X8R8G8B8_UNORM,
+        PIPE_FORMAT_B8G8R8X8_UNORM,
         width, height,
         tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
     ).get_surface()
diff --git a/progs/gallium/python/tests/surface_copy.py b/progs/gallium/python/tests/surface_copy.py
index df5babb78af..a3f1b3e130c 100755
--- a/progs/gallium/python/tests/surface_copy.py
+++ b/progs/gallium/python/tests/surface_copy.py
@@ -131,15 +131,15 @@ def main():
     ]
     
     formats = [
-        PIPE_FORMAT_A8R8G8B8_UNORM,
-        PIPE_FORMAT_X8R8G8B8_UNORM,
-        PIPE_FORMAT_A8R8G8B8_SRGB,
-        PIPE_FORMAT_R5G6B5_UNORM,
-        PIPE_FORMAT_A1R5G5B5_UNORM,
-        PIPE_FORMAT_A4R4G4B4_UNORM,
+        PIPE_FORMAT_B8G8R8A8_UNORM,
+        PIPE_FORMAT_B8G8R8X8_UNORM,
+        PIPE_FORMAT_B8G8R8A8_SRGB,
+        PIPE_FORMAT_B5G6R5_UNORM,
+        PIPE_FORMAT_B5G5R5A1_UNORM,
+        PIPE_FORMAT_B4G4R4A4_UNORM,
         PIPE_FORMAT_Z32_UNORM,
-        PIPE_FORMAT_Z24S8_UNORM,
-        PIPE_FORMAT_Z24X8_UNORM,
+        PIPE_FORMAT_S8Z24_UNORM,
+        PIPE_FORMAT_X8Z24_UNORM,
         PIPE_FORMAT_Z16_UNORM,
         PIPE_FORMAT_S8_UNORM,
         PIPE_FORMAT_A8_UNORM,
diff --git a/progs/gallium/python/tests/texture_render.py b/progs/gallium/python/tests/texture_render.py
index 0fac1ea5ef3..1e26639db68 100755
--- a/progs/gallium/python/tests/texture_render.py
+++ b/progs/gallium/python/tests/texture_render.py
@@ -96,7 +96,7 @@ class TextureTest(TestCase):
         
         src_texture = dev.texture_create(
             target = target,
-            format = PIPE_FORMAT_A8R8G8B8_UNORM, 
+            format = PIPE_FORMAT_B8G8R8A8_UNORM, 
             width = dst_surface.width, 
             height = dst_surface.height,
             depth = 1, 
@@ -149,7 +149,7 @@ class TextureTest(TestCase):
 
         #  framebuffer 
         cbuf_tex = dev.texture_create(
-            PIPE_FORMAT_A8R8G8B8_UNORM, 
+            PIPE_FORMAT_B8G8R8A8_UNORM, 
             width, 
             height,
             tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
@@ -251,15 +251,15 @@ def main():
     ]
     
     formats = [
-        PIPE_FORMAT_A8R8G8B8_UNORM,
-        PIPE_FORMAT_X8R8G8B8_UNORM,
-        #PIPE_FORMAT_A8R8G8B8_SRGB,
-        PIPE_FORMAT_R5G6B5_UNORM,
-        PIPE_FORMAT_A1R5G5B5_UNORM,
-        PIPE_FORMAT_A4R4G4B4_UNORM,
+        PIPE_FORMAT_B8G8R8A8_UNORM,
+        PIPE_FORMAT_B8G8R8X8_UNORM,
+        #PIPE_FORMAT_B8G8R8A8_SRGB,
+        PIPE_FORMAT_B5G6R5_UNORM,
+        PIPE_FORMAT_B5G5R5A1_UNORM,
+        PIPE_FORMAT_B4G4R4A4_UNORM,
         #PIPE_FORMAT_Z32_UNORM,
-        #PIPE_FORMAT_Z24S8_UNORM,
-        #PIPE_FORMAT_Z24X8_UNORM,
+        #PIPE_FORMAT_S8Z24_UNORM,
+        #PIPE_FORMAT_X8Z24_UNORM,
         #PIPE_FORMAT_Z16_UNORM,
         #PIPE_FORMAT_S8_UNORM,
         PIPE_FORMAT_A8_UNORM,
diff --git a/progs/gallium/python/tests/texture_sample.py b/progs/gallium/python/tests/texture_sample.py
index db32b537a17..49545c2e07a 100755
--- a/progs/gallium/python/tests/texture_sample.py
+++ b/progs/gallium/python/tests/texture_sample.py
@@ -193,7 +193,7 @@ class TextureColorSampleTest(TestCase):
 
         #  framebuffer 
         cbuf_tex = dev.texture_create(
-            PIPE_FORMAT_A8R8G8B8_UNORM, 
+            PIPE_FORMAT_B8G8R8A8_UNORM, 
             width, 
             height,
             tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
@@ -383,14 +383,14 @@ class TextureDepthSampleTest(TestCase):
 
         #  framebuffer 
         cbuf_tex = dev.texture_create(
-            PIPE_FORMAT_A8R8G8B8_UNORM, 
+            PIPE_FORMAT_B8G8R8A8_UNORM, 
             width, 
             height,
             tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
         )
 
         zsbuf_tex = dev.texture_create(
-            PIPE_FORMAT_Z24X8_UNORM, 
+            PIPE_FORMAT_X8Z24_UNORM, 
             width, 
             height,
             tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
@@ -498,15 +498,15 @@ def main():
     ]
     
     color_formats = [
-        PIPE_FORMAT_A8R8G8B8_UNORM,
-        PIPE_FORMAT_X8R8G8B8_UNORM,
-        #PIPE_FORMAT_A8R8G8B8_SRGB,
-        PIPE_FORMAT_R5G6B5_UNORM,
-        PIPE_FORMAT_A1R5G5B5_UNORM,
-        PIPE_FORMAT_A4R4G4B4_UNORM,
+        PIPE_FORMAT_B8G8R8A8_UNORM,
+        PIPE_FORMAT_B8G8R8X8_UNORM,
+        #PIPE_FORMAT_B8G8R8A8_SRGB,
+        PIPE_FORMAT_B5G6R5_UNORM,
+        PIPE_FORMAT_B5G5R5A1_UNORM,
+        PIPE_FORMAT_B4G4R4A4_UNORM,
         PIPE_FORMAT_A8_UNORM,
         PIPE_FORMAT_L8_UNORM,
-        PIPE_FORMAT_YCBCR,
+        PIPE_FORMAT_UYVY,
         PIPE_FORMAT_DXT1_RGB,
         #PIPE_FORMAT_DXT1_RGBA,
         #PIPE_FORMAT_DXT3_RGBA,
@@ -515,8 +515,8 @@ def main():
     
     depth_formats = [
         PIPE_FORMAT_Z32_UNORM,
-        PIPE_FORMAT_Z24S8_UNORM,
-        PIPE_FORMAT_Z24X8_UNORM,
+        PIPE_FORMAT_S8Z24_UNORM,
+        PIPE_FORMAT_X8Z24_UNORM,
         PIPE_FORMAT_Z16_UNORM,
     ]
     
diff --git a/progs/gallium/python/tests/texture_transfer.py b/progs/gallium/python/tests/texture_transfer.py
index 35daca9e498..7da00e42550 100755
--- a/progs/gallium/python/tests/texture_transfer.py
+++ b/progs/gallium/python/tests/texture_transfer.py
@@ -111,15 +111,15 @@ def main():
     ]
     
     formats = [
-        PIPE_FORMAT_A8R8G8B8_UNORM,
-        PIPE_FORMAT_X8R8G8B8_UNORM,
-        PIPE_FORMAT_A8R8G8B8_SRGB,
-        PIPE_FORMAT_R5G6B5_UNORM,
-        PIPE_FORMAT_A1R5G5B5_UNORM,
-        PIPE_FORMAT_A4R4G4B4_UNORM,
+        PIPE_FORMAT_B8G8R8A8_UNORM,
+        PIPE_FORMAT_B8G8R8X8_UNORM,
+        PIPE_FORMAT_B8G8R8A8_SRGB,
+        PIPE_FORMAT_B5G6R5_UNORM,
+        PIPE_FORMAT_B5G5R5A1_UNORM,
+        PIPE_FORMAT_B4G4R4A4_UNORM,
         PIPE_FORMAT_Z32_UNORM,
-        PIPE_FORMAT_Z24S8_UNORM,
-        PIPE_FORMAT_Z24X8_UNORM,
+        PIPE_FORMAT_S8Z24_UNORM,
+        PIPE_FORMAT_X8Z24_UNORM,
         PIPE_FORMAT_Z16_UNORM,
         PIPE_FORMAT_S8_UNORM,
         PIPE_FORMAT_A8_UNORM,