flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 02:16:17 +00:00
Code Issues Releases Wiki Activity

kms_frontbuffer_tracking: simplify subtest enumeration

Browse Source 
Just a small bikeshed.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
This commit is contained in:
Paulo Zanoni 2015-07-13 16:56:06 -03:00
parent 04d1311fc3
commit 91f097aefa
1 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tests/kms_frontbuffer_tracking.c
View File

@ -2592,11 +2592,9 @@ int main(int argc, char *argv[])
TEST_MODE_ITER_END TEST_MODE_ITER_END
TEST_MODE_ITER_BEGIN(t) TEST_MODE_ITER_BEGIN(t)
if (t.plane != PLANE_PRI) if (t.plane != PLANE_PRI ||
continue; t.screen == SCREEN_OFFSCREEN ||
if (t.screen == SCREEN_OFFSCREEN) (!opt.show_hidden && t.method != IGT_DRAW_BLT))
continue;
if (!opt.show_hidden && t.method != IGT_DRAW_BLT)
continue; continue;
igt_subtest_f("%s-%s-%s-%s-flip-%s", igt_subtest_f("%s-%s-%s-%s-flip-%s",
@ -2625,11 +2623,9 @@ int main(int argc, char *argv[])
TEST_MODE_ITER_END TEST_MODE_ITER_END
TEST_MODE_ITER_BEGIN(t) TEST_MODE_ITER_BEGIN(t)
if (t.screen == SCREEN_OFFSCREEN) if (t.screen == SCREEN_OFFSCREEN ||
continue; t.method != IGT_DRAW_BLT ||
if (t.method != IGT_DRAW_BLT) t.plane == PLANE_PRI)
continue;
if (t.plane == PLANE_PRI)
continue; continue;
igt_subtest_f("%s-%s-%s-%s-%s-move", igt_subtest_f("%s-%s-%s-%s-%s-move",
@ -2650,11 +2646,9 @@ int main(int argc, char *argv[])
TEST_MODE_ITER_END TEST_MODE_ITER_END
TEST_MODE_ITER_BEGIN(t) TEST_MODE_ITER_BEGIN(t)
if (t.screen == SCREEN_OFFSCREEN) if (t.screen == SCREEN_OFFSCREEN ||
continue; t.method != IGT_DRAW_BLT ||
if (t.method != IGT_DRAW_BLT) t.plane != PLANE_SPR)
continue;
if (t.plane != PLANE_SPR)
continue; continue;
igt_subtest_f("%s-%s-%s-%s-%s-fullscreen", igt_subtest_f("%s-%s-%s-%s-%s-fullscreen",
@ -2667,9 +2661,8 @@ int main(int argc, char *argv[])
TEST_MODE_ITER_END TEST_MODE_ITER_END
TEST_MODE_ITER_BEGIN(t) TEST_MODE_ITER_BEGIN(t)
if (t.screen != SCREEN_PRIM) if (t.screen != SCREEN_PRIM ||
continue; (!opt.show_hidden && t.fbs != FBS_INDIVIDUAL))
if (!opt.show_hidden && t.fbs != FBS_INDIVIDUAL)
continue; continue;
igt_subtest_f("%s-%s-%s-%s-multidraw-%s", igt_subtest_f("%s-%s-%s-%s-multidraw-%s",
@ -2682,15 +2675,11 @@ int main(int argc, char *argv[])
TEST_MODE_ITER_END TEST_MODE_ITER_END
TEST_MODE_ITER_BEGIN(t) TEST_MODE_ITER_BEGIN(t)
if (t.pipes != PIPE_SINGLE) if (t.pipes != PIPE_SINGLE ||
continue; t.screen != SCREEN_PRIM ||
if (t.screen != SCREEN_PRIM) t.plane != PLANE_PRI ||
continue; t.fbs != FBS_INDIVIDUAL ||
if (t.plane != PLANE_PRI) t.method != IGT_DRAW_MMAP_GTT)
continue;
if (t.fbs != FBS_INDIVIDUAL)
continue;
if (t.method != IGT_DRAW_MMAP_GTT)
continue; continue;
igt_subtest_f("%s-farfromfence", feature_str(t.feature)) igt_subtest_f("%s-farfromfence", feature_str(t.feature))
@ -2698,15 +2687,11 @@ int main(int argc, char *argv[])
TEST_MODE_ITER_END TEST_MODE_ITER_END
TEST_MODE_ITER_BEGIN(t) TEST_MODE_ITER_BEGIN(t)
if (t.pipes != PIPE_SINGLE) if (t.pipes != PIPE_SINGLE ||
continue; t.screen != SCREEN_PRIM ||
if (t.screen != SCREEN_PRIM) t.plane != PLANE_PRI ||
continue; t.fbs != FBS_INDIVIDUAL ||
if (t.plane != PLANE_PRI) t.method != IGT_DRAW_MMAP_CPU)
continue;
if (t.fbs != FBS_INDIVIDUAL)
continue;
if (t.method != IGT_DRAW_MMAP_CPU)
continue; continue;
igt_subtest_f("%s-modesetfrombusy", feature_str(t.feature)) igt_subtest_f("%s-modesetfrombusy", feature_str(t.feature))