dri: drop drmLock remnants

diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
index 2dc8119eb6ea86b23209f9ce866efddd78359f80..e9e00490d21c4c8a9cf5d754bd39987731b467ae 100644 (file)
--- a/src/gallium/state_trackers/dri/common/dri_context.c
+++ b/src/gallium/state_trackers/dri/common/dri_context.c
@@ -83,7 +83,6 @@ dri_create_context(gl_api api, const struct gl_config * visual,
    cPriv->driverPrivate = ctx;
    ctx->cPriv = cPriv;
    ctx->sPriv = sPriv;
-   ctx->lock = screen->drmLock;
 
    driParseConfigFiles(&ctx->optionCache,
                       &screen->optionCache, sPriv->myNum, "dri");

diff --git a/src/gallium/state_trackers/dri/common/dri_context.h b/src/gallium/state_trackers/dri/common/dri_context.h
index cfc8e3345e51ea45df3f2e8d2c1cf72c9fcf9c6e..58bc6139691284dad9b65a8d31b8e653c0bd6689 100644 (file)
--- a/src/gallium/state_trackers/dri/common/dri_context.h
+++ b/src/gallium/state_trackers/dri/common/dri_context.h
@@ -52,11 +52,6 @@ struct dri_context
 
    driOptionCache optionCache;
 
-   drmLock *lock;
-   boolean isLocked;
-   boolean stLostLock;
-   boolean wsLostLock;
-
    unsigned int bind_count;
 
    /* gallium */

diff --git a/src/gallium/state_trackers/dri/common/dri_screen.h b/src/gallium/state_trackers/dri/common/dri_screen.h
index 4e865b9c551ed89cc636572dee048993ce2c1bfb..66f7400a30a9637daed9ae6577fb9617e73d3bdf 100644 (file)
--- a/src/gallium/state_trackers/dri/common/dri_screen.h
+++ b/src/gallium/state_trackers/dri/common/dri_screen.h
@@ -63,7 +63,6 @@ struct dri_screen
 
    /* drm */
    int fd;
-   drmLock *drmLock;
 
    /* gallium */
    boolean d_depth_bits_last;

diff --git a/src/mesa/drivers/dri/common/drisw_util.h b/src/mesa/drivers/dri/common/drisw_util.h
index d43f5235aa60b0392988e5a7f9090fc75c10ff8e..deb27093627090a6ea904a44d4afbd8a291391b9 100644 (file)
--- a/src/mesa/drivers/dri/common/drisw_util.h
+++ b/src/mesa/drivers/dri/common/drisw_util.h
@@ -36,11 +36,9 @@
 #ifndef _DRISW_UTIL_H
 #define _DRISW_UTIL_H
 
-#include "main/mtypes.h"
-
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
-typedef struct _drmLock drmLock;
+#include "main/mtypes.h"
 
 
 /**