<div dir="ltr">On 30 July 2013 15:41, Kenneth Graunke <span dir="ltr"><<a href="mailto:kenneth@whitecape.org" target="_blank">kenneth@whitecape.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On 07/28/2013 11:03 PM, Paul Berry wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
From: Fabian Bieler <<a href="mailto:fabianbieler@fastmail.fm" target="_blank">fabianbieler@fastmail.fm</a>><br>
<br>
Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com" target="_blank">stereotype441@gmail.com</a>><br>
---<br>
src/mesa/main/api_validate.c | 68 ++++++++++++++++++++++++++++++<u></u>++++++++++++++<br>
1 file changed, 68 insertions(+)<br>
<br>
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c<br>
index 8a2ec7b..7d4a4c1 100644<br>
--- a/src/mesa/main/api_validate.c<br>
+++ b/src/mesa/main/api_validate.c<br>
@@ -245,6 +245,74 @@ _mesa_valid_prim_mode(struct gl_context *ctx, GLenum mode, const char *name)<br>
return GL_FALSE;<br>
}<br>
<br>
+ /* From the ARB_geometry_shader4 spec:<br>
+ *<br>
+ * The error INVALID_OPERATION is generated if Begin, or any command that<br>
+ * implicitly calls Begin, is called when a geometry shader is active and:<br>
+ *<br>
+ * * the input primitive type of the current geometry shader is<br>
+ * POINTS and <mode> is not POINTS,<br>
+ *<br>
+ * * the input primitive type of the current geometry shader is<br>
+ * LINES and <mode> is not LINES, LINE_STRIP, or LINE_LOOP,<br>
+ *<br>
+ * * the input primitive type of the current geometry shader is<br>
+ * TRIANGLES and <mode> is not TRIANGLES, TRIANGLE_STRIP or<br>
+ * TRIANGLE_FAN,<br>
+ *<br>
+ * * the input primitive type of the current geometry shader is<br>
+ * LINES_ADJACENCY_ARB and <mode> is not LINES_ADJACENCY_ARB or<br>
+ * LINE_STRIP_ADJACENCY_ARB, or<br>
+ *<br>
+ * * the input primitive type of the current geometry shader is<br>
+ * TRIANGLES_ADJACENCY_ARB and <mode> is not<br>
+ * TRIANGLES_ADJACENCY_ARB or TRIANGLE_STRIP_ADJACENCY_ARB.<br>
+ *<br>
+ */<br>
+ if(ctx->Shader.<u></u>CurrentGeometryProgram) {<br>
</blockquote>
<br></div></div>
Style nit: missing space. should be:<br>
<br>
if (ctx->Shader.<u></u>CurrentGeometryProgram) {</blockquote><div><br></div><div>Fixed.<br></div></div></div></div>