[Mesa-dev] Patch: more verbose error log while loading compressed Textures

[Carl-Philip Haensch]

Hi,

Unigine heaven fails to load compressed textures, but the only output was
"Mesa: User error: GL_INVALID_ENUM in glTexImage2D"

So I decided to change the error checking routine a bit to see where  
the actual
problems are.

This is the patch.
Commit message: "Print a reason why compressed_texture_error_check fails"

ZGlmZiAtLWdpdCBhL3NyYy9tZXNhL21haW4vdGV4aW1hZ2UuYyBiL3NyYy9tZXNhL21haW4vdGV4
aW1hZ2UuYwppbmRleCBjNWM0NTQzLi5jNWYyN2U1IDEwMDY0NAotLS0gYS9zcmMvbWVzYS9tYWlu
L3RleGltYWdlLmMKKysrIGIvc3JjL21lc2EvbWFpbi90ZXhpbWFnZS5jCkBAIC0zMDQwLDM2ICsz
MDQwLDQ4IEBAIGNvbXByZXNzZWRfdGV4dHVyZV9lcnJvcl9jaGVjayhzdHJ1Y3QgZ2xfY29udGV4
dCAqY3R4LCBHTGludCBkaW1lbnNpb25zLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IEdMZW51bSB0YXJnZXQsIEdMaW50IGxldmVsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIEdMZW51bSBpbnRlcm5hbEZvcm1hdCwgR0xzaXplaSB3aWR0aCwKICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICBHTHNpemVpIGhlaWdodCwgR0xzaXplaSBkZXB0aCwgR0xpbnQgYm9y
ZGVyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdMc2l6ZWkgaW1hZ2VTaXplKQor
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdMc2l6ZWkgaW1hZ2VTaXplLCBjaGFyKiog
cmVhc29uKQogewogICAgY29uc3QgR0xlbnVtIHByb3h5VGFyZ2V0ID0gZ2V0X3Byb3h5X3Rhcmdl
dCh0YXJnZXQpOwogICAgY29uc3QgR0xpbnQgbWF4TGV2ZWxzID0gX21lc2FfbWF4X3RleHR1cmVf
bGV2ZWxzKGN0eCwgdGFyZ2V0KTsKICAgIEdMaW50IGV4cGVjdGVkU2l6ZTsKKyAgICpyZWFzb24g
PSAidW5rbm93biI7CiAKICAgIC8qIGNoZWNrIGxldmVsICovCi0gICBpZiAobGV2ZWwgPCAwIHx8
IGxldmVsID49IG1heExldmVscykKKyAgIGlmIChsZXZlbCA8IDAgfHwgbGV2ZWwgPj0gbWF4TGV2
ZWxzKSB7CisJICAgKnJlYXNvbiA9ICJsZXZlbCI7CiAgICAgICByZXR1cm4gR0xfSU5WQUxJRF9W
QUxVRTsKKyAgIH0KIAogICAgaWYgKCF0YXJnZXRfY2FuX2JlX2NvbXByZXNzZWQoY3R4LCB0YXJn
ZXQsIGludGVybmFsRm9ybWF0KSkgeworCQkqcmVhc29uID0gInRhcmdldCI7CiAgICAgICByZXR1
cm4gR0xfSU5WQUxJRF9FTlVNOwogICAgfQogCiAgICAvKiBUaGlzIHdpbGwgZGV0ZWN0IGFueSBp
bnZhbGlkIGludGVybmFsRm9ybWF0IHZhbHVlICovCi0gICBpZiAoIV9tZXNhX2lzX2NvbXByZXNz
ZWRfZm9ybWF0KGN0eCwgaW50ZXJuYWxGb3JtYXQpKQorICAgaWYgKCFfbWVzYV9pc19jb21wcmVz
c2VkX2Zvcm1hdChjdHgsIGludGVybmFsRm9ybWF0KSkgeworCQkqcmVhc29uID0gImludGVybmFs
Rm9ybWF0IjsKICAgICAgIHJldHVybiBHTF9JTlZBTElEX0VOVU07CisJfQogCiAgICAvKiBUaGlz
IHNob3VsZCByZWFsbHkgbmV2ZXIgZmFpbCAqLwotICAgaWYgKF9tZXNhX2Jhc2VfdGV4X2Zvcm1h
dChjdHgsIGludGVybmFsRm9ybWF0KSA8IDApCisgICBpZiAoX21lc2FfYmFzZV90ZXhfZm9ybWF0
KGN0eCwgaW50ZXJuYWxGb3JtYXQpIDwgMCkgeworCQkqcmVhc29uID0gInRoaXMgc2hvdWxkIG5l
dmVyIGZhaWwiOwogICAgICAgcmV0dXJuIEdMX0lOVkFMSURfRU5VTTsKKwl9CiAKICAgIC8qIE5v
IGNvbXByZXNzZWQgZm9ybWF0cyBzdXBwb3J0IGJvcmRlcnMgYXQgdGhpcyB0aW1lICovCi0gICBp
ZiAoYm9yZGVyICE9IDApCisgICBpZiAoYm9yZGVyICE9IDApIHsKKwkJKnJlYXNvbiA9ICJib3Jk
ZXJzIG5vdCBhbG93ZWQgaW4gY29tcHJlc3NlZCBmb3JtYXRzIjsKICAgICAgIHJldHVybiBHTF9J
TlZBTElEX1ZBTFVFOworCX0KIAogICAgLyogRm9yIGN1YmUgbWFwLCB3aWR0aCBtdXN0IGVxdWFs
IGhlaWdodCAqLwogICAgaWYgKHRhcmdldCA+PSBHTF9URVhUVVJFX0NVQkVfTUFQX1BPU0lUSVZF
X1hfQVJCICYmCi0gICAgICAgdGFyZ2V0IDw9IEdMX1RFWFRVUkVfQ1VCRV9NQVBfTkVHQVRJVkVf
Wl9BUkIgJiYgd2lkdGggIT0gaGVpZ2h0KQorICAgICAgIHRhcmdldCA8PSBHTF9URVhUVVJFX0NV
QkVfTUFQX05FR0FUSVZFX1pfQVJCICYmIHdpZHRoICE9IGhlaWdodCkgeworICAgICAgKnJlYXNv
biA9ICJ3aWR0aCBtdXN0IGJlIGVxdWFsIGhlaWdodCI7CiAgICAgICByZXR1cm4gR0xfSU5WQUxJ
RF9WQUxVRTsKKwl9CiAKICAgIC8qIGNoZWNrIGltYWdlIHNpemUgYWdhaW5zdCBjb21wcmVzc2lv
biBibG9jayBzaXplICovCiAgICB7CkBAIC0zMDg2LDYgKzMwOTgsNyBAQCBjb21wcmVzc2VkX3Rl
eHR1cmVfZXJyb3JfY2hlY2soc3RydWN0IGdsX2NvbnRleHQgKmN0eCwgR0xpbnQgZGltZW5zaW9u
cywKICAgICAgICAgICAqIGdlbmVyYXRlZCBbLi4uXSBpZiBhbnkgcGFyYW1ldGVyIGNvbWJpbmF0
aW9ucyBhcmUgbm90CiAgICAgICAgICAgKiBzdXBwb3J0ZWQgYnkgdGhlIHNwZWNpZmljIGNvbXBy
ZXNzZWQgaW50ZXJuYWwgZm9ybWF0LiAKICAgICAgICAgICAqLworICAgICAgICAgKnJlYXNvbiA9
ICJwYXJhbWV0ZXIgY29tYmluYXRpb24gbm90IHN1cHBvcnRlZCI7CiAgICAgICAgICByZXR1cm4g
R0xfSU5WQUxJRF9PUEVSQVRJT047CiAgICAgICB9CiAgICB9CkBAIC0zMDk1LDYgKzMxMDgsNyBA
QCBjb21wcmVzc2VkX3RleHR1cmVfZXJyb3JfY2hlY2soc3RydWN0IGdsX2NvbnRleHQgKmN0eCwg
R0xpbnQgZGltZW5zaW9ucywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
aW50ZXJuYWxGb3JtYXQsIEdMX05PTkUsIEdMX05PTkUsCiAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIHdpZHRoLCBoZWlnaHQsIGRlcHRoLCBib3JkZXIpKSB7CiAgICAgICAv
KiBTZWUgZXJyb3IgY29tbWVudCBhYm92ZSAqLworICAgICAgKnJlYXNvbiA9ICJjaGVja2luZyBp
bWFnZSBzaXplIGZhaWxlZCI7CiAgICAgICByZXR1cm4gR0xfSU5WQUxJRF9PUEVSQVRJT047CiAg
ICB9CiAKQEAgLTMxMDUsNiArMzExOSw4IEBAIGNvbXByZXNzZWRfdGV4dHVyZV9lcnJvcl9jaGVj
ayhzdHJ1Y3QgZ2xfY29udGV4dCAqY3R4LCBHTGludCBkaW1lbnNpb25zLAogICAgICAgICogaWYg
PGltYWdlU2l6ZT4gaXMgbm90IGNvbnNpc3RlbnQgd2l0aCB0aGUgZm9ybWF0LCBkaW1lbnNpb25z
LCBhbmQKICAgICAgICAqIGNvbnRlbnRzIG9mIHRoZSBzcGVjaWZpZWQgaW1hZ2UuCiAgICAgICAg
Ki8KKyAgICAgICpyZWFzb24gPSAiaW1hZ2VTaXplIGlzIG5vdCBjb25zaXN0ZW50IHdpdGggdGhl
IGZvcm1hdCwiXAorICAgICAgICAgICAgICJkaW1lbnNpb25zIGFuZCBjb250ZW50cyBvZiB0aGUg
c3BlY2lmaWVkIGltYWdlIjsKICAgICAgIHJldHVybiBHTF9JTlZBTElEX1ZBTFVFOwogICAgfQog
CkBAIC0zMjc3LDE0ICszMjkzLDE1IEBAIGNvbXByZXNzZWR0ZXhpbWFnZShzdHJ1Y3QgZ2xfY29u
dGV4dCAqY3R4LCBHTHVpbnQgZGltcywKICAgICAgIHJldHVybjsKICAgIH0KIAorICAgY2hhciAq
cmVhc29uOwogICAgZXJyb3IgPSBjb21wcmVzc2VkX3RleHR1cmVfZXJyb3JfY2hlY2soY3R4LCBk
aW1zLCB0YXJnZXQsIGxldmVsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgaW50ZXJuYWxGb3JtYXQsIHdpZHRoLCBoZWlnaHQsIGRlcHRoLAotICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9yZGVyLCBpbWFnZVNpemUpOworICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9yZGVyLCBpbWFnZVNpemUsICZy
ZWFzb24pOwogCiAjaWYgRkVBVFVSRV9FUwogICAgLyogWFhYIHRoaXMgaXMga2luZCBvZiBhIGhh
Y2sgKi8KICAgIGlmIChlcnJvcikgewotICAgICAgX21lc2FfZXJyb3IoY3R4LCBlcnJvciwgImds
VGV4SW1hZ2UyRCIpOworICAgICAgX21lc2FfZXJyb3IoY3R4LCBlcnJvciwgImdsVGV4SW1hZ2Uy
RCglcykiLCByZWFzb24pOwogICAgICAgcmV0dXJuOwogICAgfQogCg==