From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keith Packard Subject: [PATCH 1/8] drivers/dri/common: A few dri2 functions are not actually DRI2 specific Date: Mon, 4 Nov 2013 18:23:21 -0800 Message-ID: <1383618208-21310-2-git-send-email-keithp@keithp.com> References: <1383618208-21310-1-git-send-email-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 763FFEF529 for ; Mon, 4 Nov 2013 18:23:36 -0800 (PST) In-Reply-To: <1383618208-21310-1-git-send-email-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: mesa3d-dev@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBqdXN0IHJlbmFtZXMgdGhlbSBzbyB0aGF0IHRoZXkgY2FuIGJlIHVzZWQgd2l0aCB0aGUg RFJJMyBleHRlbnNpb24Kd2l0aG91dCBjYXVzaW5nIHRvbyBtdWNoIGNvbmZ1c2lvbi4KClNpZ25l ZC1vZmYtYnk6IEtlaXRoIFBhY2thcmQgPGtlaXRocEBrZWl0aHAuY29tPgpSZXZpZXdlZC1ieTog S3Jpc3RpYW4gSMO4Z3NiZXJnIDxrcmhAYml0cGxhbmV0Lm5ldD4KLS0tCiBzcmMvbWVzYS9kcml2 ZXJzL2RyaS9jb21tb24vZHJpX3V0aWwuYyB8IDU4ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9zcmMvbWVzYS9kcml2ZXJzL2RyaS9jb21tb24vZHJpX3V0aWwuYyBi L3NyYy9tZXNhL2RyaXZlcnMvZHJpL2NvbW1vbi9kcmlfdXRpbC5jCmluZGV4IGMyOGIwZmMuLjk1 YzhiNDEgMTAwNjQ0Ci0tLSBhL3NyYy9tZXNhL2RyaXZlcnMvZHJpL2NvbW1vbi9kcmlfdXRpbC5j CisrKyBiL3NyYy9tZXNhL2RyaXZlcnMvZHJpL2NvbW1vbi9kcmlfdXRpbC5jCkBAIC0yOTEsMTMg KzI5MSwxMyBAQCB2YWxpZGF0ZV9jb250ZXh0X3ZlcnNpb24oX19EUklzY3JlZW4gKnNjcmVlbiwK IC8qQHsqLwogCiBzdGF0aWMgX19EUkljb250ZXh0ICoKLWRyaTJDcmVhdGVDb250ZXh0QXR0cmli cyhfX0RSSXNjcmVlbiAqc2NyZWVuLCBpbnQgYXBpLAotCQkJIGNvbnN0IF9fRFJJY29uZmlnICpj b25maWcsCi0JCQkgX19EUkljb250ZXh0ICpzaGFyZWQsCi0JCQkgdW5zaWduZWQgbnVtX2F0dHJp YnMsCi0JCQkgY29uc3QgdWludDMyX3QgKmF0dHJpYnMsCi0JCQkgdW5zaWduZWQgKmVycm9yLAot CQkJIHZvaWQgKmRhdGEpCitkcmlDcmVhdGVDb250ZXh0QXR0cmlicyhfX0RSSXNjcmVlbiAqc2Ny ZWVuLCBpbnQgYXBpLAorICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgX19EUkljb25maWcg KmNvbmZpZywKKyAgICAgICAgICAgICAgICAgICAgICAgIF9fRFJJY29udGV4dCAqc2hhcmVkLAor ICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbnVtX2F0dHJpYnMsCisgICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCB1aW50MzJfdCAqYXR0cmlicywKKyAgICAgICAgICAgICAgICAg ICAgICAgIHVuc2lnbmVkICplcnJvciwKKyAgICAgICAgICAgICAgICAgICAgICAgIHZvaWQgKmRh dGEpCiB7CiAgICAgX19EUkljb250ZXh0ICpjb250ZXh0OwogICAgIGNvbnN0IHN0cnVjdCBnbF9j b25maWcgKm1vZGVzID0gKGNvbmZpZyAhPSBOVUxMKSA/ICZjb25maWctPm1vZGVzIDogTlVMTDsK QEAgLTQ0MiwyMiArNDQyLDIyIEBAIGRyaTJDcmVhdGVDb250ZXh0QXR0cmlicyhfX0RSSXNjcmVl biAqc2NyZWVuLCBpbnQgYXBpLAogfQogCiBzdGF0aWMgX19EUkljb250ZXh0ICoKLWRyaTJDcmVh dGVOZXdDb250ZXh0Rm9yQVBJKF9fRFJJc2NyZWVuICpzY3JlZW4sIGludCBhcGksCi0JCQkgICBj b25zdCBfX0RSSWNvbmZpZyAqY29uZmlnLAotCQkJICAgX19EUkljb250ZXh0ICpzaGFyZWQsIHZv aWQgKmRhdGEpCitkcmlDcmVhdGVOZXdDb250ZXh0Rm9yQVBJKF9fRFJJc2NyZWVuICpzY3JlZW4s IGludCBhcGksCisgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IF9fRFJJY29uZmlnICpj b25maWcsCisgICAgICAgICAgICAgICAgICAgICAgICAgIF9fRFJJY29udGV4dCAqc2hhcmVkLCB2 b2lkICpkYXRhKQogewogICAgIHVuc2lnbmVkIGVycm9yOwogCi0gICAgcmV0dXJuIGRyaTJDcmVh dGVDb250ZXh0QXR0cmlicyhzY3JlZW4sIGFwaSwgY29uZmlnLCBzaGFyZWQsIDAsIE5VTEwsCi0J CQkJICAgICZlcnJvciwgZGF0YSk7CisgICAgcmV0dXJuIGRyaUNyZWF0ZUNvbnRleHRBdHRyaWJz KHNjcmVlbiwgYXBpLCBjb25maWcsIHNoYXJlZCwgMCwgTlVMTCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJmVycm9yLCBkYXRhKTsKIH0KIAogc3RhdGljIF9fRFJJY29udGV4 dCAqCi1kcmkyQ3JlYXRlTmV3Q29udGV4dChfX0RSSXNjcmVlbiAqc2NyZWVuLCBjb25zdCBfX0RS SWNvbmZpZyAqY29uZmlnLAotCQkgICAgICBfX0RSSWNvbnRleHQgKnNoYXJlZCwgdm9pZCAqZGF0 YSkKK2RyaUNyZWF0ZU5ld0NvbnRleHQoX19EUklzY3JlZW4gKnNjcmVlbiwgY29uc3QgX19EUklj b25maWcgKmNvbmZpZywKKyAgICAgICAgICAgICAgICAgICAgX19EUkljb250ZXh0ICpzaGFyZWQs IHZvaWQgKmRhdGEpCiB7Ci0gICAgcmV0dXJuIGRyaTJDcmVhdGVOZXdDb250ZXh0Rm9yQVBJKHNj cmVlbiwgX19EUklfQVBJX09QRU5HTCwKLQkJCQkgICAgICBjb25maWcsIHNoYXJlZCwgZGF0YSk7 CisgICAgcmV0dXJuIGRyaUNyZWF0ZU5ld0NvbnRleHRGb3JBUEkoc2NyZWVuLCBfX0RSSV9BUElf T1BFTkdMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbmZpZywgc2hh cmVkLCBkYXRhKTsKIH0KIAogLyoqCkBAIC02MDksOSArNjA5LDkgQEAgc3RhdGljIHZvaWQgZHJp X3B1dF9kcmF3YWJsZShfX0RSSWRyYXdhYmxlICpwZHApCiB9CiAKIHN0YXRpYyBfX0RSSWRyYXdh YmxlICoKLWRyaTJDcmVhdGVOZXdEcmF3YWJsZShfX0RSSXNjcmVlbiAqc2NyZWVuLAotCQkgICAg ICBjb25zdCBfX0RSSWNvbmZpZyAqY29uZmlnLAotCQkgICAgICB2b2lkICpkYXRhKQorZHJpQ3Jl YXRlTmV3RHJhd2FibGUoX19EUklzY3JlZW4gKnNjcmVlbiwKKyAgICAgICAgICAgICAgICAgICAg IGNvbnN0IF9fRFJJY29uZmlnICpjb25maWcsCisgICAgICAgICAgICAgICAgICAgICB2b2lkICpk YXRhKQogewogICAgIF9fRFJJZHJhd2FibGUgKnBkcmF3OwogCkBAIC02OTgsNyArNjk4LDcgQEAg ZHJpMkNvbmZpZ1F1ZXJ5ZihfX0RSSXNjcmVlbiAqc2NyZWVuLCBjb25zdCBjaGFyICp2YXIsIEdM ZmxvYXQgKnZhbCkKIH0KIAogc3RhdGljIHVuc2lnbmVkIGludAotZHJpMkdldEFQSU1hc2soX19E UklzY3JlZW4gKnNjcmVlbikKK2RyaUdldEFQSU1hc2soX19EUklzY3JlZW4gKnNjcmVlbikKIHsK ICAgICByZXR1cm4gc2NyZWVuLT5hcGlfbWFzazsKIH0KQEAgLTcyOSw3ICs3MjksNyBAQCBjb25z dCBfX0RSSWNvcmVFeHRlbnNpb24gZHJpQ29yZUV4dGVuc2lvbiA9IHsKICAgICAuY3JlYXRlTmV3 RHJhd2FibGUgICAgICAgICAgPSBOVUxMLAogICAgIC5kZXN0cm95RHJhd2FibGUgICAgICAgICAg ICA9IGRyaURlc3Ryb3lEcmF3YWJsZSwKICAgICAuc3dhcEJ1ZmZlcnMgICAgICAgICAgICAgICAg PSBkcmlTd2FwQnVmZmVycywgLyogc3dyYXN0ICovCi0gICAgLmNyZWF0ZU5ld0NvbnRleHQgICAg ICAgICAgID0gZHJpMkNyZWF0ZU5ld0NvbnRleHQsIC8qIHN3cmFzdCAqLworICAgIC5jcmVhdGVO ZXdDb250ZXh0ICAgICAgICAgICA9IGRyaUNyZWF0ZU5ld0NvbnRleHQsIC8qIHN3cmFzdCAqLwog ICAgIC5jb3B5Q29udGV4dCAgICAgICAgICAgICAgICA9IGRyaUNvcHlDb250ZXh0LAogICAgIC5k ZXN0cm95Q29udGV4dCAgICAgICAgICAgICA9IGRyaURlc3Ryb3lDb250ZXh0LAogICAgIC5iaW5k Q29udGV4dCAgICAgICAgICAgICAgICA9IGRyaUJpbmRDb250ZXh0LApAQCAtNzQxLDIyICs3NDEs MjIgQEAgY29uc3QgX19EUklkcmkyRXh0ZW5zaW9uIGRyaURSSTJFeHRlbnNpb24gPSB7CiAgICAg LmJhc2UgPSB7IF9fRFJJX0RSSTIsIDQgfSwKIAogICAgIC5jcmVhdGVOZXdTY3JlZW4gICAgICAg ICAgICA9IGRyaTJDcmVhdGVOZXdTY3JlZW4sCi0gICAgLmNyZWF0ZU5ld0RyYXdhYmxlICAgICAg ICAgID0gZHJpMkNyZWF0ZU5ld0RyYXdhYmxlLAotICAgIC5jcmVhdGVOZXdDb250ZXh0ICAgICAg ICAgICA9IGRyaTJDcmVhdGVOZXdDb250ZXh0LAotICAgIC5nZXRBUElNYXNrICAgICAgICAgICAg ICAgICA9IGRyaTJHZXRBUElNYXNrLAotICAgIC5jcmVhdGVOZXdDb250ZXh0Rm9yQVBJICAgICA9 IGRyaTJDcmVhdGVOZXdDb250ZXh0Rm9yQVBJLAorICAgIC5jcmVhdGVOZXdEcmF3YWJsZSAgICAg ICAgICA9IGRyaUNyZWF0ZU5ld0RyYXdhYmxlLAorICAgIC5jcmVhdGVOZXdDb250ZXh0ICAgICAg ICAgICA9IGRyaUNyZWF0ZU5ld0NvbnRleHQsCisgICAgLmdldEFQSU1hc2sgICAgICAgICAgICAg ICAgID0gZHJpR2V0QVBJTWFzaywKKyAgICAuY3JlYXRlTmV3Q29udGV4dEZvckFQSSAgICAgPSBk cmlDcmVhdGVOZXdDb250ZXh0Rm9yQVBJLAogICAgIC5hbGxvY2F0ZUJ1ZmZlciAgICAgICAgICAg ICA9IGRyaTJBbGxvY2F0ZUJ1ZmZlciwKICAgICAucmVsZWFzZUJ1ZmZlciAgICAgICAgICAgICAg PSBkcmkyUmVsZWFzZUJ1ZmZlciwKLSAgICAuY3JlYXRlQ29udGV4dEF0dHJpYnMgICAgICAgPSBk cmkyQ3JlYXRlQ29udGV4dEF0dHJpYnMsCisgICAgLmNyZWF0ZUNvbnRleHRBdHRyaWJzICAgICAg ID0gZHJpQ3JlYXRlQ29udGV4dEF0dHJpYnMsCiAgICAgLmNyZWF0ZU5ld1NjcmVlbjIgICAgICAg ICAgID0gZHJpMkNyZWF0ZU5ld1NjcmVlbjIsCiB9OwogCiBjb25zdCBfX0RSSXN3cmFzdEV4dGVu c2lvbiBkcmlTV1Jhc3RFeHRlbnNpb24gPSB7CiAgICAgeyBfX0RSSV9TV1JBU1QsIDQgfSwKICAg ICBkcmlTV1Jhc3RDcmVhdGVOZXdTY3JlZW4sCi0gICAgZHJpMkNyZWF0ZU5ld0RyYXdhYmxlLAot ICAgIGRyaTJDcmVhdGVOZXdDb250ZXh0Rm9yQVBJLAotICAgIGRyaTJDcmVhdGVDb250ZXh0QXR0 cmlicywKKyAgICBkcmlDcmVhdGVOZXdEcmF3YWJsZSwKKyAgICBkcmlDcmVhdGVOZXdDb250ZXh0 Rm9yQVBJLAorICAgIGRyaUNyZWF0ZUNvbnRleHRBdHRyaWJzLAogICAgIGRyaVNXUmFzdENyZWF0 ZU5ld1NjcmVlbjIsCiB9OwogCi0tIAoxLjguNC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=