summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/gamma
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/dri/gamma')
-rw-r--r--src/mesa/drivers/dri/gamma/gamma_lock.h4
-rw-r--r--src/mesa/drivers/dri/gamma/gamma_macros.h4
2 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/gamma/gamma_lock.h b/src/mesa/drivers/dri/gamma/gamma_lock.h
index 8b66e19aa4a..2d117320da2 100644
--- a/src/mesa/drivers/dri/gamma/gamma_lock.h
+++ b/src/mesa/drivers/dri/gamma/gamma_lock.h
@@ -1,8 +1,6 @@
#ifndef __GAMMA_LOCK_H__
#define __GAMMA_LOCK_H__
-#ifdef GLX_DIRECT_RENDERING
-
extern void gammaGetLock( gammaContextPtr gmesa, GLuint flags );
/* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -72,8 +70,6 @@ extern int prevLockLine;
DEBUG_RESET(); \
} while (0)
-#endif
-
#define GAMMAHW_LOCK( gmesa ) \
DRM_UNLOCK(gmesa->driFd, gmesa->driHwLock, gmesa->hHWContext); \
DRM_SPINLOCK(&gmesa->driScreen->pSAREA->drawable_lock, \
diff --git a/src/mesa/drivers/dri/gamma/gamma_macros.h b/src/mesa/drivers/dri/gamma/gamma_macros.h
index bf9cf5f11f7..974fe569df6 100644
--- a/src/mesa/drivers/dri/gamma/gamma_macros.h
+++ b/src/mesa/drivers/dri/gamma/gamma_macros.h
@@ -35,8 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _GAMMA_MACROS_H_
#define _GAMMA_MACROS_H_
-#ifdef GLX_DIRECT_RENDERING
-
#define DEBUG_DRMDMA
#define DEBUG_ERRORS
#define DEBUG_COMMANDS_NOT
@@ -323,6 +321,4 @@ do { \
while (__s > 1) { ++l2; __s >>= 1; } \
} while (0)
-#endif
-
#endif /* _GAMMA_MACROS_H_ */