Mesa (master): dri: drop drmLock remnants
George Sapountzis
gsap7 at kemper.freedesktop.org
Fri Nov 4 21:34:21 UTC 2011
Module: Mesa
Branch: master
Commit: fc9e80fab9dc529cbe67cc718b89b17e18fa41d8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc9e80fab9dc529cbe67cc718b89b17e18fa41d8
Author: George Sapountzis <gsapountzis at gmail.com>
Date: Thu Nov 3 11:59:57 2011 +0200
dri: drop drmLock remnants
---
.../state_trackers/dri/common/dri_context.c | 1 -
.../state_trackers/dri/common/dri_context.h | 5 -----
src/gallium/state_trackers/dri/common/dri_screen.h | 1 -
src/mesa/drivers/dri/common/drisw_util.h | 4 +---
4 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/src/gallium/state_trackers/dri/common/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
index 2dc8119..e9e0049 100644
--- 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 cfc8e33..58bc613 100644
--- 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 4e865b9..66f7400 100644
--- 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 d43f523..deb2709 100644
--- 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"
/**
More information about the mesa-commit
mailing list