diff options
author | José Fonseca <jfonseca@vmware.com> | 2010-04-12 15:08:05 +0900 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2010-04-12 15:32:23 +0900 |
commit | 19211bb5b8fa406fde294ec84f814e3b7881c474 (patch) | |
tree | b8ee78981259be11e0c583bd85284e9bfbdba29d /progs/gallium/python/tests/texture_blit.py | |
parent | c48f21ea7cb9634c1865514f069b8c0993cb5daf (diff) |
progs/gallium/python: Try to fix most regressions.
Not enough for retrace to work again though.
Diffstat (limited to 'progs/gallium/python/tests/texture_blit.py')
-rwxr-xr-x | progs/gallium/python/tests/texture_blit.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/progs/gallium/python/tests/texture_blit.py b/progs/gallium/python/tests/texture_blit.py index a68c081931..77f006ea04 100755 --- a/progs/gallium/python/tests/texture_blit.py +++ b/progs/gallium/python/tests/texture_blit.py @@ -131,14 +131,14 @@ class TextureColorSampleTest(TestCase): minz = 0.0 maxz = 1.0 - tex_usage = PIPE_TEXTURE_USAGE_SAMPLER + bind = PIPE_BIND_SAMPLER_VIEW 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): + if not dev.is_format_supported(format, target, bind, geom_flags): raise TestSkip # disabled blending/masking @@ -174,14 +174,14 @@ class TextureColorSampleTest(TestCase): ctx.set_fragment_sampler(0, sampler) # texture - texture = dev.texture_create( + texture = dev.resource_create( target = target, format = format, width = width, height = height, depth = depth, last_level = last_level, - tex_usage = tex_usage, + bind = bind, ) expected_rgba = FloatArray(height*width*4) @@ -225,11 +225,11 @@ class TextureColorSampleTest(TestCase): ctx.set_clip(clip) # framebuffer - cbuf_tex = dev.texture_create( + cbuf_tex = dev.resource_create( PIPE_FORMAT_B8G8R8A8_UNORM, width, height, - tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET, + bind = PIPE_BIND_RENDER_TARGET, ) cbuf = cbuf_tex.get_surface() @@ -349,14 +349,14 @@ class TextureDepthSampleTest(TestCase): minz = 0.0 maxz = 1.0 - tex_usage = PIPE_TEXTURE_USAGE_SAMPLER + bind = PIPE_BIND_SAMPLER_VIEW 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): + if not dev.is_format_supported(format, target, bind, geom_flags): raise TestSkip # disabled blending/masking @@ -411,14 +411,14 @@ class TextureDepthSampleTest(TestCase): ctx.set_fragment_sampler(0, sampler) # texture - texture = dev.texture_create( + texture = dev.resource_create( target = target, format = format, width = width, height = height, depth = depth, last_level = last_level, - tex_usage = tex_usage, + bind = bind, ) expected_rgba = FloatArray(height*width*4) @@ -446,18 +446,18 @@ class TextureDepthSampleTest(TestCase): ctx.set_clip(clip) # framebuffer - cbuf_tex = dev.texture_create( + cbuf_tex = dev.resource_create( PIPE_FORMAT_B8G8R8A8_UNORM, width, height, - tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET, + bind = PIPE_BIND_RENDER_TARGET, ) - zsbuf_tex = dev.texture_create( + zsbuf_tex = dev.resource_create( PIPE_FORMAT_X8Z24_UNORM, width, height, - tex_usage = PIPE_TEXTURE_USAGE_RENDER_TARGET, + bind = PIPE_BIND_RENDER_TARGET, ) cbuf = cbuf_tex.get_surface() |