[Mesa-dev] [PATCH] i965/vs: Drop hack that created NIR for fixed function vertex programs.

Kenneth Graunke kenneth at whitecape.org
Thu Oct 15 15:34:06 PDT 2015


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>
---
 src/mesa/drivers/dri/i965/brw_vs.c | 12 ------------
 1 file changed, 12 deletions(-)

Thanks, Marek!

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];
 
-- 
2.6.1



More information about the mesa-dev mailing list