From: Iago Toral Quiroga Date: Fri, 20 Jun 2014 08:01:40 +0000 (+0200) Subject: mesa: Make Geom.UsesEndPrimitive a bool instead of a GLboolean X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c822db6a05d6f9919e6f0acf6cf6242c173ce21a;p=mesa.git mesa: Make Geom.UsesEndPrimitive a bool instead of a GLboolean --- diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index fff0aabe63b..4762d9616b3 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2176,7 +2176,7 @@ struct gl_geometry_program GLenum InputType; /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB, GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */ GLenum OutputType; /**< GL_POINTS, GL_LINE_STRIP or GL_TRIANGLE_STRIP */ - GLboolean UsesEndPrimitive; + bool UsesEndPrimitive; }; @@ -2679,7 +2679,7 @@ struct gl_shader_program GLboolean UsesClipDistance; GLuint ClipDistanceArraySize; /**< Size of the gl_ClipDistance array, or 0 if not present. */ - GLboolean UsesEndPrimitive; + bool UsesEndPrimitive; } Geom; /** Vertex shader state */ diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 5712c18d860..c6e852c876c 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -248,7 +248,7 @@ _mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog prog->Geom.VerticesOut = 0; prog->Geom.InputType = GL_TRIANGLES; prog->Geom.OutputType = GL_TRIANGLE_STRIP; - prog->Geom.UsesEndPrimitive = GL_FALSE; + prog->Geom.UsesEndPrimitive = false; prog->TransformFeedback.BufferMode = GL_INTERLEAVED_ATTRIBS;