diff options
author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-06-22 12:41:28 +1000 |
---|---|---|
committer | Timothy Arceri <t_arceri@yahoo.com.au> | 2016-06-23 11:01:46 +1000 |
commit | ab99196b6bc5b0170db20db6cc3837ce7642d22a (patch) | |
tree | 0e37f19fba45438d45cad609ab4b940b0ab6b997 /src/mesa/main/mtypes.h | |
parent | 24b3be093870a9a77325ac33c8fce97fae143e8e (diff) | |
download | external_mesa3d-ab99196b6bc5b0170db20db6cc3837ce7642d22a.zip external_mesa3d-ab99196b6bc5b0170db20db6cc3837ce7642d22a.tar.gz external_mesa3d-ab99196b6bc5b0170db20db6cc3837ce7642d22a.tar.bz2 |
glsl/mesa: stop duplicating geom and tcs layout values
We already store these in gl_shader and gl_program here we
remove it from gl_shader_program and just use the values
from gl_shader.
This will allow us to keep the shader cache restore code as
simple as it can be while making it somewhat clearer where these
values originate from.
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r-- | src/mesa/main/mtypes.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 99fa779..73ae55d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2712,17 +2712,6 @@ struct gl_shader_program enum gl_frag_depth_layout FragDepthLayout; /** - * Tessellation Control shader state from layout qualifiers. - */ - struct { - /** - * 0 - vertices not declared in shader, or - * 1 .. GL_MAX_PATCH_VERTICES - */ - GLint VerticesOut; - } TessCtrl; - - /** * Tessellation Evaluation shader state from layout qualifiers. */ struct { @@ -2742,14 +2731,7 @@ struct gl_shader_program */ struct { GLint VerticesIn; - GLint VerticesOut; - /** - * 1 .. MAX_GEOMETRY_SHADER_INVOCATIONS - */ - GLint Invocations; - 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 */ + /** * True if gl_ClipDistance is written to. Copied into * gl_geometry_program by _mesa_copy_linked_program_data(). |