Mesa (master): i965: Access TES shader info via NIR.
Kenneth Graunke
kwg at kemper.freedesktop.org
Sun Jan 8 20:07:15 UTC 2017
Module: Mesa
Branch: master
Commit: cc2df4bb81dfc8dc8f8a19d46b33d1ab519bb445
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc2df4bb81dfc8dc8f8a19d46b33d1ab519bb445
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Nov 14 22:17:44 2016 -0800
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 <kenneth at whitecape.org>
Reviewed-by: Timothy Arceri <timothy.arceri at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/mesa/drivers/dri/i965/brw_tes.c | 12 ++++++------
1 file 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 2729d29..2d238f4 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
More information about the mesa-commit
mailing list