On 15/09/14 15:48, Steven Newbury wrote: > On Fri, 2014-09-12 at 18:20 -0400, Nick Sarnie wrote: >> Trivial patch to create the pipe loader for ilo. All the code was >> already there. >> >> Signed-off-by: Nick Sarnie <[email protected]> >> --- >> src/gallium/targets/pipe-loader/Makefile.am | 14 ++++++++++++++ >> src/gallium/targets/pipe-loader/pipe_i965.c | 26 >> ++++++++++++++++++++++++++ >> 2 files changed, 40 insertions(+) >> create mode 100644 src/gallium/targets/pipe-loader/pipe_i965.c >> >> diff --git a/src/gallium/targets/pipe-loader/Makefile.am >> b/src/gallium/targets/pipe-loader/Makefile.am >> index ee93078..e94cf4d 100644 >> --- a/src/gallium/targets/pipe-loader/Makefile.am >> +++ b/src/gallium/targets/pipe-loader/Makefile.am >> @@ -75,6 +75,20 @@ pipe_i915_la_LIBADD = \ >> >> endif >> >> +if HAVE_GALLIUM_ILO >> +pipe_LTLIBRARIES += pipe_i965.la >> + >> +pipe_i965_la_SOURCES = pipe_i965.c >> +nodist_EXTRA_pipe_i965_la_SOURCES = dummy.cpp >> +pipe_i965_la_LIBADD = \ >> + $(PIPE_LIBS) \ >> + >> $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ >> + $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ >> + $(LIBDRM_LIBS) \ >> + $(INTEL_LIBS) >> + >> +endif >> + >> if HAVE_GALLIUM_NOUVEAU >> pipe_LTLIBRARIES += pipe_nouveau.la >> >> diff --git a/src/gallium/targets/pipe-loader/pipe_i965.c >> b/src/gallium/targets/pipe-loader/pipe_i965.c >> new file mode 100644 >> index 0000000..f4d447c >> --- /dev/null >> +++ b/src/gallium/targets/pipe-loader/pipe_i965.c >> @@ -0,0 +1,26 @@ >> +#include "target-helpers/inline_debug_helper.h" >> +#include "state_tracker/drm_driver.h" >> +#include "intel/drm/intel_drm_public.h" >> +#include "ilo/ilo_public.h" >> + >> +static struct pipe_screen * >> +create_screen(int fd) >> +{ >> + struct intel_winsys *iws; >> + struct pipe_screen *screen; >> + >> + iws = intel_winsys_create_for_fd(fd); >> + if (!iws) >> + return NULL; >> + >> + screen = ilo_screen_create(iws); >> + if (!screen) >> + return NULL; >> + >> + screen = debug_screen_wrap(screen); >> + >> + return screen; >> +} >> + >> +PUBLIC >> +DRM_DRIVER_DESCRIPTOR("i965", "i915", create_screen, NULL) >> > Thanks for the CC. You obviously saw my earlier patch, I'd forgotten > all about it to be honest! The difference between my patch and yours > is I changed the pipe driver to be called ilo to match the DRI driver. > > Does anybody else have an opinion on what the driver should be called? > I believe your patch did add a bit more to it - it was trying to teach core mesa about the i965 <> ilo relationship, which (looking at it in retrospect) does not seem like a good idea.
The pipe-driver name is currently left as "provided" by the loader, as changing it to ilo will not work :( I may add a shim in the pipe-loader ,and rename it to ilo, as I get around to reworking it. Is there any comments and/or objections against this patch ? Wondering if we can this in sometime in the next few weeks. Cheers, Emil > > > _______________________________________________ > mesa-dev mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/mesa-dev > _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
