Module: Mesa Branch: 7.11 Commit: 0a77734c62f12195b3b2945df397a13586a0e235 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a77734c62f12195b3b2945df397a13586a0e235
Author: Yuanhan Liu <[email protected]> Date: Tue Sep 20 13:32:50 2011 +0800 mesa: fix error handling for glMaterial* Trigger GL_INVALID_ENUM error if the face paramter is not a valid value. Trigger GL_INVALID_VALUE error if the GL_SHININESS value is out side [0, ctx->Constant.MaxShiniess]. v2: fix the max shininess value. v3: suggested by Brian, move the face check into glMaterialfv function to reduce code duplicate. Also, refactor the error message. Signed-off-by: Yuanhan Liu <[email protected]> Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit a11b4c1e7aa0958e6128bbfae2173e289b2cce8f) --- src/mesa/vbo/vbo_attrib_tmp.h | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h index c793ce0..1e313fc 100644 --- a/src/mesa/vbo/vbo_attrib_tmp.h +++ b/src/mesa/vbo/vbo_attrib_tmp.h @@ -696,6 +696,12 @@ TAG(Materialfv)(GLenum face, GLenum pname, const GLfloat * params) { GET_CURRENT_CONTEXT(ctx); + + if (face != GL_FRONT && face != GL_BACK && face != GL_FRONT_AND_BACK) { + _mesa_error(ctx, GL_INVALID_ENUM, "glMaterial(invalid face)"); + return; + } + switch (pname) { case GL_EMISSION: MAT(VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params); @@ -710,7 +716,12 @@ TAG(Materialfv)(GLenum face, GLenum pname, MAT(VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params); break; case GL_SHININESS: - MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params); + if (*params < 0 || *params > ctx->Const.MaxShininess) + _mesa_error(ctx, GL_INVALID_VALUE, + "glMaterial(invalid shininess: %f out range [0, %f])", + *params, ctx->Const.MaxShininess); + else + MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params); break; case GL_COLOR_INDEXES: MAT(VBO_ATTRIB_MAT_FRONT_INDEXES, 3, face, params); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
