python/tests: Extend the texture tests to cover volumes.
This commit is contained in:
@@ -56,7 +56,12 @@ def tex_coords(texture, face, level, zslice):
|
|||||||
if texture.target == PIPE_TEXTURE_2D:
|
if texture.target == PIPE_TEXTURE_2D:
|
||||||
return [[s, t, 0.0] for s, t in st]
|
return [[s, t, 0.0] for s, t in st]
|
||||||
elif texture.target == PIPE_TEXTURE_3D:
|
elif texture.target == PIPE_TEXTURE_3D:
|
||||||
assert 0
|
depth = texture.get_depth(level)
|
||||||
|
if depth > 1:
|
||||||
|
r = float(zslice)/float(depth - 1)
|
||||||
|
else:
|
||||||
|
r = 0.0
|
||||||
|
return [[s, t, r] for s, t in st]
|
||||||
elif texture.target == PIPE_TEXTURE_CUBE:
|
elif texture.target == PIPE_TEXTURE_CUBE:
|
||||||
result = []
|
result = []
|
||||||
for s, t in st:
|
for s, t in st:
|
||||||
@@ -112,10 +117,10 @@ class TextureTest(TestCase):
|
|||||||
}[self.face]
|
}[self.face]
|
||||||
else:
|
else:
|
||||||
face = ""
|
face = ""
|
||||||
return "%s %s %ux%u last_level=%u %s level=%u" % (
|
return "%s %s %ux%ux%u last_level=%u face=%s level=%u zslice=%u" % (
|
||||||
target, format,
|
target, format,
|
||||||
self.width, self.height,
|
self.width, self.height, self.depth, self.last_level,
|
||||||
self.last_level, face, self.level,
|
face, self.level, self.zslice,
|
||||||
)
|
)
|
||||||
|
|
||||||
def test(self):
|
def test(self):
|
||||||
@@ -125,9 +130,11 @@ class TextureTest(TestCase):
|
|||||||
format = self.format
|
format = self.format
|
||||||
width = self.width
|
width = self.width
|
||||||
height = self.height
|
height = self.height
|
||||||
|
depth = self.depth
|
||||||
last_level = self.last_level
|
last_level = self.last_level
|
||||||
level = self.level
|
|
||||||
face = self.face
|
face = self.face
|
||||||
|
level = self.level
|
||||||
|
zslice = self.zslice
|
||||||
|
|
||||||
if not dev.is_format_supported(format, PIPE_TEXTURE):
|
if not dev.is_format_supported(format, PIPE_TEXTURE):
|
||||||
raise TestSkip
|
raise TestSkip
|
||||||
@@ -185,17 +192,21 @@ class TextureTest(TestCase):
|
|||||||
ctx.set_sampler(0, sampler)
|
ctx.set_sampler(0, sampler)
|
||||||
|
|
||||||
# texture
|
# texture
|
||||||
texture = dev.texture_create(target=target,
|
texture = dev.texture_create(
|
||||||
format=format,
|
target = target,
|
||||||
width=width,
|
format = format,
|
||||||
height=height,
|
width = width,
|
||||||
last_level = last_level)
|
height = height,
|
||||||
|
depth = depth,
|
||||||
|
last_level = last_level,
|
||||||
|
)
|
||||||
|
|
||||||
expected_rgba = FloatArray(height*width*4)
|
expected_rgba = FloatArray(height*width*4)
|
||||||
texture.get_surface(
|
texture.get_surface(
|
||||||
usage = PIPE_BUFFER_USAGE_CPU_READ|PIPE_BUFFER_USAGE_CPU_WRITE,
|
usage = PIPE_BUFFER_USAGE_CPU_READ|PIPE_BUFFER_USAGE_CPU_WRITE,
|
||||||
face = face,
|
face = face,
|
||||||
level = level,
|
level = level,
|
||||||
|
zslice = zslice,
|
||||||
).sample_rgba(expected_rgba)
|
).sample_rgba(expected_rgba)
|
||||||
|
|
||||||
ctx.set_sampler_texture(0, texture)
|
ctx.set_sampler_texture(0, texture)
|
||||||
@@ -263,7 +274,7 @@ class TextureTest(TestCase):
|
|||||||
[x, y+h],
|
[x, y+h],
|
||||||
]
|
]
|
||||||
|
|
||||||
tex = tex_coords(texture, face, level, zslice=0)
|
tex = tex_coords(texture, face, level, zslice)
|
||||||
|
|
||||||
for i in range(0, 4):
|
for i in range(0, 4):
|
||||||
j = 8*i
|
j = 8*i
|
||||||
@@ -313,6 +324,7 @@ def main():
|
|||||||
targets = []
|
targets = []
|
||||||
targets += [PIPE_TEXTURE_2D]
|
targets += [PIPE_TEXTURE_2D]
|
||||||
targets += [PIPE_TEXTURE_CUBE]
|
targets += [PIPE_TEXTURE_CUBE]
|
||||||
|
targets += [PIPE_TEXTURE_3D]
|
||||||
|
|
||||||
formats = []
|
formats = []
|
||||||
formats += [PIPE_FORMAT_A8R8G8B8_UNORM]
|
formats += [PIPE_FORMAT_A8R8G8B8_UNORM]
|
||||||
@@ -322,7 +334,9 @@ def main():
|
|||||||
formats += [PIPE_FORMAT_DXT1_RGB]
|
formats += [PIPE_FORMAT_DXT1_RGB]
|
||||||
|
|
||||||
sizes = [64, 32, 16, 8, 4, 2, 1]
|
sizes = [64, 32, 16, 8, 4, 2, 1]
|
||||||
|
#sizes = [1020, 508, 252, 62, 30, 14, 6, 3]
|
||||||
#sizes = [64]
|
#sizes = [64]
|
||||||
|
#sizes = [63]
|
||||||
|
|
||||||
for target in targets:
|
for target in targets:
|
||||||
for format in formats:
|
for format in formats:
|
||||||
@@ -339,21 +353,28 @@ def main():
|
|||||||
#faces = [PIPE_TEX_FACE_NEG_X]
|
#faces = [PIPE_TEX_FACE_NEG_X]
|
||||||
else:
|
else:
|
||||||
faces = [0]
|
faces = [0]
|
||||||
|
if target == PIPE_TEXTURE_3D:
|
||||||
|
depth = size
|
||||||
|
else:
|
||||||
|
depth = 1
|
||||||
for face in faces:
|
for face in faces:
|
||||||
levels = lods(size)
|
levels = lods(size)
|
||||||
for last_level in range(levels):
|
for last_level in range(levels):
|
||||||
for level in range(0, last_level + 1):
|
for level in range(0, last_level + 1):
|
||||||
test = TextureTest(
|
for zslice in range(0, depth >> level):
|
||||||
dev=dev,
|
test = TextureTest(
|
||||||
target=target,
|
dev = dev,
|
||||||
format=format,
|
target = target,
|
||||||
width=size,
|
format = format,
|
||||||
height=size,
|
width = size,
|
||||||
face=face,
|
height = size,
|
||||||
last_level = last_level,
|
depth = depth,
|
||||||
level=level,
|
last_level = last_level,
|
||||||
)
|
face = face,
|
||||||
suite.add_test(test)
|
level = level,
|
||||||
|
zslice = zslice,
|
||||||
|
)
|
||||||
|
suite.add_test(test)
|
||||||
suite.run()
|
suite.run()
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user