[Piglit] [PATCH 2/3] all.tests: move all tests from "texturing" into spec
Ian Romanick
idr at freedesktop.org
Thu Oct 25 15:16:19 PDT 2012
On 10/25/2012 02:25 PM, Marek Olšák wrote:
> On Tue, Oct 23, 2012 at 7:46 PM, Ian Romanick <idr at freedesktop.org> wrote:
>> On 10/23/2012 06:25 AM, Marek Olšák wrote:
>>>
>>> ---
>>> tests/all.tests | 187
>>> +++++++++++++++++++++++++---------------------
>>> tests/quick-driver.tests | 2 +-
>>> 2 files changed, 103 insertions(+), 86 deletions(-)
>>>
>>> diff --git a/tests/all.tests b/tests/all.tests
>>> index a260073..5849a91 100644
>>> --- a/tests/all.tests
>>> +++ b/tests/all.tests
>>> @@ -431,89 +431,6 @@ glx['GLX_EXT_create_context_es2_profile'] =
>>> create_context_es2_profile
>>> create_context_es2_profile['indirect rendering ES2 profile'] =
>>> concurrent_test('glx-create-context-indirect-es2-profile')
>>> create_context_es2_profile['invalid OpenGL ES version'] =
>>> concurrent_test('glx-create-context-invalid-es-version')
>>>
>>> -texturing = Group()
>>> -add_concurrent_test(texturing, '1-1-linear-texture')
>>> -add_plain_test(texturing, 'array-depth-roundtrip')
>>> -add_plain_test(texturing, 'array-texture')
>>> -add_plain_test(texturing, 'copytexsubimage')
>>> -add_plain_test(texturing, 'copyteximage-border')
>>> -add_plain_test(texturing, 'copyteximage-clipping')
>>> -add_plain_test(texturing, 'cubemap')
>>> -texturing['cubemap npot'] = PlainExecTest(['cubemap', '-auto', 'npot'])
>>> -add_plain_test(texturing, 'depth-level-clamp')
>>> -add_plain_test(texturing, 'depth-tex-modes')
>>> -add_plain_test(texturing, 'depth-tex-modes-glsl')
>>> -add_plain_test(texturing, 'depth-tex-modes-rg')
>>> -add_plain_test(texturing, 'depth-tex-compare')
>>> -add_plain_test(texturing, 'depth-cube-map')
>>> -add_plain_test(texturing, 'fragment-and-vertex-texturing')
>>> -add_plain_test(texturing, 'fxt1-teximage')
>>> -add_plain_test(texturing, 'gen-teximage')
>>> -add_plain_test(texturing, 'gen-compressed-teximage')
>>> -add_plain_test(texturing, 'gen-nonzero-unit')
>>> -add_plain_test(texturing, 'gen-texsubimage')
>>> -add_plain_test(texturing, 'getteximage-formats')
>>> -add_plain_test(texturing, 'getteximage-simple')
>>> -add_plain_test(texturing, 'getteximage-luminance')
>>> -
>>> -texturing['incomplete-texture-fixed'] =
>>> concurrent_test('incomplete-texture -auto fixed')
>>> -texturing['incomplete-texture-arb_fp'] =
>>> concurrent_test('incomplete-texture -auto arb_fp')
>>> -texturing['incomplete-texture-glsl'] =
>>> concurrent_test('incomplete-texture -auto glsl')
>>> -
>>> -add_plain_test(texturing, 'levelclamp')
>>> -add_plain_test(texturing, 'lodbias')
>>> -add_plain_test(texturing, 'lodclamp')
>>> -add_plain_test(texturing, 'lodclamp-between')
>>> -add_plain_test(texturing, 'lodclamp-between-max')
>>> -add_plain_test(texturing, 'mipmap-setup')
>>> -add_plain_test(texturing, 'max-texture-size')
>>> -add_concurrent_test(texturing, 'max-texture-size-level')
>>> -add_concurrent_test(texturing, 'proxy-texture')
>>> -add_plain_test(texturing, 'rg-draw-pixels')
>>> -add_plain_test(texturing, 'rg-teximage-01')
>>> -add_plain_test(texturing, 'rg-teximage-02')
>>> -add_plain_test(texturing, 'rgtc-teximage-01')
>>> -add_plain_test(texturing, 'rgtc-teximage-02')
>>> -add_concurrent_test(texturing, 's3tc-errors')
>>> -add_plain_test(texturing, 's3tc-teximage')
>>> -add_plain_test(texturing, 's3tc-texsubimage')
>>> -add_plain_test(texturing, 'sampler-cube-shadow')
>>> -add_concurrent_test(texturing, 'sized-texture-format-channels')
>>> -add_plain_test(texturing, 'streaming-texture-leak')
>>> -add_plain_test(texturing, 'tex-border-1')
>>> -texturing['tex-miplevel-selection'] =
>>> PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias', '-nolod'])
>>> -texturing['tex-miplevel-selection-lod'] =
>>> PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias'])
>>> -texturing['tex-miplevel-selection-lod-bias'] =
>>> PlainExecTest(['tex-miplevel-selection', '-auto'])
>>> -add_plain_test(texturing, 'tex-skipped-unit')
>>> -add_plain_test(texturing, 'tex-swizzle')
>>> -add_plain_test(texturing, 'tex3d')
>>> -add_concurrent_test(texturing, 'tex3d-depth1')
>>> -add_plain_test(texturing, 'tex3d-maxsize')
>>> -add_plain_test(texturing, 'tex3d-npot')
>>> -add_plain_test(texturing, 'texdepth')
>>> -add_plain_test(texturing, 'teximage-errors')
>>> -add_plain_test(texturing, 'texrect-many')
>>> -add_plain_test(texturing, 'texredefine')
>>> -add_plain_test(texturing, 'texsubimage')
>>> -add_plain_test(texturing, 'texture-al')
>>> -add_plain_test(texturing, 'texture-packed-formats')
>>> -add_plain_test(texturing, 'texture-rg')
>>> -add_plain_test(texturing, 'tex-srgb')
>>> -
>>> -# Note: the buffer sizes of 146, 292, 585, and 1024 hav been chosen to
>>> -# exercise all possible combinations of buffer alignments on i965.
>>> -for texture_size in (146, 292, 585, 1024):
>>> - for test_type in ('s=z24_s8', 'd=z24_s8', 'd=z24', 'd=z32f_s8',
>>> - 'd=z32f', 'd=z16', 'd=z24_s8_s=z24_s8',
>>> - 'd=z24_s=z24_s8', 's=z24_s8_d=z24_s8',
>>> - 's=z24_s8_d=z24', 'd=s=z24_s8', 's=d=z24_s8',
>>> - 'ds=z24_s8', 'd=z32f_s8_s=z24_s8',
>>> 'd=z32f_s=z24_s8',
>>> - 's=z24_s8_d=z32f_s8', 's=z24_s8_d=z32f',
>>> - 'd=s=z32f_s8', 's=d=z32f_s8', 'ds=z32f_s8'):
>>> - test_name = 'depthstencil-render-miplevels {0}
>>> {1}'.format(
>>> - texture_size, test_type)
>>> - texturing[test_name] = PlainExecTest(test_name + '
>>> -auto')
>>> -
>>> def texwrap_test(args):
>>> test = PlainExecTest(['texwrap', '-fbo', '-auto'] + args)
>>> test.runConcurrent = True
>>> @@ -616,6 +533,21 @@ add_plain_test(gl11,
>>> 'two-sided-lighting-separate-specular')
>>> add_plain_test(gl11, 'user-clip')
>>> add_plain_test(gl11, 'varray-disabled')
>>> add_plain_test(gl11, 'windowoverlap')
>>> +add_plain_test(gl11, 'copyteximage-border')
>>> +add_plain_test(gl11, 'copyteximage-clipping')
>>> +add_plain_test(gl11, 'copytexsubimage')
>>> +add_plain_test(gl11, 'getteximage-formats')
>>> +add_plain_test(gl11, 'getteximage-luminance')
>>> +add_plain_test(gl11, 'getteximage-simple')
>>> +gl11['incomplete-texture-fixed'] = concurrent_test('incomplete-texture
>>> -auto fixed')
>>> +add_plain_test(gl11, 'max-texture-size')
>>> +add_concurrent_test(gl11, 'max-texture-size-level')
>>> +add_concurrent_test(gl11, 'proxy-texture')
>>> +add_concurrent_test(gl11, 'sized-texture-format-channels')
>>> +add_plain_test(gl11, 'streaming-texture-leak')
>>> +add_plain_test(gl11, 'texredefine')
>>> +add_plain_test(gl11, 'texsubimage')
>>> +add_plain_test(gl11, 'texture-al')
>>>
>>> gl10 = Group()
>>> spec['!OpenGL 1.0'] = gl10
>>> @@ -628,10 +560,22 @@ add_texwrap_target_tests(gl12, '3D')
>>> gl12['copyteximage 3D'] = PlainExecTest(['copyteximage', '-auto', '3D'])
>>> add_plain_test(gl12, 'crash-texparameter-before-teximage')
>>> add_plain_test(gl12, 'draw-elements-vs-inputs')
>>> +add_plain_test(gl12, 'levelclamp')
>>> +add_plain_test(gl12, 'lodclamp')
>>> +add_plain_test(gl12, 'lodclamp-between')
>>> +add_plain_test(gl12, 'lodclamp-between-max')
>>> +add_plain_test(gl12, 'mipmap-setup')
>>> +add_plain_test(gl12, 'tex-skipped-unit')
>>> +add_plain_test(gl12, 'tex3d')
>>> +add_plain_test(gl12, 'tex3d-maxsize')
>>> +add_plain_test(gl12, 'teximage-errors')
>>> +add_plain_test(gl12, 'texture-packed-formats')
>>>
>>> gl13 = Group()
>>> spec['!OpenGL 1.3'] = gl13
>>> add_plain_test(gl13, 'texunits')
>>> +add_plain_test(gl13, 'tex-border-1')
>>
>>
>> I think this is gl11.
>
> It's gl13, because it uses the texture border color.
Border color has existed (for use with GL_CLAMP) since OpenGL 1.0.
GL_CLAMP_TO_BORDER was added 1.3 (or GL_ARB_texture_border_clamp). I
skimmed the tests and didn't see GL_CLAMP_TO_BORDER. Did I miss it?
> There are more tests which don't correctly check for GL versions
> and/or extensions, it's especially the case with the tests for old GL
> features.
Yeah, I can believe that. :(
>>> +add_concurrent_test(gl13, 'tex3d-depth1')
>>
>>
>> This test should either require GL 1.3 or require GL 1.2 +
>> GL_ARB_texture_border_clamp. :(
>
> I'll fix that.
>
> Marek
>
More information about the Piglit
mailing list