On Mon, Feb 17, 2020 at 6:41 PM Mark Menzynski <mmenz...@redhat.com> wrote: > > Nv50_ir_prog_info (input) was in the wrong place, moved it to > nv50_ir_prog_info_out. > > Signed-off-by: Mark Menzynski <mmenz...@redhat.com> > --- > src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h | 2 +- > src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp | 2 +- > src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h > b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h > index cdf19eeabcf..30498ceffaf 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h > @@ -112,7 +112,6 @@ struct nv50_ir_prog_info > uint8_t inputPrim; > } gp; > struct { > - bool separateFragData; > bool persampleInvocation; > } fp; > struct { > @@ -200,6 +199,7 @@ struct nv50_ir_prog_info_out > bool usesSampleMaskIn; > bool readsFramebuffer; > bool readsSampleLocations; > + bool separateFragData; > } fp; > } prop; > > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp > b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp > index 3efeaab4569..cf5f3d6d7e7 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp > @@ -2100,7 +2100,7 @@ Converter::visit(nir_intrinsic_instr *insn) > atom->setIndirect(0, 0, address); > atom->subOp = getSubOp(op); > > - info->io.globalAccess |= 0x2; > + info_out->io.globalAccess |= 0x2; > break; > } > case nir_intrinsic_bindless_image_atomic_add: > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > index 5850dc18fec..c2322f3856a 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > @@ -1176,7 +1176,7 @@ void Source::scanProperty(const struct > tgsi_full_property *prop) > info_out->prop.gp.instanceCount = prop->u[0].Data; > break; > case TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS: > - info->prop.fp.separateFragData = true; > + info_out->prop.fp.separateFragData = true; > break; > case TGSI_PROPERTY_FS_COORD_ORIGIN: > case TGSI_PROPERTY_FS_COORD_PIXEL_CENTER: > -- > 2.21.1 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
mind merging those changes into the 1st patch? Just add a "v2 (mark): ..." note or something. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev