diff options
| author | Oliver McFadden <[email protected]> | 2007-05-09 18:07:16 +0000 |
|---|---|---|
| committer | Oliver McFadden <[email protected]> | 2007-05-09 18:07:16 +0000 |
| commit | ed42bd6e2005e8d725b29b26f6062e5c008efcce (patch) | |
| tree | a4f402274e8cb6100b099e95fd58182144075943 | |
| parent | 2db667290a19d15122d8d0c011f4b813bb542bc5 (diff) | |
r300: Removed the obsolete GLX_DIRECT_RENDERING define.
| -rw-r--r-- | src/mesa/drivers/dri/r300/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_maos.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_tex.h | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile index cd05927e5e3..b0b47be4a24 100644 --- a/src/mesa/drivers/dri/r300/Makefile +++ b/src/mesa/drivers/dri/r300/Makefile @@ -45,7 +45,7 @@ DRIVER_SOURCES = \ C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES) -DRIVER_DEFINES = -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0 \ +DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \ -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 SYMLINKS = \ diff --git a/src/mesa/drivers/dri/r300/r300_maos.h b/src/mesa/drivers/dri/r300/r300_maos.h index 67fc6e2490d..055e8c58eaf 100644 --- a/src/mesa/drivers/dri/r300/r300_maos.h +++ b/src/mesa/drivers/dri/r300/r300_maos.h @@ -35,8 +35,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __R300_MAOS_H__ #define __R300_MAOS_H__ -#ifdef GLX_DIRECT_RENDERING - #include "r300_context.h" extern void r300EmitElts(GLcontext * ctx, void *elts, unsigned long n_elts, @@ -50,4 +48,3 @@ void r300UseArrays(GLcontext * ctx); extern void r300ReleaseArrays(GLcontext * ctx); #endif -#endif diff --git a/src/mesa/drivers/dri/r300/r300_tex.h b/src/mesa/drivers/dri/r300/r300_tex.h index 10aabc8b4b7..74fa08e97d9 100644 --- a/src/mesa/drivers/dri/r300/r300_tex.h +++ b/src/mesa/drivers/dri/r300/r300_tex.h @@ -35,8 +35,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __r300_TEX_H__ #define __r300_TEX_H__ -#ifdef GLX_DIRECT_RENDERING - extern void r300UpdateTextureState(GLcontext * ctx); extern int r300UploadTexImages(r300ContextPtr rmesa, r300TexObjPtr t, @@ -46,5 +44,4 @@ extern void r300DestroyTexObj(r300ContextPtr rmesa, r300TexObjPtr t); extern void r300InitTextureFuncs(struct dd_function_table *functions); -#endif #endif /* __r300_TEX_H__ */ |