From: Thomas Wood Subject: [PATCH i-g-t 2/2] lib: load images from the data directory in igt_paint_image Date: Mon, 13 Apr 2015 17:48:36 +0100 Message-ID: <1428943716-19775-2-git-send-email-thomas.wood@intel.com> References: <1428943716-19775-1-git-send-email-thomas.wood@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTP id D347C6E56A for ; Mon, 13 Apr 2015 09:48:40 -0700 (PDT) Received: by widdi4 with SMTP id di4so59589159wid.0 for ; Mon, 13 Apr 2015 09:48:39 -0700 (PDT) In-Reply-To: <1428943716-19775-1-git-send-email-thomas.wood@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VXBkYXRlIGlndF9wYWludF9pbWFnZSBzbyB0aGF0IGl0IGNhbiByZWFkIGltYWdlcyBmcm9tIHRo ZSBwYWNrYWdlIGRhdGEKZGlyZWN0b3J5LgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIFdvb2QgPHRo b21hcy53b29kQGludGVsLmNvbT4KLS0tCiBsaWIvQW5kcm9pZC5tayAgICAgIHwgIDIgKy0KIGxp Yi9NYWtlZmlsZS5hbSAgICAgfCAgMyArKy0KIGxpYi9pZ3RfZmIuYyAgICAgICAgfCAyMyArKysr KysrKysrKysrKysrKy0tLS0tLQogdGVzdHMvdGVzdGRpc3BsYXkuYyB8IDM1ICsrLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMo KyksIDQxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9BbmRyb2lkLm1rIGIvbGliL0Fu ZHJvaWQubWsKaW5kZXggMjI1MWMxNS4uMWE3Y2YzMyAxMDA2NDQKLS0tIGEvbGliL0FuZHJvaWQu bWsKKysrIGIvbGliL0FuZHJvaWQubWsKQEAgLTM1LDcgKzM1LDcgQEAgTE9DQUxfU0hBUkVEX0xJ QlJBUklFUyA6PSBsaWJwY2lhY2Nlc3MgIFwKIGlmZXEgKCIke0FORFJPSURfSEFTX0NBSVJPfSIs ICIxIikKICAgICBza2lwX2xpYl9saXN0IDo9CiAgICAgTE9DQUxfQ19JTkNMVURFUyArPSAkKEFO RFJPSURfQlVJTERfVE9QKS9leHRlcm5hbC9jYWlyby0xLjEyLjE2L3NyYwotICAgIExPQ0FMX0NG TEFHUyArPSAtREFORFJPSURfSEFTX0NBSVJPPTEgLURJR1RfREFUQURJUj1cIi5cIgorICAgIExP Q0FMX0NGTEFHUyArPSAtREFORFJPSURfSEFTX0NBSVJPPTEgLURJR1RfREFUQURJUj1cIi5cIiAt RElHVF9TUkNESVI9XCIuXCIKIGVsc2UKIHNraXBfbGliX2xpc3QgOj0gXAogICAgIGlndF9rbXMu YyBcCmRpZmYgLS1naXQgYS9saWIvTWFrZWZpbGUuYW0gYi9saWIvTWFrZWZpbGUuYW0KaW5kZXgg ODcwYjFhMS4uYzc0ZTIxMSAxMDA2NDQKLS0tIGEvbGliL01ha2VmaWxlLmFtCisrKyBiL2xpYi9N YWtlZmlsZS5hbQpAQCAtMTAsNyArMTAsOCBAQCBub2luc3RfSEVBREVSUyA9IGNoZWNrLW5kZWJ1 Zy5oCiAKIEFNX0NQUEZMQUdTID0gLUkkKHRvcF9zcmNkaXIpCiBBTV9DRkxBR1MgPSAkKERSTV9D RkxBR1MpICQoQ1dBUk5GTEFHUykgJChMSUJVTldJTkRfQ0ZMQUdTKSAkKERFQlVHX0NGTEFHUykg XAotCSAgICAtRElHVF9EQVRBRElSPVwiIiQoYWJzX3RvcF9zcmNkaXIpL3Rlc3RzIlwiIFwKKwkg ICAgLURJR1RfU1JDRElSPVwiIiQoYWJzX3RvcF9zcmNkaXIpL3Rlc3RzIlwiIFwKKwkgICAgLURJ R1RfREFUQURJUj1cIiIkKHBrZ2RhdGFkaXIpIlwiIFwKIAkgICAgLURJR1RfTE9HX0RPTUFJTj1c IiIkKHN1YnN0IF8sLSwkKikiXCIgXAogCSAgICAtcHRocmVhZAogCmRpZmYgLS1naXQgYS9saWIv aWd0X2ZiLmMgYi9saWIvaWd0X2ZiLmMKaW5kZXggY2U1YTEwMi4uNmRjMjJiYiAxMDA2NDQKLS0t IGEvbGliL2lndF9mYi5jCisrKyBiL2xpYi9pZ3RfZmIuYwpAQCAtMzM4LDYgKzMzOCwxNSBAQCB2 b2lkIGlndF9wYWludF90ZXN0X3BhdHRlcm4oY2Fpcm9fdCAqY3IsIGludCB3aWR0aCwgaW50IGhl aWdodCkKIAlpZ3RfYXNzZXJ0KCFjYWlyb19zdGF0dXMoY3IpKTsKIH0KIAorc3RhdGljIGNhaXJv X3N0YXR1c190CitzdGRpb19yZWFkX2Z1bmModm9pZCAqY2xvc3VyZSwgdW5zaWduZWQgY2hhciog ZGF0YSwgdW5zaWduZWQgaW50IHNpemUpCit7CisJaWYgKGZyZWFkKGRhdGEsIDEsIHNpemUsIChG SUxFKiljbG9zdXJlKSAhPSBzaXplKQorCQlyZXR1cm4gQ0FJUk9fU1RBVFVTX1JFQURfRVJST1I7 CisKKwlyZXR1cm4gQ0FJUk9fU1RBVFVTX1NVQ0NFU1M7Cit9CisKIC8qKgogICogaWd0X3BhaW50 X2ltYWdlOgogICogQGNyOiBjYWlybyBkcmF3aW5nIGNvbnRleHQKQEAgLTM0Nyw5ICszNTYsOCBA QCB2b2lkIGlndF9wYWludF90ZXN0X3BhdHRlcm4oY2Fpcm9fdCAqY3IsIGludCB3aWR0aCwgaW50 IGhlaWdodCkKICAqIEBkc3Rfd2lkdGg6IHdpZHRoIG9mIHRoZSBkZXN0aW5hdGlvbiByZWN0YW5n bGUKICAqIEBkc3RfaGVpZ2h0OiBoZWlnaHQgb2YgdGhlIGRlc3RpbmF0aW9uIHJlY3RhbmdsZQog ICoKLSAqIFRoaXMgZnVuY3Rpb24gY2FuIGJlIHVzZWQgdG8gZHJhdyBhIHNjYWxlZCB2ZXJzaW9u IG9mIHRoZSBzdXBwbGllZCBwbmcgaW1hZ2UuCi0gKiBUaGlzIGlzIGN1cnJlbnRseSBvbmx5IHVz ZWQgYnkgdGhlIENSLWNvZGUgYmFzZWQgdGVzdGluZyBpbiB0aGUgInRlc3RkaXNwbGF5IgotICog dGVzdGNhc2UuCisgKiBUaGlzIGZ1bmN0aW9uIGNhbiBiZSB1c2VkIHRvIGRyYXcgYSBzY2FsZWQg dmVyc2lvbiBvZiB0aGUgc3VwcGxpZWQgcG5nIGltYWdlLAorICogd2hpY2ggaXMgbG9hZGVkIGZy b20gdGhlIHBhY2thZ2UgZGF0YSBkaXJlY3RvcnkuCiAgKi8KIHZvaWQgaWd0X3BhaW50X2ltYWdl KGNhaXJvX3QgKmNyLCBjb25zdCBjaGFyICpmaWxlbmFtZSwKIAkJICAgICBpbnQgZHN0X3gsIGlu dCBkc3RfeSwgaW50IGRzdF93aWR0aCwgaW50IGRzdF9oZWlnaHQpCkBAIC0zNTcsOCArMzY1LDEx IEBAIHZvaWQgaWd0X3BhaW50X2ltYWdlKGNhaXJvX3QgKmNyLCBjb25zdCBjaGFyICpmaWxlbmFt ZSwKIAljYWlyb19zdXJmYWNlX3QgKmltYWdlOwogCWludCBpbWdfd2lkdGgsIGltZ19oZWlnaHQ7 CiAJZG91YmxlIHNjYWxlX3gsIHNjYWxlX3k7CisJRklMRSogZjsKKworCWYgPSBpZ3RfZm9wZW5f ZGF0YShmaWxlbmFtZSk7CiAKLQlpbWFnZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlX2Zy b21fcG5nKGZpbGVuYW1lKTsKKwlpbWFnZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlX2Zy b21fcG5nX3N0cmVhbSgmc3RkaW9fcmVhZF9mdW5jLCBmKTsKIAlpZ3RfYXNzZXJ0KGNhaXJvX3N1 cmZhY2Vfc3RhdHVzKGltYWdlKSA9PSBDQUlST19TVEFUVVNfU1VDQ0VTUyk7CiAKIAlpbWdfd2lk dGggPSBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF93aWR0aChpbWFnZSk7CkBAIC02MDUsMTAgKzYx NiwxMCBAQCB1bnNpZ25lZCBpbnQgaWd0X2NyZWF0ZV9zdGVyZW9fZmIoaW50IGRybV9mZCwgZHJt TW9kZU1vZGVJbmZvICptb2RlLAogCQkJICAgICAgdGlsaW5nLCAmZmIpOwogCWNyID0gaWd0X2dl dF9jYWlyb19jdHgoZHJtX2ZkLCAmZmIpOwogCi0JaWd0X3BhaW50X2ltYWdlKGNyLCBJR1RfREFU QURJUiIvMTA4MHAtbGVmdC5wbmciLAorCWlndF9wYWludF9pbWFnZShjciwgIjEwODBwLWxlZnQu cG5nIiwKIAkJCWxheW91dC5sZWZ0LngsIGxheW91dC5sZWZ0LnksCiAJCQlsYXlvdXQubGVmdC53 aWR0aCwgbGF5b3V0LmxlZnQuaGVpZ2h0KTsKLQlpZ3RfcGFpbnRfaW1hZ2UoY3IsIElHVF9EQVRB RElSIi8xMDgwcC1yaWdodC5wbmciLAorCWlndF9wYWludF9pbWFnZShjciwgIjEwODBwLXJpZ2h0 LnBuZyIsCiAJCQlsYXlvdXQucmlnaHQueCwgbGF5b3V0LnJpZ2h0LnksCiAJCQlsYXlvdXQucmln aHQud2lkdGgsIGxheW91dC5yaWdodC5oZWlnaHQpOwogCmRpZmYgLS1naXQgYS90ZXN0cy90ZXN0 ZGlzcGxheS5jIGIvdGVzdHMvdGVzdGRpc3BsYXkuYwppbmRleCA1OGY1NmEzLi45MDY4YTk1IDEw MDY0NAotLS0gYS90ZXN0cy90ZXN0ZGlzcGxheS5jCisrKyBiL3Rlc3RzL3Rlc3RkaXNwbGF5LmMK QEAgLTIzOSwyMSArMjM5LDkgQEAgcGFpbnRfY29sb3Jfa2V5KHN0cnVjdCBpZ3RfZmIgKmZiX2lu Zm8pCiAJbXVubWFwKGZiX3B0ciwgZmJfaW5mby0+c2l6ZSk7CiB9CiAKLXN0YXRpYyBjYWlyb19z dGF0dXNfdAotc3RkaW9fcmVhZF9mdW5jKHZvaWQqIGNsb3N1cmUsIHVuc2lnbmVkIGNoYXIqIGRh dGEsIHVuc2lnbmVkIGludCBzaXplKQotewotCWlmIChmcmVhZCAoZGF0YSwgMSwgc2l6ZSwgKEZJ TEUqKWNsb3N1cmUpICE9IHNpemUpCi0JCXJldHVybiBDQUlST19TVEFUVVNfUkVBRF9FUlJPUjsK LQlyZXR1cm4gQ0FJUk9fU1RBVFVTX1NVQ0NFU1M7Ci19Ci0KIHN0YXRpYyB2b2lkIHBhaW50X2lt YWdlKGNhaXJvX3QgKmNyLCBjb25zdCBjaGFyICpmaWxlKQogewotCWludCBpbWdfeCwgaW1nX3ks IGltZ193LCBpbWdfaCwgaW1nX3dfbywgaW1nX2hfbzsKLQlkb3VibGUgaW1nX3dfc2NhbGUsIGlt Z19oX3NjYWxlOwotCi0JY2Fpcm9fc3VyZmFjZV90ICppbWFnZTsKLQlGSUxFKiBmcDsKKwlpbnQg aW1nX3gsIGltZ195LCBpbWdfdywgaW1nX2g7CiAKIAlpbWdfeSA9IGhlaWdodCAqICgwLjEwICk7 CiAJaW1nX2ggPSBoZWlnaHQgKiAwLjA4ICogNDsKQEAgLTI2MSwyNiArMjQ5LDcgQEAgc3RhdGlj IHZvaWQgcGFpbnRfaW1hZ2UoY2Fpcm9fdCAqY3IsIGNvbnN0IGNoYXIgKmZpbGUpCiAKIAlpbWdf eCA9ICh3aWR0aCAvIDIpIC0gKGltZ193IC8gMik7CiAKLQlmcCA9IGlndF9mb3Blbl9kYXRhKGZp bGUpOwotCWlmICghZnApCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotCWltYWdlID0gY2Fpcm9f aW1hZ2Vfc3VyZmFjZV9jcmVhdGVfZnJvbV9wbmdfc3RyZWFtKCZzdGRpb19yZWFkX2Z1bmMsCi0J CQkJCQkJICAgKHZvaWQqKWZwKTsKLQotCWltZ193X28gPSBjYWlyb19pbWFnZV9zdXJmYWNlX2dl dF93aWR0aChpbWFnZSk7Ci0JaW1nX2hfbyA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2hlaWdo dChpbWFnZSk7Ci0KLQljYWlyb190cmFuc2xhdGUoY3IsIGltZ194LCBpbWdfeSk7Ci0KLQlpbWdf d19zY2FsZSA9IChkb3VibGUpaW1nX3cgLyAoZG91YmxlKWltZ193X287Ci0JaW1nX2hfc2NhbGUg PSAoZG91YmxlKWltZ19oIC8gKGRvdWJsZSlpbWdfaF9vOwotCWNhaXJvX3NjYWxlKGNyLCBpbWdf d19zY2FsZSwgaW1nX2hfc2NhbGUpOwotCi0JY2Fpcm9fc2V0X3NvdXJjZV9zdXJmYWNlKGNyLCBp bWFnZSwgMCwgMCk7Ci0JY2Fpcm9fc2NhbGUoY3IsIDEsIDEpOwotCi0JY2Fpcm9fcGFpbnQoY3Ip OwotCWNhaXJvX3N1cmZhY2VfZGVzdHJveShpbWFnZSk7CisJaWd0X3BhaW50X2ltYWdlKGNyLCBm aWxlLCBpbWdfeCwgaW1nX3ksIGltZ19oLCBpbWdfdyk7CiB9CiAKIHN0YXRpYyB2b2lkIHBhaW50 X291dHB1dF9pbmZvKHN0cnVjdCBjb25uZWN0b3IgKmMsIHN0cnVjdCBpZ3RfZmIgKmZiKQotLSAK Mi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==