diff options
| author | Timothy Arceri <[email protected]> | 2016-11-22 13:10:18 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-19 17:05:26 +1100 |
| commit | 5c93d274231ad36934c5338747ce14b95231031d (patch) | |
| tree | cac5930dbde74297ae41d9769d1ec103f8daf2ee /src/mesa | |
| parent | 4cd709e2bcea479a723b4741de59b448b1c6c48f (diff) | |
mesa/glsl/i965: set and use tcs vertices_out directly
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tcs.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tcs.c b/src/mesa/drivers/dri/i965/brw_tcs.c index bbba7496fa6..cafa4b4b411 100644 --- a/src/mesa/drivers/dri/i965/brw_tcs.c +++ b/src/mesa/drivers/dri/i965/brw_tcs.c @@ -380,10 +380,8 @@ brw_tcs_precompile(struct gl_context *ctx, brw_setup_tex_for_precompile(brw, &key.tex, prog); /* Guess that the input and output patches have the same dimensionality. */ - if (brw->gen < 8) { - key.input_vertices = shader_prog-> - _LinkedShaders[MESA_SHADER_TESS_CTRL]->info.TessCtrl.VerticesOut; - } + if (brw->gen < 8) + key.input_vertices = prog->info.tess.tcs_vertices_out; struct brw_program *btep; if (tes) { diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 00577dc3595..3502cb2ee60 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -823,7 +823,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, break; if (check_tcs_query(ctx, shProg)) { *params = shProg->_LinkedShaders[MESA_SHADER_TESS_CTRL]-> - info.TessCtrl.VerticesOut; + Program->info.tess.tcs_vertices_out; } return; case GL_TESS_GEN_MODE: @@ -2209,10 +2209,6 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src, dst->ClipDistanceArraySize = src->Vert.ClipDistanceArraySize; dst->CullDistanceArraySize = src->Vert.CullDistanceArraySize; break; - case MESA_SHADER_TESS_CTRL: { - dst->info.tess.tcs_vertices_out = dst_sh->info.TessCtrl.VerticesOut; - break; - } case MESA_SHADER_TESS_EVAL: { dst->info.tess.primitive_mode = dst_sh->info.TessEval.PrimitiveMode; dst->info.tess.spacing = dst_sh->info.TessEval.Spacing; |