[src/netbsd-3]: src/x11/lib/OSmesa Pull up revision 1.16 (requested by jmc in...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/171eaec05fd2
branches:  netbsd-3
changeset: 575169:171eaec05fd2
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 20:52:32 2005 +0000

description:
Pull up revision 1.16 (requested by jmc in ticket #114):
Adjust for the latest XFree86 import. Code now compiles, but libraries
might be incomplete and sets are definitely still broken.

diffstat:

 x11/lib/OSmesa/Makefile |  40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diffs (92 lines):

diff -r 4e250f30fcc2 -r 171eaec05fd2 x11/lib/OSmesa/Makefile
--- a/x11/lib/OSmesa/Makefile   Wed Apr 06 20:52:27 2005 +0000
+++ b/x11/lib/OSmesa/Makefile   Wed Apr 06 20:52:32 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2005/01/21 05:15:36 rtr Exp $
+#      $NetBSD: Makefile,v 1.15.2.1 2005/04/06 20:52:32 tron Exp $
 
 NOLINT=                1       # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
 
@@ -6,41 +6,39 @@
 
 LIB=           OSMesa
 
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/OSmesa
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/osmesa
 SRCS=  osmesa.c
 
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src
-SRCS+= accum.c api_arrayelt.c api_eval.c api_loopback.c api_noop.c \
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/main
+SRCS+= accum.c api_arrayelt.c api_loopback.c api_noop.c \
        api_validate.c attrib.c blend.c buffers.c clip.c colortab.c \
        context.c convolve.c debug.c depth.c dlist.c drawpix.c \
        enable.c enums.c eval.c extensions.c feedback.c fog.c get.c \
        hash.c hint.c histogram.c image.c imports.c light.c lines.c \
-       matrix.c mmath.c pixel.c points.c polygon.c rastpos.c \
+       matrix.c pixel.c points.c polygon.c rastpos.c \
        state.c stencil.c texformat.c teximage.c texobj.c \
-       texstate.c texstore.c texutil.c varray.c vtxfmt.c
+       texstate.c texstore.c varray.c vtxfmt.c
 
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/array_cache
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/array_cache
 SRCS+= ac_context.c ac_import.c
 
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/math
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/math
 SRCS+= m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c \
        m_matrix.c m_translate.c m_vector.c m_xform.c
 
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast
 SRCS+= s_aaline.c s_aatriangle.c s_accum.c s_alpha.c s_alphabuf.c \
        s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c \
-       s_depth.c s_drawpix.c s_feedback.c s_fog.c s_histogram.c \
+       s_depth.c s_drawpix.c s_feedback.c s_fog.c \
        s_imaging.c s_lines.c s_logic.c s_masking.c s_pixeltex.c \
        s_points.c s_readpix.c s_span.c s_stencil.c s_texstore.c \
        s_texture.c s_triangle.c s_zoom.c
 
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/swrast_setup
-SRCS+= ss_context.c ss_triangle.c ss_vb.c
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/swrast_setup
+SRCS+= ss_context.c ss_triangle.c
 
-.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/tnl
-SRCS+= t_array_api.c t_array_import.c t_context.c t_eval_api.c \
-       t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c \
-       t_imm_elt.c t_imm_eval.c t_imm_exec.c t_imm_fixup.c \
+.PATH: ${X11SRCDIR.xc}/extras/Mesa/src/mesa/tnl
+SRCS+= t_array_api.c t_array_import.c t_context.c \
        t_pipeline.c t_vb_fog.c t_vb_light.c t_vb_normals.c \
        t_vb_points.c t_vb_render.c t_vb_texgen.c t_vb_texmat.c \
        t_vb_vertex.c
@@ -54,12 +52,16 @@
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/lib/GL/include \
-               -I${X11SRCDIR.xc}/extras/Mesa/src \
+               -I${X11SRCDIR.xc}/extras/Mesa/include \
+               -I${X11SRCDIR.xc}/extras/Mesa/src/mesa \
+               -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \
+               -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \
+               -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader \
                ${X11FLAGS.THREADS} \
                -DGLXEXT -DGLX_USE_MESA
 
 .if ${MACHINE_ARCH} == "i386"
-.PATH:         ${X11SRCDIR.xc}/extras/Mesa/src/X86
+.PATH:         ${X11SRCDIR.xc}/extras/Mesa/src/mesa/x86
 SRCS+=         common_x86.c common_x86_asm.S x86.c x86_cliptest.S \
                x86_xform2.S x86_xform3.S x86_xform4.S \
                mmx_blend.S \
@@ -73,7 +75,7 @@
 
 CPPFLAGS+=     -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 COMPILE.S=     ${COMPILE.s}            # XXX don't want -traditional-cpp
-AFLAGS+=       -DUSE_GAS -I. -I${X11SRCDIR.xc}/extras/Mesa/src/X86
+AFLAGS+=       -DUSE_GAS -I. -I${X11SRCDIR.xc}/extras/Mesa/src/mesa/x86
 .endif
 
 .if ${MACHINE_CPU} == "sh5"