From ab99196b6bc5b0170db20db6cc3837ce7642d22a Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 22 Jun 2016 12:41:28 +1000 Subject: 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 --- src/mesa/main/shaderobj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/main/shaderobj.c') diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 8283555..f3d5c2e 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -92,6 +92,9 @@ void _mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader) { shader->RefCount = 1; + shader->Geom.VerticesOut = -1; + shader->Geom.InputType = GL_TRIANGLES; + shader->Geom.OutputType = GL_TRIANGLE_STRIP; } /** @@ -230,9 +233,6 @@ init_shader_program(struct gl_shader_program *prog) prog->FragDataBindings = string_to_uint_map_ctor(); prog->FragDataIndexBindings = string_to_uint_map_ctor(); - prog->Geom.VerticesOut = -1; - prog->Geom.InputType = GL_TRIANGLES; - prog->Geom.OutputType = GL_TRIANGLE_STRIP; prog->Geom.UsesEndPrimitive = false; prog->Geom.UsesStreams = false; -- cgit v1.1