On Sat, May 13, 2017 at 9:37 AM, Jason Ekstrand <ja...@jlekstrand.net> wrote:
> If everything truely is the same here, I see no reason why we should add a > gen10 version. I know this appears to contradict what I said before but > the difference is that this file is handwritten and not just a recompile of > an already multi-gen file. We don't, for instance have separate gen7 and > gen75 isl files. > > OK. I'll drop this patch and just use the gen9 version. > > > On May 12, 2017 4:40:42 PM Anuj Phogat <anuj.pho...@gmail.com> wrote: > > Signed-off-by: Anuj Phogat <anuj.pho...@gmail.com> >> --- >> src/intel/isl/isl_gen10.c | 41 +++++++++++++++++++++++++++++++++++++++++ >> src/intel/isl/isl_gen10.h | 45 ++++++++++++++++++++++++++++++ >> +++++++++++++++ >> 2 files changed, 86 insertions(+) >> create mode 100644 src/intel/isl/isl_gen10.c >> create mode 100644 src/intel/isl/isl_gen10.h >> >> diff --git a/src/intel/isl/isl_gen10.c b/src/intel/isl/isl_gen10.c >> new file mode 100644 >> index 0000000..3652d58 >> --- /dev/null >> +++ b/src/intel/isl/isl_gen10.c >> @@ -0,0 +1,41 @@ >> +/* >> + * Copyright 2017 Intel Corporation >> + * >> + * Permission is hereby granted, free of charge, to any person >> obtaining a >> + * copy of this software and associated documentation files (the >> "Software"), >> + * to deal in the Software without restriction, including without >> limitation >> + * the rights to use, copy, modify, merge, publish, distribute, >> sublicense, >> + * and/or sell copies of the Software, and to permit persons to whom the >> + * Software is furnished to do so, subject to the following conditions: >> + * >> + * The above copyright notice and this permission notice (including the >> next >> + * paragraph) shall be included in all copies or substantial portions >> of the >> + * Software. >> + * >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >> EXPRESS OR >> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >> MERCHANTABILITY, >> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT >> SHALL >> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR >> OTHER >> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, >> ARISING >> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER >> DEALINGS >> + * IN THE SOFTWARE. >> + */ >> + >> +#include "isl_gen9.h" >> +#include "isl_gen10.h" >> +#include "isl_priv.h" >> + >> +void >> +isl_gen10_choose_image_alignment_el(const struct isl_device *dev, >> + const struct isl_surf_init_info >> *restrict info, >> + enum isl_tiling tiling, >> + enum isl_dim_layout dim_layout, >> + enum isl_msaa_layout msaa_layout, >> + struct isl_extent3d *image_align_el) >> +{ >> + /* No changes in image alignment fields from gen9 to gen10. So, just >> use >> + * the gen9 function. >> + */ >> + isl_gen9_choose_image_alignment_el(dev, info, tiling, dim_layout, >> + msaa_layout, image_align_el); >> +} >> diff --git a/src/intel/isl/isl_gen10.h b/src/intel/isl/isl_gen10.h >> new file mode 100644 >> index 0000000..35c12cf >> --- /dev/null >> +++ b/src/intel/isl/isl_gen10.h >> @@ -0,0 +1,45 @@ >> +/* >> + * Copyright 2017 Intel Corporation >> + * >> + * Permission is hereby granted, free of charge, to any person >> obtaining a >> + * copy of this software and associated documentation files (the >> "Software"), >> + * to deal in the Software without restriction, including without >> limitation >> + * the rights to use, copy, modify, merge, publish, distribute, >> sublicense, >> + * and/or sell copies of the Software, and to permit persons to whom the >> + * Software is furnished to do so, subject to the following conditions: >> + * >> + * The above copyright notice and this permission notice (including the >> next >> + * paragraph) shall be included in all copies or substantial portions >> of the >> + * Software. >> + * >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >> EXPRESS OR >> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >> MERCHANTABILITY, >> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT >> SHALL >> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR >> OTHER >> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, >> ARISING >> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER >> DEALINGS >> + * IN THE SOFTWARE. >> + */ >> + >> +#ifndef ISL_GEN10_H >> +#define ISL_GEN10_H >> + >> +#include "isl.h" >> + >> +#ifdef __cplusplus >> +extern "C" { >> +#endif >> + >> +void >> +isl_gen10_choose_image_alignment_el(const struct isl_device *dev, >> + const struct isl_surf_init_info >> *restrict info, >> + enum isl_tiling tiling, >> + enum isl_dim_layout dim_layout, >> + enum isl_msaa_layout msaa_layout, >> + struct isl_extent3d *image_align_el); >> + >> +#ifdef __cplusplus >> +} >> +#endif >> + >> +#endif /* ISL_GEN10_H */ >> -- >> 2.9.3 >> >> _______________________________________________ >> mesa-dev mailing list >> mesa-dev@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/mesa-dev >> > > >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev