OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove support for BeOS

Browse Source 
Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
This commit is contained in:
Ian Romanick
2011-08-25 08:25:09 -07:00
parent c30181c7c3
commit 93db12a721
17 changed files with 10 additions and 2154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -82,7 +82,6 @@ aix-static \
autoconf \
bluegene-osmesa \
bluegene-xlc-osmesa \
beos \
catamount-osmesa-pgi \
darwin \
darwin-fat-32bit \

16
bin/mklib
View File

@@ -802,22 +802,6 @@ case $ARCH in
FINAL_LIBS=`make_ar_static_lib -ru 0 ${LIBNAME} ${OBJECTS}`
;;
'BeOS')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making BeOS static library: " ${LIBNAME}
FINAL_LIBS=`make_ar_static_lib -cru 0 ${LIBNAME} ${OBJECTS}`
else
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making BeOS shared library: " ${LIBNAME}
gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}"
mimeset -f "${LIBNAME}"
# XXX remove the Mesa3D stuff here since mklib isn't mesa-specific.
setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short "Powered by Mesa3D!" -long "Powered by Mesa3D!"
fi
FINAL_LIBS=${LIBNAME}
;;
'QNX')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making QNX library: " ${LIBNAME}

102
configs/beos
View File

@@ -1,102 +0,0 @@
# Configuration for BeOS
# Written by Philippe Houdoin
include $(TOP)/configs/default
CONFIG_NAME = beos
DEFINES = \
-DBEOS_THREADS
MACHINE=$(shell uname -m)
ifeq ($(MACHINE), BePC)
CPU = x86
else
CPU = ppc
endif
ifeq ($(CPU), x86)
# BeOS x86 settings
DEFINES += \
-DGNU_ASSEMBLER \
-DUSE_X86_ASM \
-DUSE_MMX_ASM \
-DUSE_3DNOW_ASM \
-DUSE_SSE_ASM
MESA_ASM_SOURCES = $(X86_SOURCES)
GLAPI_ASM_SOURCES = $(X86_API)
CC = gcc
CXX = g++
LD = gcc
CFLAGS = \
-Wall -Wno-multichar -Wno-ctor-dtor-privacy \
$(DEFINES)
CXXFLAGS = $(CFLAGS)
# Work around aliasing bugs - developers should comment this out
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
LDFLAGS += -Xlinker
ifdef DEBUG
CFLAGS += -g -O0
LDFLAGS += -g
DEFINES += -DDEBUG
else
CFLAGS += -O3
endif
GLUT_CFLAGS = -fexceptions
else
# BeOS PPC settings
CC = mwcc
CXX = $(CC)
LD = mwldppc
CFLAGS = \
-w on -requireprotos \
$(DEFINES)
CXXFLAGS = $(CFLAGS)
LDFLAGS += \
-export pragma \
-init _init_routine_ \
-term _term_routine_ \
-lroot \
/boot/develop/lib/ppc/glue-noinit.a \
/boot/develop/lib/ppc/init_term_dyn.o \
/boot/develop/lib/ppc/start_dyn.o
ifdef DEBUG
CFLAGS += -g -O0
CXXFLAGS += -g -O0
LDFLAGS += -g
else
CFLAGS += -O7
CXXFLAGS += -O7
endif
GLUT_CFLAGS = -fexceptions
endif
# Directories
SRC_DIRS = gallium mesa glu
GLU_DIRS = sgi
DRIVER_DIRS = beos
# Library/program dependencies
GL_LIB_DEPS =
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS =
APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)

136
docs/README.BEOS
View File

@@ -1,136 +0,0 @@
Mesa / BeOS Information
* Introduction
Brian Paul added in Mesa 3.1 a driver for BeOS R4.5 operating system.
This driver implements a clone of the BGLView class. This class,
derived from BView, allows OpenGL rendering into any BeOS window. His
driver was updated in Mesa 4.1 and again in version 6.1 by Philippe
Houdoin, who's maintaining this driver since.
Any application which uses the BGLView should be able to use Mesa
instead of Be's OpenGL without changing any code.
Since Be's OpenGL implementation (as of R5) is basically just the
SGI sample implementation, it's pretty slow. You'll see that Mesa
is considerably faster.
* Source Code
The source code for the driver is in src/mesa/drivers/beos/ directory.
It's not 100% finished at this time but many GLUT-based demos are
working. No optimizations have been made at this time.
* Compiling
Since Mesa 6.x, it can be build under BeOS with both the R5 builtin gcc version
or more recent gcc versions available for BeOS, like this gcc version 2.95.3 for BeOS
you can find at http://www.bebits.com/app/2157.
Anyway, keep in mind that to take full advantage of Mesa x86 optimizations, you better
want to use gcc 2.95.3 or sooner versions...
To build Mesa-powered BeOS libGL.so version, open an Terminal window,
move to Mesa root folder and type this command:
$ make beos
Note that the "beos" argument is only needed the first time to setup build config.
Next times, typing "make" will be enough.
When it finishes the Mesa based libGL.so library for
BeOS will be in the lib/ directory, along libglut.so library.
Several demo/test programs should have been build too under progs/* folders.
If it stop when building one of the progs/* programs, you may want to ignore it
and force make to move on next target by adding the -k make option:
$ cd progs
$ make -k
To install it as Be's default libGL.so replacement, put it in your
/boot/home/config/lib/ directory. All your GL/GLUT apps will use
the Mesa based then.
By default, it build a non-debug version library.
The x86 (MMX, SSE and 3DNOW) optimizations are also supported for x86 target.
For PowerPC BeOS flavor, sorry, Mesa don't have ppc (Altivec) optimizations
yet.
To build a DEBUG version, type instead this :
$ DEBUG=1 make
* Example Programs
Look under progs/beos/ for some BGLView-based programs.
You should find under progs/samples and progs/redbook directories GLUT-based programs too.
They all should have been compiled along with the Mesa library.
* GLUT
A beta version of GLUT 3.7 port for BeOS, made by Jake Hamby, can be found at
http://anobject.com/jehamby/Code/Glut-3.7-x86.zip.
This is the version currently included in Mesa source code, and
build in lib/libglut.so.
A previous 3.5 version of this GLUT BeOS port used to be available at
http://home.beoscentral.com/jehamby/Glut-3.5-x86.zip.
They're special versions of GLUT for the BeOS platform. I don't
believe Mark Kilgard's normal GLUT distribution includes BeOS
support.
* Special Features
Mesa's implementation of the BGLView class has an extra member
function: CopySubBufferMESA(). It basically works like SwapBuffers()
but it only copies a sub region from the back buffer to the front
buffer. This is a useful optimization for some applications.
If you use this method in your code be sure that you check at runtime
that you're actually using Mesa (with glGetString) so you don't
cause a fatal error when running with Be's OpenGL.
* Work Left To Do
- BDirectWindow single buffering support is not implemented yet.
- Color index mode is not implemented yet.
- Reading pixels from the front buffer not implemented yet.
- There is also a BGLScreen class in BeOS for full-screen OpenGL rendering.
This should also be implemented for Mesa.
- Multiple renderers add-ons support, first step toward hardware acceleration
support.
* Other contributors to this BeOS port
Jake Hamby jhamby <at> anobject <dot> com
Marcin Konicki ahwayakchih <at> neoni <dot> net
Francois Revol revol <at> free <dot> fr
Nathan Whitehorn nathanw <at> uchicago <dot> edu
* Older BeOS Driver
Mesa 2.6 had an earlier BeOS driver. It was based on Mesa's Off-screen
rendering interface, not BGLView. If you're interested in the older
driver you should get Mesa 2.6.
* BeOS and Glide
Mesa 3.0 supported the 3Dfx/Glide library on Beos. Download Mesa 3.0
if interested. Ideally, the 3Dfx/Glide support should be updated to
work with the new Mesa 3.1 BGLView implementation.
The Glide library hasn't been updated for BeOS R4 and newer, to my knowledge,
as of February, 1999.
----------------------------------------------------------------------

4
docs/dispatch.html
View File

@@ -198,9 +198,7 @@ few preprocessor defines.</p>
<ul>
<li>If <tt>GLX_USE_TLS</tt> is defined, method #4 is used.</li>
<li>If <tt>PTHREADS</tt> is defined, method #3 is used.</li>
<li>If any of <tt>PTHREADS</tt>,
<tt>WIN32_THREADS</tt>, or <tt>BEOS_THREADS</tt>
is defined, method #2 is used.</li>
<li>If <tt>WIN32_THREADS</tt> is defined, method #2 is used.</li>
<li>If none of the preceeding are defined, method #1 is used.</li>
</ul>

1
docs/install.html
View File

@@ -310,7 +310,6 @@ Documentation for other environments (some may be very out of date):
<LI><A HREF="README.GGI">README.GGI</A> - GGI
<LI><A HREF="README.3DFX">README.3DFX</A> - 3Dfx/Glide driver
<LI><A HREF="README.AMIWIN">README.AMIWIN</A> - Amiga Amiwin
<LI><A HREF="README.BEOS">README.BEOS</A> - BeOS
<LI><A HREF="README.D3D">README.D3D</A> - Direct3D driver
<LI><A HREF="README.DJ">README.DJ</A> - DJGPP
<LI><A HREF="README.LYNXOS">README.LYNXOS</A> - LynxOS

8
docs/systems.html
View File

@@ -16,14 +16,13 @@ X development environment to use Mesa.
<p>
The DRI hardware drivers for the X.org server and XFree86 provide
hardware accelerated rendering for chips from ATI, Intel, Matrox, 3dfx
and others on Linux and FreeBSD.
hardware accelerated rendering for chips from ATI, Intel, and NVIDIA
on Linux and FreeBSD.
</p>
<p>
Drivers for other assorted platforms include:
the Amiga, Apple Macintosh, BeOS, NeXT, OS/2, MS-DOS, VMS, Windows
9x/NT, and Direct3D.
the Apple Macintosh and Windows.
</p>
<p>
@@ -51,7 +50,6 @@ They can be saved if someone steps up to help.
<LI>3dfx/Glide <A HREF="README.3DFX">(README.3DFX)</A>
<LI>GGI <A HREF="README.GGI">(README.GGI)</A>
<LI>Amiga Amiwin <A HREF="README.AMIWIN">(README.AMIWIN)</A>
<LI>BeOS <A HREF="README.BEOS">(README.BEOS)</A>
<LI>Direct3D driver <A HREF="README.D3D">(README.D3D)</A>
<LI>DJGPP <A HREF="README.DJ">(README.DJ)</A>
<LI>LynxOS <A HREF="README.LYNXOS">(README.LYNXOS)</A>

8
include/GL/osmesa.h
View File

@@ -101,7 +101,7 @@ extern "C" {
typedef struct osmesa_context *OSMesaContext;
#if defined(__BEOS__) || defined(__QUICKDRAW__)
#if defined(__QUICKDRAW__)
#pragma export on
#endif
@@ -275,12 +275,6 @@ OSMesaGetProcAddress( const char *funcName );
GLAPI void GLAPIENTRY
OSMesaColorClamp(GLboolean enable);
#if defined(__BEOS__) || defined(__QUICKDRAW__)
#pragma export off
#endif
#ifdef __cplusplus
}
#endif

2
src/mapi/glapi/gen/gl_x86-64_asm.py
View File

@@ -138,7 +138,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '# define GL_PREFIX(n) GLNAME(CONCAT(gl,n))'
print '# endif'
print ''
print '#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)'
print '#if defined(PTHREADS) || defined(WIN32)'
print '# define THREADS'
print '#endif'
print ''

2
src/mapi/glapi/gen/gl_x86_asm.py
View File

@@ -78,7 +78,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
print '#define GLOBL_FN(x) GLOBL x'
print '#endif'
print ''
print '#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)'
print '#if defined(PTHREADS) || defined(WIN32)'
print '# define THREADS'
print '#endif'
print ''

2
src/mapi/glapi/glapi_x86-64.S
View File

@@ -45,7 +45,7 @@
# define GL_PREFIX(n) GLNAME(CONCAT(gl,n))
# endif
#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)
#if defined(PTHREADS) || defined(WIN32)
# define THREADS
#endif

2
src/mapi/glapi/glapi_x86.S
View File

@@ -51,7 +51,7 @@
#define GLOBL_FN(x) GLOBL x
#endif
#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)
#if defined(PTHREADS) || defined(WIN32)
# define THREADS
#endif

39
src/mapi/mapi/u_thread.c
View File

@@ -169,45 +169,6 @@ u_tsd_set(struct u_tsd *tsd, void *ptr)
#endif /* WIN32 */
/*
* BeOS threads
*/
#ifdef BEOS_THREADS
unsigned long
u_thread_self(void)
{
return (unsigned long) find_thread(NULL);
}
void
u_tsd_init(struct u_tsd *tsd)
{
tsd->key = tls_allocate();
tsd->initMagic = INIT_MAGIC;
}
void *
u_tsd_get(struct u_tsd *tsd)
{
if (tsd->initMagic != (int) INIT_MAGIC) {
u_tsd_init(tsd);
}
return tls_get(tsd->key);
}
void
u_tsd_set(struct u_tsd *tsd, void *ptr)
{
if (tsd->initMagic != (int) INIT_MAGIC) {
u_tsd_init(tsd);
}
tls_set(tsd->key, ptr);
}
#endif /* BEOS_THREADS */
#else /* THREADS */

58
src/mapi/mapi/u_thread.h
View File

@@ -44,7 +44,7 @@
#include "u_compiler.h"
#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)
#if defined(PTHREADS) || defined(WIN32)
#ifndef THREADS
#define THREADS
#endif
@@ -107,62 +107,6 @@ typedef CRITICAL_SECTION u_mutex;
#endif /* WIN32 */
/*
* BeOS threads. R5.x required.
*/
#ifdef BEOS_THREADS
/* Problem with OS.h and this file on haiku */
#ifndef __HAIKU__
#include <kernel/OS.h>
#endif
#include <support/TLS.h>
/* The only two typedefs required here
* this is cause of the OS.h problem
*/
#ifdef __HAIKU__
typedef int32 thread_id;
typedef int32 sem_id;
#endif
struct u_tsd {
int32 key;
int initMagic;
};
/* Use Benaphore, aka speeder semaphore */
typedef struct {
int32 lock;
sem_id sem;
} benaphore;
typedef benaphore u_mutex;
#define u_mutex_declare_static(name) \
static u_mutex name = { 0, 0 }
#define u_mutex_init(name) \
name.sem = create_sem(0, #name"_benaphore"), \
name.lock = 0
#define u_mutex_destroy(name) \
delete_sem(name.sem), \
name.lock = 0
#define u_mutex_lock(name) \
if (name.sem == 0) \
u_mutex_init(name); \
if (atomic_add(&(name.lock), 1) >= 1) \
acquire_sem(name.sem)
#define u_mutex_unlock(name) \
if (atomic_add(&(name.lock), -1) > 1) \
release_sem(name.sem)
#endif /* BEOS_THREADS */
/*
* THREADS not defined
*/

1573
src/mesa/drivers/beos/GLView.cpp
View File

File diff suppressed because it is too large Load Diff

199
src/mesa/drivers/beos/Makefile
View File

@@ -1,199 +0,0 @@
# src/mesa/drivers/beos/Makefile
TOP = ../../../..
include $(TOP)/configs/current
include $(TOP)/src/mesa/sources
MESA_MODULES = $(TOP)/src/mesa/mesa.a
# To switch back to old Mesa GLU implementation (but why do
# you want this!), uncomment this next line:
# GLU_DIR = $(TOP)/src/glu/mesa
ifeq ($(GLU_DIR),)
# By default, we build the SGI GLU implementation
GLU_DIR = $(TOP)/src/glu/sgi
endif
ifeq ($(GLU_DIR), $(TOP)/src/glu/mesa)
GLU_MODULES = \
$(GLU_DIR)/glu.o \
$(GLU_DIR)/mipmap.o \
$(GLU_DIR)/nurbs.o \
$(GLU_DIR)/nurbscrv.o \
$(GLU_DIR)/nurbssrf.o \
$(GLU_DIR)/nurbsutl.o \
$(GLU_DIR)/polytest.o \
$(GLU_DIR)/project.o \
$(GLU_DIR)/quadric.o \
$(GLU_DIR)/tess.o \
$(GLU_DIR)/tesselat.o
else
GLU_MODULES = \
$(GLU_DIR)/libutil/error.o \
$(GLU_DIR)/libutil/glue.o \
$(GLU_DIR)/libutil/mipmap.o \
$(GLU_DIR)/libutil/project.o \
$(GLU_DIR)/libutil/quad.o \
$(GLU_DIR)/libutil/registry.o \
$(GLU_DIR)/libtess/dict.o \
$(GLU_DIR)/libtess/geom.o \
$(GLU_DIR)/libtess/memalloc.o \
$(GLU_DIR)/libtess/mesh.o \
$(GLU_DIR)/libtess/normal.o \
$(GLU_DIR)/libtess/priorityq.o \
$(GLU_DIR)/libtess/render.o \
$(GLU_DIR)/libtess/sweep.o \
$(GLU_DIR)/libtess/tess.o \
$(GLU_DIR)/libtess/tessmono.o \
$(GLU_DIR)/libnurbs/interface/bezierEval.o \
$(GLU_DIR)/libnurbs/interface/bezierPatch.o \
$(GLU_DIR)/libnurbs/interface/bezierPatchMesh.o \
$(GLU_DIR)/libnurbs/interface/glcurveval.o \
$(GLU_DIR)/libnurbs/interface/glinterface.o \
$(GLU_DIR)/libnurbs/interface/glrenderer.o \
$(GLU_DIR)/libnurbs/interface/glsurfeval.o \
$(GLU_DIR)/libnurbs/interface/incurveeval.o \
$(GLU_DIR)/libnurbs/interface/insurfeval.o \
$(GLU_DIR)/libnurbs/internals/arc.o \
$(GLU_DIR)/libnurbs/internals/arcsorter.o \
$(GLU_DIR)/libnurbs/internals/arctess.o \
$(GLU_DIR)/libnurbs/internals/backend.o \
$(GLU_DIR)/libnurbs/internals/basiccrveval.o \
$(GLU_DIR)/libnurbs/internals/basicsurfeval.o \
$(GLU_DIR)/libnurbs/internals/bin.o \
$(GLU_DIR)/libnurbs/internals/bufpool.o \
$(GLU_DIR)/libnurbs/internals/cachingeval.o \
$(GLU_DIR)/libnurbs/internals/ccw.o \
$(GLU_DIR)/libnurbs/internals/coveandtiler.o \
$(GLU_DIR)/libnurbs/internals/curve.o \
$(GLU_DIR)/libnurbs/internals/curvelist.o \
$(GLU_DIR)/libnurbs/internals/curvesub.o \
$(GLU_DIR)/libnurbs/internals/dataTransform.o \
$(GLU_DIR)/libnurbs/internals/displaylist.o \
$(GLU_DIR)/libnurbs/internals/flist.o \
$(GLU_DIR)/libnurbs/internals/flistsorter.o \
$(GLU_DIR)/libnurbs/internals/hull.o \
$(GLU_DIR)/libnurbs/internals/intersect.o \
$(GLU_DIR)/libnurbs/internals/knotvector.o \
$(GLU_DIR)/libnurbs/internals/mapdesc.o \
$(GLU_DIR)/libnurbs/internals/mapdescv.o \
$(GLU_DIR)/libnurbs/internals/maplist.o \
$(GLU_DIR)/libnurbs/internals/mesher.o \
$(GLU_DIR)/libnurbs/internals/monoTriangulationBackend.o \
$(GLU_DIR)/libnurbs/internals/monotonizer.o \
$(GLU_DIR)/libnurbs/internals/mycode.o \
$(GLU_DIR)/libnurbs/internals/nurbsinterfac.o \
$(GLU_DIR)/libnurbs/internals/nurbstess.o \
$(GLU_DIR)/libnurbs/internals/patch.o \
$(GLU_DIR)/libnurbs/internals/patchlist.o \
$(GLU_DIR)/libnurbs/internals/quilt.o \
$(GLU_DIR)/libnurbs/internals/reader.o \
$(GLU_DIR)/libnurbs/internals/renderhints.o \
$(GLU_DIR)/libnurbs/internals/slicer.o \
$(GLU_DIR)/libnurbs/internals/sorter.o \
$(GLU_DIR)/libnurbs/internals/splitarcs.o \
$(GLU_DIR)/libnurbs/internals/subdivider.o \
$(GLU_DIR)/libnurbs/internals/tobezier.o \
$(GLU_DIR)/libnurbs/internals/trimline.o \
$(GLU_DIR)/libnurbs/internals/trimregion.o \
$(GLU_DIR)/libnurbs/internals/trimvertpool.o \
$(GLU_DIR)/libnurbs/internals/uarray.o \
$(GLU_DIR)/libnurbs/internals/varray.o \
$(GLU_DIR)/libnurbs/nurbtess/directedLine.o \
$(GLU_DIR)/libnurbs/nurbtess/gridWrap.o \
$(GLU_DIR)/libnurbs/nurbtess/monoChain.o \
$(GLU_DIR)/libnurbs/nurbtess/monoPolyPart.o \
$(GLU_DIR)/libnurbs/nurbtess/monoTriangulation.o \
$(GLU_DIR)/libnurbs/nurbtess/partitionX.o \
$(GLU_DIR)/libnurbs/nurbtess/partitionY.o \
$(GLU_DIR)/libnurbs/nurbtess/polyDBG.o \
$(GLU_DIR)/libnurbs/nurbtess/polyUtil.o \
$(GLU_DIR)/libnurbs/nurbtess/primitiveStream.o \
$(GLU_DIR)/libnurbs/nurbtess/quicksort.o \
$(GLU_DIR)/libnurbs/nurbtess/rectBlock.o \
$(GLU_DIR)/libnurbs/nurbtess/sampleComp.o \
$(GLU_DIR)/libnurbs/nurbtess/sampleCompBot.o \
$(GLU_DIR)/libnurbs/nurbtess/sampleCompRight.o \
$(GLU_DIR)/libnurbs/nurbtess/sampleCompTop.o \
$(GLU_DIR)/libnurbs/nurbtess/sampleMonoPoly.o \
$(GLU_DIR)/libnurbs/nurbtess/sampledLine.o \
$(GLU_DIR)/libnurbs/nurbtess/searchTree.o
endif
INCLUDES = \
-I../common \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/array_cache \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
-I$(TOP)/src/mesa/math \
-I$(TOP)/src/mesa/shader \
-I$(TOP)/src/mesa/swrast \
-I$(TOP)/src/mesa/swrast_setup \
-I$(TOP)/src/mesa/tnl \
-I$(TOP)/src/mesa/tnl_dd \
-I$(TOP)/src/mesa/x86 \
-I. \
-I- \
-I$(TOP)/include
DRIVER_SOURCES = \
GLView.cpp \
../common/driverfuncs.c \
$(addprefix ../../, $(GLAPI_SOURCES))
ifeq ($(CPU), x86)
DRIVER_SOURCES += $(addprefix ../../, $(X86_API))
else
# No GL API PPC optimization yet
endif
DRIVER_OBJECTS = $(DRIVER_SOURCES:.c=.o)
DRIVER_OBJECTS := $(DRIVER_OBJECTS:.S=.o)
OBJECTS := $(DRIVER_OBJECTS:.cpp=.o)
# Rules
.c.o:
$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
.cpp.o:
$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
.S.o:
$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
default: depend $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
# XXX FIXME: mesa.a might be libmesa.a now
$(MESA_MODULES):
cd $(TOP)/src/mesa && $(MAKE) mesa.a ;
mimeset -f "$@"
$(GLU_MODULES):
cd $(GLU_DIR) && $(MAKE) $(subst $(GLU_DIR)/,,$(GLU_MODULES)) ;
$(TOP)/$(LIB_DIR):
mkdir $(TOP)/$(LIB_DIR)
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
@$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(GL_LIB_DEPS) \
$(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
# $(GLU_OBJECTS):
# cd $(GLU_DIR) && $(MAKE) $< ;
depend: $(DRIVER_SOURCES) $(GLU_SOURCES)
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null
clean:
-rm -f depend depend.bak $(OBJECTS)
include depend

11
src/mesa/drivers/x11/fxmesa.h
View File

@@ -59,11 +59,6 @@ extern "C" {
typedef struct tfxMesaContext *fxMesaContext;
#if defined (__BEOS__)
#pragma export on
#endif
GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win, GrScreenResolution_t,
GrScreenRefresh_t,
const GLint attribList[]);
@@ -89,12 +84,6 @@ GLAPI void GLAPIENTRY fxCloseHardware(void);
GLAPI void GLAPIENTRY fxGetScreenGeometry (GLint *w, GLint *h);
#if defined (__BEOS__)
#pragma export off
#endif
#ifdef __cplusplus
}
#endif