diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-10-23 06:36:00 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-10-23 06:36:00 +0000 |
commit | b65fcab046d3a1b6b6ac315720df220925c5322e (patch) | |
tree | ff73dcc383ac0799c655ff6194cda9dacb75dde9 /lib/mesa/src/gallium/drivers/r600/r600_public.h | |
parent | 18d6381c51e253e4c41c62619f80d9ce745b95c8 (diff) |
Merge Mesa 17.3.9
Mesa 18.x needs an ld with build-id for at least the intel code
Mesa 18.2 assumes linux only memfd syscalls in intel code
Tested by matthieu@, kettenis@ and myself on a variety of hardware and
architectures. ok kettenis@
Diffstat (limited to 'lib/mesa/src/gallium/drivers/r600/r600_public.h')
-rw-r--r-- | lib/mesa/src/gallium/drivers/r600/r600_public.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mesa/src/gallium/drivers/r600/r600_public.h b/lib/mesa/src/gallium/drivers/r600/r600_public.h index e4fe23a87..937b8f7cc 100644 --- a/lib/mesa/src/gallium/drivers/r600/r600_public.h +++ b/lib/mesa/src/gallium/drivers/r600/r600_public.h @@ -24,7 +24,9 @@ #define R600_PUBLIC_H struct radeon_winsys; +struct pipe_screen_config; -struct pipe_screen *r600_screen_create(struct radeon_winsys *ws); +struct pipe_screen *r600_screen_create(struct radeon_winsys *ws, + const struct pipe_screen_config *config); #endif |