DRM/Gallium3D: fix api changes in Gallium3D

1 files changed, 4 insertions, 7 deletions

diff --git a/src/drm/cairo-drm-gallium-surface.c b/src/drm/cairo-drm-gallium-surface.c
index 3b25b585..9e36e14b 100644
--- a/src/drm/cairo-drm-gallium-surface.c
+++ b/src/drm/cairo-drm-gallium-surface.c
@@ -41,7 +41,7 @@
 
 #include <drivers/softpipe/sp_public.h>
 #include <winsys/sw/null/null_sw_winsys.h>
-#include <state_tracker/drm_api.h>
+#include <state_tracker/drm_driver.h>
 
 #include <pipe/p_format.h>
 #include <pipe/p_screen.h>
@@ -81,7 +81,7 @@ struct _gallium_device {
     cairo_drm_device_t drm;
 
     void *dlhandle;
-    struct drm_api *api;
+    struct drm_driver_descriptor *api;
 
     struct pipe_screen *screen;
     struct pipe_context *pipe;
@@ -1757,7 +1757,6 @@ gallium_device_destroy (void *abstract_device)
     shader_destroy (device->shader);
     device->pipe->destroy (device->pipe);
     device->screen->destroy (device->screen);
-    device->api->destroy (device->api);
 
     dlclose (device->dlhandle);
     free (device);
@@ -1819,13 +1818,13 @@ _cairo_drm_gallium_device_create (int fd, dev_t dev, int vendor_id, int chip_id)
 	    goto CLEANUP;
 	}
 
-	device->screen = device->api->create_screen (device->api, fd);
+	device->screen = device->api->create_screen (fd);
     } else{
 	device->screen = softpipe_create_screen(null_sw_create());
     }
     if (device->screen == NULL) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	goto CLEANUP_API;
+	goto CLEANUP;
     }
 
     device->max_size = 1 << device->screen->get_param (device->screen,
@@ -1844,8 +1843,6 @@ _cairo_drm_gallium_device_create (int fd, dev_t dev, int vendor_id, int chip_id)
 
 CLEANUP_SCREEN:
     device->screen->destroy (device->screen);
-CLEANUP_API:
-    device->api->destroy (device->api);
 CLEANUP:
     free (device);
     dlclose (handle);