summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-10-19 11:53:33 +1100
committerTimothy Arceri <[email protected]>2016-10-26 14:29:36 +1100
commit9045ddcfe4ed2ecc6220db69dc33d6049956b99b (patch)
tree9996fba8e597b70dc95fee360d4fe74911d16b15 /src/mesa
parent8d7b25ee5825ab9a528cb475b1cc0a0bd9d00227 (diff)
mesa: set gs shader_info metadata directly
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/shaderapi.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index abfeeffbb7d..b681534ddbf 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2184,17 +2184,15 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src,
break;
}
case MESA_SHADER_GEOMETRY: {
- struct gl_geometry_program *dst_gp = (struct gl_geometry_program *) dst;
-
- dst_gp->VerticesIn = src->Geom.VerticesIn;
- dst_gp->VerticesOut = dst_sh->info.Geom.VerticesOut;
- dst_gp->Invocations = dst_sh->info.Geom.Invocations;
- dst_gp->InputType = dst_sh->info.Geom.InputType;
- dst_gp->OutputType = dst_sh->info.Geom.OutputType;
+ dst->info.gs.vertices_in = src->Geom.VerticesIn;
+ dst->info.gs.vertices_out = dst_sh->info.Geom.VerticesOut;
+ dst->info.gs.invocations = dst_sh->info.Geom.Invocations;
+ dst->info.gs.input_primitive = dst_sh->info.Geom.InputType;
+ dst->info.gs.output_primitive = dst_sh->info.Geom.OutputType;
dst->ClipDistanceArraySize = src->Geom.ClipDistanceArraySize;
dst->CullDistanceArraySize = src->Geom.CullDistanceArraySize;
- dst_gp->UsesEndPrimitive = src->Geom.UsesEndPrimitive;
- dst_gp->UsesStreams = src->Geom.UsesStreams;
+ dst->info.gs.uses_end_primitive = src->Geom.UsesEndPrimitive;
+ dst->info.gs.uses_streams = src->Geom.UsesStreams;
break;
}
case MESA_SHADER_FRAGMENT: {