mesa: make glGet*(GL_NONE) generate GL_INVALID_ENUM

In find_value() check if we've hit the 0th/invalid entry before checking
if the pname matches.

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=31987

NOTE: This is a candidate for the 7.9 branch.
This commit is contained in:
Brian Paul
2010-12-03 15:59:29 -07:00
parent 40ee69b4f3
commit 503983b09e
+5 -3
View File
@@ -1759,16 +1759,18 @@ find_value(const char *func, GLenum pname, void **p, union value *v)
hash = (pname * prime_factor);
while (1) {
d = &values[table[hash & mask]];
if (likely(d->pname == pname))
break;
/* If the enum isn't valid, the hash walk ends with index 0,
* which is the API mask entry at the beginning of values[]. */
if (d->type == TYPE_API_MASK) {
if (unlikely(d->type == TYPE_API_MASK)) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func,
_mesa_lookup_enum_by_nr(pname));
return &error_value;
}
if (likely(d->pname == pname))
break;
hash += prime_step;
}