diff options
| author | Adam Jackson <[email protected]> | 2005-01-31 23:40:05 +0000 |
|---|---|---|
| committer | Adam Jackson <[email protected]> | 2005-01-31 23:40:05 +0000 |
| commit | 886280763c8dfa7202bdacdeacf84ced69609b98 (patch) | |
| tree | f54e00c88ca4d4dfdcc26062d85078312d20b937 /src/mesa/drivers/dri/s3v | |
| parent | fc4cabbfa89154bce97fa1c076f4426cd6e55b68 (diff) | |
Bug #2428: #ifdef GLX_DIRECT_RENDERING in DRI drivers is pointless.
Diffstat (limited to 'src/mesa/drivers/dri/s3v')
| -rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_lock.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_macros.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_lock.h b/src/mesa/drivers/dri/s3v/s3v_lock.h index f1bb2a9bf22..c39d24a38ac 100644 --- a/src/mesa/drivers/dri/s3v/s3v_lock.h +++ b/src/mesa/drivers/dri/s3v/s3v_lock.h @@ -7,8 +7,6 @@ #include <sys/ioctl.h> -#ifdef GLX_DIRECT_RENDERING - extern void s3vGetLock( s3vContextPtr vmesa, GLuint flags ); /* Turn DEBUG_LOCKING on to find locking conflicts. @@ -78,8 +76,6 @@ extern int prevLockLine; DEBUG_RESET(); \ } while (0) -#endif - #define S3VHW_LOCK( vmesa ) \ DRM_UNLOCK(vmesa->driFd, vmesa->driHwLock, vmesa->hHWContext); \ DRM_SPINLOCK(&vmesa->driScreen->pSAREA->drawable_lock, \ diff --git a/src/mesa/drivers/dri/s3v/s3v_macros.h b/src/mesa/drivers/dri/s3v/s3v_macros.h index 0779006cdcd..3bc871b7eaf 100644 --- a/src/mesa/drivers/dri/s3v/s3v_macros.h +++ b/src/mesa/drivers/dri/s3v/s3v_macros.h @@ -5,8 +5,6 @@ #ifndef _S3V_MACROS_H_ #define _S3V_MACROS_H_ -#ifdef GLX_DIRECT_RENDERING - /**************/ /* DRI macros */ /**************/ @@ -204,8 +202,6 @@ do { \ DEBUG(("GOING HOME\n")); \ } while (0) -#endif - /**************************/ /* generic, global macros */ /**************************/ |