python/tests: Check support for non-pot/non-square textures.

diff --git a/src/gallium/state_trackers/python/tests/texture.py b/src/gallium/state_trackers/python/tests/texture.py
index 861070c8d24e94926f9d4e2c188f6923ebe99974..880a61306c95858701b16eb01eb5f36309e9aea5 100644 (file)
--- a/src/gallium/state_trackers/python/tests/texture.py
+++ b/src/gallium/state_trackers/python/tests/texture.py
@@ -94,7 +94,10 @@ def tex_coords(texture, face, level, zslice):
                 rz = -1.0
             result.append([rx, ry, rz])
         return result
-                    
+
+def is_pot(n):
+    return n & (n - 1) == 0
+      
                 
 class TextureTest(TestCase):
     
@@ -136,7 +139,14 @@ class TextureTest(TestCase):
         level = self.level
         zslice = self.zslice
         
-        if not dev.is_format_supported(format, target, PIPE_TEXTURE_USAGE_SAMPLER, 0):
+        tex_usage = PIPE_TEXTURE_USAGE_SAMPLER
+        geom_flags = 0
+        if width != height:
+            geom_flags |= PIPE_TEXTURE_GEOM_NON_SQUARE
+        if not is_pot(width) or not is_pot(height) or not is_pot(depth):
+            geom_flags |= PIPE_TEXTURE_GEOM_NON_POWER_OF_TWO
+        
+        if not dev.is_format_supported(format, target, tex_usage, geom_flags):
             raise TestSkip
         
         ctx = self.dev.context_create()
@@ -199,7 +209,7 @@ class TextureTest(TestCase):
             height = height,
             depth = depth, 
             last_level = last_level,
-            tex_usage = PIPE_TEXTURE_USAGE_SAMPLER,
+            tex_usage = tex_usage,
         )
         
         expected_rgba = FloatArray(height*width*4)