progs/gallium/python: Rename pipe formats.
This commit is contained in:
parent
3b67f87970
commit
4e1aa4a812
|
@ -543,7 +543,7 @@ class Context(Object):
|
||||||
gallium.PIPE_FORMAT_R32G32_FLOAT: '2f',
|
gallium.PIPE_FORMAT_R32G32_FLOAT: '2f',
|
||||||
gallium.PIPE_FORMAT_R32G32B32_FLOAT: '3f',
|
gallium.PIPE_FORMAT_R32G32B32_FLOAT: '3f',
|
||||||
gallium.PIPE_FORMAT_R32G32B32A32_FLOAT: '4f',
|
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_R8G8B8A8_UNORM: '4B',
|
||||||
gallium.PIPE_FORMAT_R16G16B16_SNORM: '3h',
|
gallium.PIPE_FORMAT_R16G16B16_SNORM: '3h',
|
||||||
}[velem.src_format]
|
}[velem.src_format]
|
||||||
|
|
|
@ -134,7 +134,7 @@ def test(dev):
|
||||||
|
|
||||||
# framebuffer
|
# framebuffer
|
||||||
cbuf = dev.texture_create(
|
cbuf = dev.texture_create(
|
||||||
PIPE_FORMAT_X8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8X8_UNORM,
|
||||||
width, height,
|
width, height,
|
||||||
tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
||||||
).get_surface()
|
).get_surface()
|
||||||
|
|
|
@ -134,7 +134,7 @@ def test(dev):
|
||||||
|
|
||||||
# framebuffer
|
# framebuffer
|
||||||
cbuf = dev.texture_create(
|
cbuf = dev.texture_create(
|
||||||
PIPE_FORMAT_X8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8X8_UNORM,
|
||||||
width, height,
|
width, height,
|
||||||
tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
||||||
).get_surface()
|
).get_surface()
|
||||||
|
|
|
@ -50,8 +50,8 @@ def is_depth_stencil_format(format):
|
||||||
# FIXME: make and use binding to util_format_is_depth_or_stencil
|
# FIXME: make and use binding to util_format_is_depth_or_stencil
|
||||||
return format in (
|
return format in (
|
||||||
PIPE_FORMAT_Z32_UNORM,
|
PIPE_FORMAT_Z32_UNORM,
|
||||||
PIPE_FORMAT_Z24S8_UNORM,
|
PIPE_FORMAT_S8Z24_UNORM,
|
||||||
PIPE_FORMAT_Z24X8_UNORM,
|
PIPE_FORMAT_X8Z24_UNORM,
|
||||||
PIPE_FORMAT_Z16_UNORM,
|
PIPE_FORMAT_Z16_UNORM,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@ def test(dev, name):
|
||||||
|
|
||||||
# framebuffer
|
# framebuffer
|
||||||
cbuf = dev.texture_create(
|
cbuf = dev.texture_create(
|
||||||
PIPE_FORMAT_X8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8X8_UNORM,
|
||||||
width, height,
|
width, height,
|
||||||
tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
||||||
).get_surface()
|
).get_surface()
|
||||||
|
|
|
@ -114,7 +114,7 @@ def test(dev, name):
|
||||||
|
|
||||||
# framebuffer
|
# framebuffer
|
||||||
cbuf = dev.texture_create(
|
cbuf = dev.texture_create(
|
||||||
PIPE_FORMAT_X8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8X8_UNORM,
|
||||||
width, height,
|
width, height,
|
||||||
tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
tex_usage=PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
||||||
).get_surface()
|
).get_surface()
|
||||||
|
|
|
@ -131,15 +131,15 @@ def main():
|
||||||
]
|
]
|
||||||
|
|
||||||
formats = [
|
formats = [
|
||||||
PIPE_FORMAT_A8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8A8_UNORM,
|
||||||
PIPE_FORMAT_X8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8X8_UNORM,
|
||||||
PIPE_FORMAT_A8R8G8B8_SRGB,
|
PIPE_FORMAT_B8G8R8A8_SRGB,
|
||||||
PIPE_FORMAT_R5G6B5_UNORM,
|
PIPE_FORMAT_B5G6R5_UNORM,
|
||||||
PIPE_FORMAT_A1R5G5B5_UNORM,
|
PIPE_FORMAT_B5G5R5A1_UNORM,
|
||||||
PIPE_FORMAT_A4R4G4B4_UNORM,
|
PIPE_FORMAT_B4G4R4A4_UNORM,
|
||||||
PIPE_FORMAT_Z32_UNORM,
|
PIPE_FORMAT_Z32_UNORM,
|
||||||
PIPE_FORMAT_Z24S8_UNORM,
|
PIPE_FORMAT_S8Z24_UNORM,
|
||||||
PIPE_FORMAT_Z24X8_UNORM,
|
PIPE_FORMAT_X8Z24_UNORM,
|
||||||
PIPE_FORMAT_Z16_UNORM,
|
PIPE_FORMAT_Z16_UNORM,
|
||||||
PIPE_FORMAT_S8_UNORM,
|
PIPE_FORMAT_S8_UNORM,
|
||||||
PIPE_FORMAT_A8_UNORM,
|
PIPE_FORMAT_A8_UNORM,
|
||||||
|
|
|
@ -96,7 +96,7 @@ class TextureTest(TestCase):
|
||||||
|
|
||||||
src_texture = dev.texture_create(
|
src_texture = dev.texture_create(
|
||||||
target = target,
|
target = target,
|
||||||
format = PIPE_FORMAT_A8R8G8B8_UNORM,
|
format = PIPE_FORMAT_B8G8R8A8_UNORM,
|
||||||
width = dst_surface.width,
|
width = dst_surface.width,
|
||||||
height = dst_surface.height,
|
height = dst_surface.height,
|
||||||
depth = 1,
|
depth = 1,
|
||||||
|
@ -149,7 +149,7 @@ class TextureTest(TestCase):
|
||||||
|
|
||||||
# framebuffer
|
# framebuffer
|
||||||
cbuf_tex = dev.texture_create(
|
cbuf_tex = dev.texture_create(
|
||||||
PIPE_FORMAT_A8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8A8_UNORM,
|
||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
||||||
|
@ -251,15 +251,15 @@ def main():
|
||||||
]
|
]
|
||||||
|
|
||||||
formats = [
|
formats = [
|
||||||
PIPE_FORMAT_A8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8A8_UNORM,
|
||||||
PIPE_FORMAT_X8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8X8_UNORM,
|
||||||
#PIPE_FORMAT_A8R8G8B8_SRGB,
|
#PIPE_FORMAT_B8G8R8A8_SRGB,
|
||||||
PIPE_FORMAT_R5G6B5_UNORM,
|
PIPE_FORMAT_B5G6R5_UNORM,
|
||||||
PIPE_FORMAT_A1R5G5B5_UNORM,
|
PIPE_FORMAT_B5G5R5A1_UNORM,
|
||||||
PIPE_FORMAT_A4R4G4B4_UNORM,
|
PIPE_FORMAT_B4G4R4A4_UNORM,
|
||||||
#PIPE_FORMAT_Z32_UNORM,
|
#PIPE_FORMAT_Z32_UNORM,
|
||||||
#PIPE_FORMAT_Z24S8_UNORM,
|
#PIPE_FORMAT_S8Z24_UNORM,
|
||||||
#PIPE_FORMAT_Z24X8_UNORM,
|
#PIPE_FORMAT_X8Z24_UNORM,
|
||||||
#PIPE_FORMAT_Z16_UNORM,
|
#PIPE_FORMAT_Z16_UNORM,
|
||||||
#PIPE_FORMAT_S8_UNORM,
|
#PIPE_FORMAT_S8_UNORM,
|
||||||
PIPE_FORMAT_A8_UNORM,
|
PIPE_FORMAT_A8_UNORM,
|
||||||
|
|
|
@ -193,7 +193,7 @@ class TextureColorSampleTest(TestCase):
|
||||||
|
|
||||||
# framebuffer
|
# framebuffer
|
||||||
cbuf_tex = dev.texture_create(
|
cbuf_tex = dev.texture_create(
|
||||||
PIPE_FORMAT_A8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8A8_UNORM,
|
||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
||||||
|
@ -383,14 +383,14 @@ class TextureDepthSampleTest(TestCase):
|
||||||
|
|
||||||
# framebuffer
|
# framebuffer
|
||||||
cbuf_tex = dev.texture_create(
|
cbuf_tex = dev.texture_create(
|
||||||
PIPE_FORMAT_A8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8A8_UNORM,
|
||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
||||||
)
|
)
|
||||||
|
|
||||||
zsbuf_tex = dev.texture_create(
|
zsbuf_tex = dev.texture_create(
|
||||||
PIPE_FORMAT_Z24X8_UNORM,
|
PIPE_FORMAT_X8Z24_UNORM,
|
||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET,
|
||||||
|
@ -498,15 +498,15 @@ def main():
|
||||||
]
|
]
|
||||||
|
|
||||||
color_formats = [
|
color_formats = [
|
||||||
PIPE_FORMAT_A8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8A8_UNORM,
|
||||||
PIPE_FORMAT_X8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8X8_UNORM,
|
||||||
#PIPE_FORMAT_A8R8G8B8_SRGB,
|
#PIPE_FORMAT_B8G8R8A8_SRGB,
|
||||||
PIPE_FORMAT_R5G6B5_UNORM,
|
PIPE_FORMAT_B5G6R5_UNORM,
|
||||||
PIPE_FORMAT_A1R5G5B5_UNORM,
|
PIPE_FORMAT_B5G5R5A1_UNORM,
|
||||||
PIPE_FORMAT_A4R4G4B4_UNORM,
|
PIPE_FORMAT_B4G4R4A4_UNORM,
|
||||||
PIPE_FORMAT_A8_UNORM,
|
PIPE_FORMAT_A8_UNORM,
|
||||||
PIPE_FORMAT_L8_UNORM,
|
PIPE_FORMAT_L8_UNORM,
|
||||||
PIPE_FORMAT_YCBCR,
|
PIPE_FORMAT_UYVY,
|
||||||
PIPE_FORMAT_DXT1_RGB,
|
PIPE_FORMAT_DXT1_RGB,
|
||||||
#PIPE_FORMAT_DXT1_RGBA,
|
#PIPE_FORMAT_DXT1_RGBA,
|
||||||
#PIPE_FORMAT_DXT3_RGBA,
|
#PIPE_FORMAT_DXT3_RGBA,
|
||||||
|
@ -515,8 +515,8 @@ def main():
|
||||||
|
|
||||||
depth_formats = [
|
depth_formats = [
|
||||||
PIPE_FORMAT_Z32_UNORM,
|
PIPE_FORMAT_Z32_UNORM,
|
||||||
PIPE_FORMAT_Z24S8_UNORM,
|
PIPE_FORMAT_S8Z24_UNORM,
|
||||||
PIPE_FORMAT_Z24X8_UNORM,
|
PIPE_FORMAT_X8Z24_UNORM,
|
||||||
PIPE_FORMAT_Z16_UNORM,
|
PIPE_FORMAT_Z16_UNORM,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -111,15 +111,15 @@ def main():
|
||||||
]
|
]
|
||||||
|
|
||||||
formats = [
|
formats = [
|
||||||
PIPE_FORMAT_A8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8A8_UNORM,
|
||||||
PIPE_FORMAT_X8R8G8B8_UNORM,
|
PIPE_FORMAT_B8G8R8X8_UNORM,
|
||||||
PIPE_FORMAT_A8R8G8B8_SRGB,
|
PIPE_FORMAT_B8G8R8A8_SRGB,
|
||||||
PIPE_FORMAT_R5G6B5_UNORM,
|
PIPE_FORMAT_B5G6R5_UNORM,
|
||||||
PIPE_FORMAT_A1R5G5B5_UNORM,
|
PIPE_FORMAT_B5G5R5A1_UNORM,
|
||||||
PIPE_FORMAT_A4R4G4B4_UNORM,
|
PIPE_FORMAT_B4G4R4A4_UNORM,
|
||||||
PIPE_FORMAT_Z32_UNORM,
|
PIPE_FORMAT_Z32_UNORM,
|
||||||
PIPE_FORMAT_Z24S8_UNORM,
|
PIPE_FORMAT_S8Z24_UNORM,
|
||||||
PIPE_FORMAT_Z24X8_UNORM,
|
PIPE_FORMAT_X8Z24_UNORM,
|
||||||
PIPE_FORMAT_Z16_UNORM,
|
PIPE_FORMAT_Z16_UNORM,
|
||||||
PIPE_FORMAT_S8_UNORM,
|
PIPE_FORMAT_S8_UNORM,
|
||||||
PIPE_FORMAT_A8_UNORM,
|
PIPE_FORMAT_A8_UNORM,
|
||||||
|
|
Loading…
Reference in New Issue