radeon/winsys: keep screen pointer in winsys v2

Only create one screen for each winsys instance.
This helps with buffer sharing and interop handling.

v2: rebased and some minor cleanup

Signed-off-by: Christian König <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/gallium/targets/r300/drm_target.c b/src/gallium/targets/r300/drm_target.c
index 111abd41856..2c10bbd7bb1 100644
--- a/src/gallium/targets/r300/drm_target.c
+++ b/src/gallium/targets/r300/drm_target.c
@@ -28,25 +28,27 @@
 #include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "radeon/drm/radeon_drm_public.h"
+#include "radeon/drm/radeon_winsys.h"
 #include "r300/r300_public.h"
 
 static struct pipe_screen *
 create_screen(int fd)
 {
    struct radeon_winsys *sws;
-   struct pipe_screen *screen;
 
    sws = radeon_drm_winsys_create(fd);
    if (!sws)
       return NULL;
 
-   screen = r300_screen_create(sws);
-   if (!screen)
-      return NULL;
+   if (!sws->screen) {
+      sws->screen = r300_screen_create(sws);
+      if (!sws->screen)
+         return NULL;
 
-   screen = debug_screen_wrap(screen);
+      sws->screen = debug_screen_wrap(sws->screen);
+   }
 
-   return screen;
+   return sws->screen;
 }
 
 DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL)