On Sun, 2005-12-04 at 03:09 +0100, Roland Scheidegger wrote: > Otherwise, I'm unsure what the -DPTHREADS and -DHAVE_ALIAS switches > actually do. Maybe they conflict with other options (some xthreads > stuff maybe?) which are used in the xorg build.
Yes , remove -DPTHREADS and -DHAVE_ALIAS switches, resolve the problem
Now, on my r200, glxinfo|grep s3tc I got:
GL_EXT_texture, GL_EXT_texture3D, GL_EXT_texture_compression_s3tc,
GL_SGIS_texture_lod, GL_S3_s3tc
but q3demo still say that I don't find texture compression
cat q3demo2.log | grep GL_S3_s3tc
Mesa: Mesa GL_EXTENSIONS = GL_ARB_imaging GL_ARB_multisample
GL_ARB_multitexture GL_ARB_texture_border_clamp
GL_ARB_texture_compression GL_ARB_texture_cube_map
GL_ARB_texture_env_add GL_ARB_texture_env_combine
GL_ARB_texture_env_dot3 GL_ARB_texture_mirrored_repeat
GL_ARB_texture_rectangle GL_ARB_transpose_matrix
GL_ARB_vertex_buffer_object GL_ARB_vertex_program GL_ARB_window_pos
GL_EXT_abgr GL_EXT_bgra GL_EXT_blend_color
GL_EXT_blend_equation_separate GL_EXT_blend_func_separate
GL_EXT_blend_minmax GL_EXT_blend_subtract GL_EXT_clip_volume_hint
GL_EXT_compiled_vertex_array GL_EXT_convolution GL_EXT_copy_texture
GL_EXT_draw_range_elements GL_EXT_fog_coord GL_EXT_histogram
GL_EXT_packed_pixels GL_EXT_polygon_offset GL_EXT_rescale_normal
GL_EXT_secondary_color GL_EXT_separate_specular_color
GL_EXT_stencil_wrap GL_EXT_subtexture GL_EXT_texture GL_EXT_texture3D
GL_EXT_texture_compression_s3tc GL_EXT_texture_edge_clamp
GL_EXT_texture_env_add GL_EXT_texture_env_combine
GL_EXT_texture_env_dot3 GL_EXT_texture_filter_anisotropic
GL_EXT_texture_lod_bias GL_EXT_texture_mirror_clamp
GL_EXT_texture_object GL_EXT_texture_rectangle GL_EXT_vertex_array
GL_APPLE_packed_pixels GL_ATI_blend_equation_separate
GL_ATI_texture_env_combine3 GL_ATI_texture_mirror_once
GL_IBM_rasterpos_clip GL_IBM_texture_mirrored_repeat
GL_INGR_blend_func_separate GL_MESA_pack_invert GL_MESA_ycbcr_texture
GL_MESA_window_pos GL_NV_blend_square GL_NV_light_max_exponent
GL_NV_texture_rectangle GL_NV_texgen_reflection GL_NV_vertex_program
GL_OES_read_format GL_SGI_color_matrix GL_SGI_color_table
GL_SGIS_generate_mipmap GL_SGIS_texture_border_clamp
GL_SGIS_texture_edge_clamp GL_SGIS_texture_lod GL_S3_s3tc
...GL_S3_s3tc not found
strange
Anyway q3demo runs faster
Here it goes the patch that I think that should be applied on Xorg-6.9,
enables 2 defines, one needed and test it on my Athlon with one Savage
(bug #1709) and other on one r200 (bug #5057).
I had be careful about just enable switches ifdef BuildXF86DRI.
This 2 Defines doesn't appear to be crucial to a good building of Xorg
monolithic tree, so my personal opinion aren't blockers but are the
correct way of compiling Mesa on Xorg-6.9 build.
Roland I am writing to you because hope that you can review, approved
and get submit this patch :).
thanks,
--
Sérgio M.B.
--- xc/lib/GL/mesa/array_cache/Imakefile.orig 2005-11-18 21:02:13.000000000 +0000
+++ xc/lib/GL/mesa/array_cache/Imakefile 2005-11-18 21:03:02.000000000 +0000
@@ -36,7 +36,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/main/Imakefile.orig 2005-11-18 21:03:21.000000000 +0000
+++ xc/lib/GL/mesa/main/Imakefile 2005-11-18 21:03:44.000000000 +0000
@@ -44,7 +44,11 @@
MATH_DEFINES = -DCCPML
#endif
- DEFINES = $(ALLOC_DEFINES) GlxDefines \
+#if BuildXF86DRI
+ DRI_DEFINES = -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
+#endif
+
+ DEFINES = $(ALLOC_DEFINES) GlxDefines $(DRI_DEFINES) \
$(MESA_ASM_DEFINES) $(MATH_DEFINES)
INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \
-I$(MESASRCDIR)/src/mesa/glapi \
--- xc/lib/GL/mesa/math/Imakefile.orig 2005-11-18 21:04:22.000000000 +0000
+++ xc/lib/GL/mesa/math/Imakefile 2005-11-18 21:04:42.000000000 +0000
@@ -42,7 +42,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/shader/Imakefile.orig 2005-11-18 21:05:25.000000000 +0000
+++ xc/lib/GL/mesa/shader/Imakefile 2005-11-18 21:05:42.000000000 +0000
@@ -41,7 +41,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/shader/grammar/Imakefile.orig 2005-11-18 21:07:19.000000000 +0000
+++ xc/lib/GL/mesa/shader/grammar/Imakefile 2005-11-18 21:07:35.000000000 +0000
@@ -41,7 +41,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/shader/slang/library/Imakefile.orig 2005-11-18 21:14:37.000000000 +0000
+++ xc/lib/GL/mesa/shader/slang/library/Imakefile 2005-11-18 21:14:57.000000000 +0000
@@ -41,7 +41,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/shader/slang/Imakefile.orig 2005-11-18 21:08:04.000000000 +0000
+++ xc/lib/GL/mesa/shader/slang/Imakefile 2005-11-18 21:08:21.000000000 +0000
@@ -41,7 +41,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/swrast/Imakefile.orig 2005-11-18 21:09:08.000000000 +0000
+++ xc/lib/GL/mesa/swrast/Imakefile 2005-11-18 21:09:25.000000000 +0000
@@ -41,7 +41,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/swrast_setup/Imakefile.orig 2005-11-18 21:09:37.000000000 +0000
+++ xc/lib/GL/mesa/swrast_setup/Imakefile 2005-11-18 21:09:49.000000000 +0000
@@ -41,7 +41,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/tnl/Imakefile.orig 2005-11-18 21:10:01.000000000 +0000
+++ xc/lib/GL/mesa/tnl/Imakefile 2005-11-18 21:10:15.000000000 +0000
@@ -41,7 +41,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
#endif
--- xc/lib/GL/mesa/tnl_dd/Imakefile.orig 2005-11-18 21:10:27.000000000 +0000
+++ xc/lib/GL/mesa/tnl_dd/Imakefile 2005-11-18 21:10:40.000000000 +0000
@@ -40,7 +40,7 @@
#endif
#if BuildXF86DRI
- DRI_DEFINES = GlxDefines
+ DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \
-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
--- xc/lib/GL/mesa/x86/Imakefile.orig 2005-11-18 21:10:54.000000000 +0000
+++ xc/lib/GL/mesa/x86/Imakefile 2005-11-18 21:11:14.000000000 +0000
@@ -33,7 +33,11 @@
#define NeedToLinkMesaSrc
#include "Imakefile.inc"
- DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES)
+#if BuildXF86DRI
+ DRI_DEFINES = -DIN_DRI_DRIVER -DUSE_EXTERNAL_DXTN_LIB=1
+#endif
+
+ DEFINES = $(ALLOC_DEFINES) GlxDefines $(DRI_DEFINES) $(MESA_ASM_DEFINES)
INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC)*/ -I$(MESASRCDIR)/src/mesa \
-I$(MESASRCDIR)/include \
-I$(GLXLIBSRC)/include \
smime.p7s
Description: S/MIME cryptographic signature
