Mesa (master): i965/vs: Drop hack that created NIR for fixed function vertex programs.
Kenneth Graunke
kwg at kemper.freedesktop.org
Sun Oct 18 00:27:47 UTC 2015
Module: Mesa
Branch: master
Commit: ca2b807ca32dcf531fbf96d9fa0026679abbf111
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca2b807ca32dcf531fbf96d9fa0026679abbf111
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Oct 15 15:34:06 2015 -0700
i965/vs: Drop hack that created NIR for fixed function vertex programs.
Marek made core Mesa call ProgramStringNotify(), which solves this
properly. The hack is no longer needed.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/mesa/drivers/dri/i965/brw_vs.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index de9a867..7253117 100644
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -57,18 +57,6 @@ brw_codegen_vs_prog(struct brw_context *brw,
bool start_busy = false;
double start_time = 0;
- if (!vp->program.Base.nir) {
- /* Normally we generate NIR in LinkShader() or
- * ProgramStringNotify(), but Mesa's fixed-function vertex program
- * handling doesn't notify the driver at all. Just do it here, at
- * the last minute, even though it's lame.
- */
- assert(vp->program.Base.Id == 0 && prog == NULL);
- vp->program.Base.nir =
- brw_create_nir(brw, NULL, &vp->program.Base, MESA_SHADER_VERTEX,
- brw->intelScreen->compiler->scalar_vs);
- }
-
if (prog)
vs = (struct brw_shader *) prog->_LinkedShaders[MESA_SHADER_VERTEX];
More information about the mesa-commit
mailing list