r300: Removed the obsolete GLX_DIRECT_RENDERING define.

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index cd05927e5e32bad0bb9a2778a4cc534de2897cb2..b0b47be4a24bb15cb2d2e7da88ae8bb7236b2e1e 100644 (file)
--- 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 67fc6e2490d7d2b1a15873b2f1f6e99ca39e1326..055e8c58eaff51627877b83fb4fece63935c5a35 100644 (file)
--- 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 10aabc8b4b7e33d5dff63c04e59b3adf3d080dd0..74fa08e97d952551983a64fe9a5fc0b7d935cf54 100644 (file)
--- 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__ */