KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Validate the drawing primitive against the geometry shader input primitive type. 

Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Fabian Bieler 2013-05-25 12:39:46 +02:00 committed by Paul Berry
parent 39ca58192b
commit 8cdbe8394e
1 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/mesa/main/api_validate.c
View File

@ -245,6 +245,74 @@ _mesa_valid_prim_mode(struct gl_context *ctx, GLenum mode, const char *name)
return GL_FALSE;
}
/* From the ARB_geometry_shader4 spec:
*
* The error INVALID_OPERATION is generated if Begin, or any command that
* implicitly calls Begin, is called when a geometry shader is active and:
*
* * the input primitive type of the current geometry shader is
* POINTS and <mode> is not POINTS,
*
* * the input primitive type of the current geometry shader is
* LINES and <mode> is not LINES, LINE_STRIP, or LINE_LOOP,
*
* * the input primitive type of the current geometry shader is
* TRIANGLES and <mode> is not TRIANGLES, TRIANGLE_STRIP or
* TRIANGLE_FAN,
*
* * the input primitive type of the current geometry shader is
* LINES_ADJACENCY_ARB and <mode> is not LINES_ADJACENCY_ARB or
* LINE_STRIP_ADJACENCY_ARB, or
*
* * the input primitive type of the current geometry shader is
* TRIANGLES_ADJACENCY_ARB and <mode> is not
* TRIANGLES_ADJACENCY_ARB or TRIANGLE_STRIP_ADJACENCY_ARB.
*
*/
if (ctx->Shader.CurrentGeometryProgram) {
const GLenum geom_mode =
ctx->Shader.CurrentGeometryProgram->Geom.InputType;
switch (mode) {
case GL_POINTS:
valid_enum = (geom_mode == GL_POINTS);
break;
case GL_LINES:
case GL_LINE_LOOP:
case GL_LINE_STRIP:
valid_enum = (geom_mode == GL_LINES);
break;
case GL_TRIANGLES:
case GL_TRIANGLE_STRIP:
case GL_TRIANGLE_FAN:
valid_enum = (geom_mode == GL_TRIANGLES);
break;
case GL_QUADS:
case GL_QUAD_STRIP:
case GL_POLYGON:
valid_enum = false;
break;
case GL_LINES_ADJACENCY:
case GL_LINE_STRIP_ADJACENCY:
valid_enum = (geom_mode == GL_LINES_ADJACENCY);
break;
case GL_TRIANGLES_ADJACENCY:
case GL_TRIANGLE_STRIP_ADJACENCY:
valid_enum = (geom_mode == GL_TRIANGLES_ADJACENCY);
break;
default:
valid_enum = false;
break;
}
if (!valid_enum) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(mode=%s vs geometry shader input %s)",
name,
_mesa_lookup_prim_by_nr(mode),
_mesa_lookup_prim_by_nr(geom_mode));
return GL_FALSE;
}
}
/* From the GL_EXT_transform_feedback spec:
*
* "The error INVALID_OPERATION is generated if Begin, or any command