OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Make Geom.UsesEndPrimitive a bool instead of a GLboolean

Browse Source
This commit is contained in:
Iago Toral Quiroga
2014-06-20 10:01:40 +02:00
parent df71b39f5c
commit c822db6a05
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/mtypes.h
View File

@@ -2176,7 +2176,7 @@ struct gl_geometry_program
GLenum InputType; /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB, GLenum InputType; /**< GL_POINTS, GL_LINES, GL_LINES_ADJACENCY_ARB,
GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */ GL_TRIANGLES, or GL_TRIANGLES_ADJACENCY_ARB */
GLenum OutputType; /**< GL_POINTS, GL_LINE_STRIP or GL_TRIANGLE_STRIP */ 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; GLboolean UsesClipDistance;
GLuint ClipDistanceArraySize; /**< Size of the gl_ClipDistance array, or GLuint ClipDistanceArraySize; /**< Size of the gl_ClipDistance array, or
0 if not present. */ 0 if not present. */
GLboolean UsesEndPrimitive; bool UsesEndPrimitive;
} Geom; } Geom;
/** Vertex shader state */ /** Vertex shader state */

2
src/mesa/main/shaderobj.c
View File

@@ -248,7 +248,7 @@ _mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog
prog->Geom.VerticesOut = 0; prog->Geom.VerticesOut = 0;
prog->Geom.InputType = GL_TRIANGLES; prog->Geom.InputType = GL_TRIANGLES;
prog->Geom.OutputType = GL_TRIANGLE_STRIP; prog->Geom.OutputType = GL_TRIANGLE_STRIP;
prog->Geom.UsesEndPrimitive = GL_FALSE; prog->Geom.UsesEndPrimitive = false;
prog->TransformFeedback.BufferMode = GL_INTERLEAVED_ATTRIBS; prog->TransformFeedback.BufferMode = GL_INTERLEAVED_ATTRIBS;