Module: Mesa
Branch: master
Commit: 04a9558497eabe6369b01ef45d1e25015e9286ba
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=04a9558497eabe6369b01ef45d1e25015e9286ba
Author: Timothy Arceri <tarc...@itsqueeze.com>
Date: Thu Nov 16 11:16:10 2017 +1100
st/glsl_to_nir: don't generate nir twice for gs
This was left out of c980a3aa3133
Reviewed-by: Marek Olšák <marek.ol...@amd.com>
---
src/mesa/state_tracker/st_program.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/mesa/state_tracker/st_program.c
b/src/mesa/state_tracker/st_program.c
index 97b2e1234b..5c0a58104f 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1431,15 +1431,9 @@ st_translate_geometry_program(struct st_context *st,
{
struct ureg_program *ureg;
- if (stgp->shader_program) {
- nir_shader *nir = st_glsl_to_nir(st, &stgp->Base, stgp->shader_program,
- MESA_SHADER_GEOMETRY);
-
- stgp->tgsi.type = PIPE_SHADER_IR_NIR;
- stgp->tgsi.ir.nir = nir;
-
+ /* We have already compiled to NIR so just return */
+ if (stgp->shader_program)
return true;
- }
ureg = ureg_create_with_screen(PIPE_SHADER_GEOMETRY, st->pipe->screen);
if (ureg == NULL)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
