Mesa (master): glsl_to_tgsi: use _mesa_copy_linked_program_data
Marek Olšák
mareko at kemper.freedesktop.org
Tue Oct 21 20:41:12 UTC 2014
Module: Mesa
Branch: master
Commit: 013850a1b7d6605e32883f2e93fa3d51cd3eb218
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=013850a1b7d6605e32883f2e93fa3d51cd3eb218
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Oct 6 21:12:14 2014 +0200
glsl_to_tgsi: use _mesa_copy_linked_program_data
This deduplicates some code.
---
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 21f4cb8..a6ce033 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -5214,6 +5214,7 @@ get_mesa_program(struct gl_context *ctx,
v->have_sqrt = pscreen->get_shader_param(pscreen, ptarget,
PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED);
+ _mesa_copy_linked_program_data(shader->Stage, shader_program, prog);
_mesa_generate_parameters_list_for_uniforms(shader_program, shader,
prog->Parameters);
@@ -5319,10 +5320,6 @@ get_mesa_program(struct gl_context *ctx,
case GL_GEOMETRY_SHADER:
stgp = (struct st_geometry_program *)prog;
stgp->glsl_to_tgsi = v;
- stgp->Base.InputType = shader_program->Geom.InputType;
- stgp->Base.OutputType = shader_program->Geom.OutputType;
- stgp->Base.VerticesOut = shader_program->Geom.VerticesOut;
- stgp->Base.Invocations = shader_program->Geom.Invocations;
break;
default:
assert(!"should not be reached");
More information about the mesa-commit
mailing list