diff options
| author | Kenneth Graunke <[email protected]> | 2016-11-14 22:17:44 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2017-01-07 22:24:10 -0800 |
| commit | cc2df4bb81dfc8dc8f8a19d46b33d1ab519bb445 (patch) | |
| tree | 4fa45ad9bc1de7c27db5f310874f45e770214b23 /src/mesa/drivers/dri | |
| parent | a4fd84ef5f247f50a3683ecdf7f9d801a6e3cf15 (diff) | |
i965: Access TES shader info via NIR.
NIR exists in both GL and Vulkan, but gl_program is GL specific.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tes.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tes.c b/src/mesa/drivers/dri/i965/brw_tes.c index 2729d29239b..2d238f4f33b 100644 --- a/src/mesa/drivers/dri/i965/brw_tes.c +++ b/src/mesa/drivers/dri/i965/brw_tes.c @@ -99,9 +99,9 @@ brw_codegen_tes_prog(struct brw_context *brw, STATIC_ASSERT(BRW_TESS_PARTITIONING_EVEN_FRACTIONAL == TESS_SPACING_FRACTIONAL_EVEN - 1); - prog_data.partitioning = tep->program.info.tes.spacing - 1; + prog_data.partitioning = nir->info->tes.spacing - 1; - switch (tep->program.info.tes.primitive_mode) { + switch (nir->info->tes.primitive_mode) { case GL_QUADS: prog_data.domain = BRW_TESS_DOMAIN_QUAD; break; @@ -115,15 +115,15 @@ brw_codegen_tes_prog(struct brw_context *brw, unreachable("invalid domain shader primitive mode"); } - if (tep->program.info.tes.point_mode) { + if (nir->info->tes.point_mode) { prog_data.output_topology = BRW_TESS_OUTPUT_TOPOLOGY_POINT; - } else if (tep->program.info.tes.primitive_mode == GL_ISOLINES) { + } else if (nir->info->tes.primitive_mode == GL_ISOLINES) { prog_data.output_topology = BRW_TESS_OUTPUT_TOPOLOGY_LINE; } else { /* Hardware winding order is backwards from OpenGL */ prog_data.output_topology = - tep->program.info.tes.ccw ? BRW_TESS_OUTPUT_TOPOLOGY_TRI_CW - : BRW_TESS_OUTPUT_TOPOLOGY_TRI_CCW; + nir->info->tes.ccw ? BRW_TESS_OUTPUT_TOPOLOGY_TRI_CW + : BRW_TESS_OUTPUT_TOPOLOGY_TRI_CCW; } /* Allocate the references to the uniforms that will end up in the |