[overture] Re: Building v24 on Blue Gene P
- From: Erik Wilson <wilsone@xxxxxx>
- To: overture@xxxxxxxxxxxxx
- Date: Thu, 29 Mar 2012 15:58:32 -0700
Similar to the noX11 flag, the patch I sent (attached for everyone else)
add options for noGL and noPERL configure flags. OpenGL functionality is
removed via a null implementation; just in case Mesa proves too
difficult to compile.
Cheers,
-Erik
On 03/28/2012 02:54 PM, J. P. Bernstein wrote:
Thanks, Bill.
Can you please clarify if those changes are in v24, or if you are referring to
changes post v24?
Indeed, I am close to compiling Mesa on BG/P. I am getting a failure due to the
compiler not being recognized at the latter stage of compiling libmesa itself.
I am corresponding with the Mesa folks about that.
Thanks for your offer of help regarding the perl script. I am handy with perl,
so I agree that that step should not be hard.
Best,
Joe
----- Original Message -----
From: "Bill Henshaw"<henshaw@xxxxxxxx>
To: overture@xxxxxxxxxxxxx
Sent: Wednesday, March 28, 2012 4:48:51 PM
Subject: [overture] Re: Building v24 on Blue Gene P
Hi Joe,
As Kyle noted, I have already made the changes to optionally remove the
dependencies on X and Motif. My plan was to still link to OpenGL, this should
not be a big deal.
It is a simple matter to write a perl program that can convert a
command file to one that does not need perl. I can help
you with that.
...Bill
On 03/28/2012 01:07 PM, Chand, Kyle K. wrote:
Hi Joe,
I think for the OpenGL you can build Mesa without X11 and direct rendering so
you will get the library to link against. Here is a VisIt page about how they
built Mesa on a BG/P system:
http://www.visitusers.org/index.php?title=Building_on_BlueGeneP
It is kind of out of date and things might be easier now...
Regards,
Kyle
________________________________________
From: overture-bounce@xxxxxxxxxxxxx [overture-bounce@xxxxxxxxxxxxx] On Behalf
Of J. P. Bernstein [astro@xxxxxxx]
Sent: Wednesday, March 28, 2012 12:45 PM
To: overture@xxxxxxxxxxxxx
Subject: [overture] Re: Building v24 on Blue Gene P
Or am I confused. Does CG need the Overture source, Overture compilation
products, or both? If only the source, then I better understand your point
about really what I need to do is divorce Overture and CG form things.
Best,
Joe
On Mar 28, 2012, at 2:44 PM, J. P. Bernstein wrote:
Thanks, Kyle.
For Overture on BG/P, there is also the issue of X, MOTIF, and OpenGL. The CISM
folks modified a version of Overture in 2008 to strip those things in addition
to perl. Building CG alone on BG/P would reduce the problem to the CG divorce
from those things at the expense of additionally divorcing CG from Overture.
In the end, it comes down to either divorcing Overture and CG from perl, X,
MOTIF, and OpenGL, or divorcing Overture from CG and CG from perl, X, MOTIF,
and OpenGL (I am not yet sure the extent to which CG even depends on those
things). It seems to me that the latter is more sensible, but make that
statement as a mere Overture initiate. What do you and the experts say?
Best,
Joe
On Mar 28, 2012, at 2:19 PM, Chand, Kyle K. wrote:
Hi Joe,
Really you will be divorcing Overture and CG from perl, which is doable.
Stripping calls from Overture is easy, you just need to hack/replace
Ogshow/OvertureParser.C when building it on the BG/P backend. Generating
perl-less command files on your mac will not be that hard though it may involve
some adjustments to the way overture's command interpreter records the playback
commands. It may also be possible to do it with a simple perl script that
reads a command file line by line, interprets each line ending in a semi-colon
and string-interpolates the remaining lines, outputting the interpolated lines
to a perl-less command file.
bpp should not be an issue. It is used to generate code at compile time (only
when bpp files have changed) and is never executed at run time. If executing
bpp on the frontend when compiling cg is an issue you can just 'touch' all the
source files so that the bpp dependencies are not activated in the build
system. If that does not work then the build system will have to be adjusted
to ignore regeneration of bpp generated source code.
Regards,
Kyle
________________________________________
From: overture-bounce@xxxxxxxxxxxxx [overture-bounce@xxxxxxxxxxxxx] On Behalf
Of J. P. Bernstein [astro@xxxxxxx]
Sent: Wednesday, March 28, 2012 11:43 AM
To: overture@xxxxxxxxxxxxx
Subject: [overture] Re: Building v24 on Blue Gene P
Hello Kyle,
I have confirmed with ALCF management that building perl on the backend of the
Argonne BG/P is not and will not be supported by the facility due to overhead
issues.
What we are really after is having CG built on the BG/P backend. To us, the
most sensible path is to build Overture somewhere else (like my Mac laptop,
which has been done), and use it to generate perl-less command files to pass to
a CG build on the BG/P backend. Thus, I would like to divorce CG from Overture
to the greatest extent possible. How realistic is that goal, from the
perspective of the Overture developers?
The immediate issue that arises with the above is CG's dependency on BPP. How
much does CG depended on the extended capabilities of BPP, relative to CPP. In
other words, would building BPP on it's own or reverting CG to work with CPP
make more sense?
Best,
Joe
----- Original Message -----
From: "Kyle K. Chand"<chand1@xxxxxxxx>
To: overture@xxxxxxxxxxxxx
Sent: Monday, March 5, 2012 4:24:19 PM
Subject: [overture] Re: Building v24 on Blue Gene P
Hi Joe,
Mechanically, it would not be hard to replace the perl interpreter in
OvertureParser.C with the python interpreter (or any other
interpreter, check out Lua!).
However, it may be a great deal of effort to translate all our command
files from perl to python. We do not use perl for regular
expressions, we use perl for two
purposes:
1) writing perl code to parameterize and generate input to our grid
generator and solvers, and
2) utilize perl's "string interpolation" mechanism to turn command
file lines like:
$N=11;
number of grid lines
$N $N
into
number of grid lines
11 11
Lately we have been using 1) a lot more, often writing perl loops and
including perl modules to parameterize and automate input generation
and make things generally more maintainable.
The mechanism represented by 2) is how 1) eventually gets used. So,
it would be a lot of work to re-write many of our more recent (and
future) command files to use another interpreted language.
I think the most efficient path would be to strip perl from the BG
port of the code. Then use Overture on some other machine to generate
perl-less, pure text, input for the problems you want to run. One
could even
write a (perl :-) script that reads a command file and sends each line
ending with a semi-colon to the interpreter and every other line for
string interpolation, echoing the interpolated line to a "stripped"
command file. You would not even need another copy of Overture for
that.
Best regards,
Kyle
mailto: chand1@xxxxxxxx
phoneto: (925) 422 7740
On Mar 5, 2012, at 12:09 PM, J. P. Bernstein wrote:
Thank you very much, Kyle, for those details.
While I am digesting that, would you care to comment on the notion
of replacing perl functionality with python? I am not familiar
enough with python or Overture to know, of the top of my head, if
python offers the capability needed.
I ask because python is available on the back end of the BG/P at
Argonne. Might such a transformation be of interest to you and the
Overture team? My job description would allow me to engage
considerably on such a task.
Best,
Joe
On Mar 5, 2012, at 12:42 PM, Kyle K. Chand wrote:
Hi Joe,
Well, I have some bad news regarding perl. Perl is really an
integral part of how we set up problems both for the
grid generator as well as CG solver runs. Using Overture w/o perl
is kind of like editing C++ files with ed in a terminal window; you
can do it but it is not really suggested :-) Overture's graphics/
interpreter interface actually starts a perl interpreter
and the text commands are first sent to the interpreter to either
get string interpolation performed or perl statements evaluated.
You can see an example of how this is used in $Overture/sampleGrids/
squareArg.cmd, which parameterizes an ogen
grid generator command file using perl statements.
Now, it is probably possible to build Overture without the perl
interpreter linked in, you will have to change OvertureParser.C as
well
as the bin/Makefile to remove references to perl. Then, however,
you will need to strip perl from any command files you plan to use.
The best way to go would be to compile Perl for BGP. However, if
that is not possible for some reason, here is another way to go:
1) Build a "full" version of Overture somewhere you can generate
grids and test things out
2) Modify this "full" version to write the "plain text" command
files after the perl processing is completed, run any command files
you want through it to strip the perl
3) Build a "perl-less" version for BGP on which you can run perl-
stripped cg command files
The easiest way to "strip" command files of perl might be to
intercept the interpolated strings before they get sent to the rest
of Overture
from OvertureParser, I'll have to think about the least-intrusive
way to do that.
Regards,
Kyle
PS, I will try to get to your Mac question later today.
mailto: chand1@xxxxxxxx
phoneto: (925) 422 7740
On Mar 2, 2012, at 5:58 PM, J. P. Bernstein wrote:
Hello Bill,
Thank you and Kyle for the quick replies to my emails.
Warning headed. I am on assignment from the Argonne Leadership
Computing
Facility (ALCF) on this effort. There is significant interest at
ALCF to
at least run the CG solvers on BGP (not necessarily ogen).
Nevertheless,
I will share your sentiment with my assigners.
A question about the perl situation: my initial assessment
suggested to
me that perl was needed only for configuring the build and running
the
tests. Since perl is available on the front end, the configuration
part
should work. Part of my assignment is converting the perl test
scripts
to, e.g., python. However, your message below makes me doubt my
assessment. Are the perl libs, which, as you know, are not
available on
the back end, needed at run time beyond the test scripts?
Best,
Joe
On 3/2/2012 6:08 PM, Bill Henshaw wrote:
Hi Joe,
At one time I did get Overture compiled on the BGP front end at ANL
with xlc but I was left
with the issue that the perl libraries were not available with
BGP. We
could work around
this if necessary but I prefer not too if possible.
That said, experience tells me that since we have not run
Overture on
BGP then you
are likely to have problems that will be very hard for you to fix.
Therefore this is just a warning
that the path you are on may lead to great misery and despair ...
...Bill
J. P. Bernstein wrote:
Hello,
I am trying to build Overture.v24 on Blue Gene P (BG/P).
In an attempt to add a BG/P configuration for A++, I looked for
the
following config file mentioned in the A++ README file:
A++/config/config.options
but was not able to find the file or the directory mentioned in
the
A++ directory tree.
I was able to build A++ without errors with the following
configure
command:
./configure --with-CC=mpixlc_r --with-CFLAGS="-qarch=450d -
qtune=450"
--with-CXX=mpixlcxx_r --with-CXXFLAGS="-qarch=450d -qtune=450"
--prefix=`pwd`
However, the flags did not seem to be passed:
mpixlc_r -DHAVE_CONFIG_H -I. -I. -I../.. -I../../include
-c
`test -f common_func.c || echo './'`common_func.c
mpixlcxx_r -o resize resize.o
-L/home/jpbernst/Code/Overture/A++P++-0.8.0/A++/install/lib -
L../src
-lApp -lApp_static -lApp -lm
Is this a known issue?
Returning to the BG/P config issue, I tried to hack :
config/A++P++_common_autoconfig.m4
config.sub
in order to add a Bg/P setup without success. Is there
documentation
available for adding a machine config? I was not able to find
any on
the Overture webpage.
Best,
Joe Bernstein
.
--- A++P++-0.8.0/STL-link/hvector.h 2010-09-28 10:04:11.000000000 -0400
+++ a++p++/STL-link/hvector.h 2011-07-31 12:06:22.000000000 -0400
@@ -24,7 +24,7 @@
#define Allocator huge_allocator
#define vector huge_vector
#include <hugalloc.h>
-#include <vector.h>
+#include <vector>
#undef VECTOR_H
--- A++P++-0.8.0/P++/aclocal.m4 2010-09-28 10:04:14.000000000 -0400
+++ a++p++/P++/aclocal.m4 2011-07-31 12:06:23.000000000 -0400
@@ -1532,8 +1532,7 @@ AC_ARG_ENABLE(C_WARNINGS,
C_WARNINGS=$enableval,
[
case "$CC_ID" in
-dnl *wdh* 100924 gnu) C_WARNINGS='-Wstrict-prototypes' ;;
- gnu) C_WARNINGS='' ;;
+ gnu) C_WARNINGS='-Wstrict-prototypes' ;;
esac
] )
export C_WARNINGS # Make variable available to sublibrary configuration.
--- A++P++-0.8.0/P++/src/Makefile.am 2010-09-28 10:04:11.000000000 -0400
+++ a++p++/P++/src/Makefile.am 2011-07-31 12:06:23.000000000 -0400
@@ -183,6 +183,7 @@ PADRE_PGSLIB_OBJS = \
## PADRE source files
PADRE_SRC_OBJS = \
../PADRE/src/PADRE_CommonInterface.o \
+ ../PADRE/src/PADRE_SublibraryNames.o \
../PADRE/src/PADRE_Global.o \
../PADRE/src/PADRE_Descriptor.o \
../PADRE/src/PADRE_Representation.o \
--- A++P++-0.8.0/P++/src/array_src/optimization.C 2010-09-28
10:04:11.000000000 -0400
+++ a++p++/P++/src/array_src/optimization.C 2011-07-31 12:06:23.000000000
-0400
@@ -1239,7 +1239,7 @@ void
Optimization_Manager::Initialize_Virtual_Machine (
const char* Application_Program_Name ,
int & Number_Of_Processors,
- int & argc, char** & argv )
+ int & argc, char** & argv, bool showInfo )
{
// This function is used as the interface to allow the user to specify
// the number of processors used in the execution of P++ array statements.
@@ -1252,7 +1252,7 @@ Optimization_Manager::Initialize_Virtual
char pathName[MAXIMUM_PATH_LENGTH];
if (strcmp(Application_Program_Name,"") == 0) // meaning equal to ""
{
- printf ("No application program name specified (searching internally
for correct name ...) \n");
+ if (showInfo) printf ("No application program name specified
(searching internally for correct name ...) \n");
#if defined(PVM)
getcwd(pathName,MAXIMUM_PATH_LENGTH);
// cout << "pathName=" << pathName << ", program name = " << *argv[0]
<< endl;
@@ -1263,11 +1263,11 @@ Optimization_Manager::Initialize_Virtual
pathName[0] = 0;
Application_Program_Name = strcat(pathName,argv[0]);
#endif
- printf ("Application_Program_Name = %s \n",Application_Program_Name);
+ if (showInfo) printf ("Application_Program_Name = %s
\n",Application_Program_Name);
}
else
{
- printf ("Application_Program_Name set to something
(Application_Program_Name = %s) \n",Application_Program_Name);
+ if (showInfo) printf ("Application_Program_Name set to something
(Application_Program_Name = %s) \n",Application_Program_Name);
}
#endif
#endif
@@ -1293,24 +1293,24 @@ Optimization_Manager::Initialize_Virtual
int threadID = 0;
// Build a string to use in purify messages
- sprintf (processorNameString,"P++ Processor %d Thread %d
",Communication_Manager::My_Process_Number,threadID);
+ if (showInfo) sprintf (processorNameString,"P++ Processor %d Thread %d
",Communication_Manager::My_Process_Number,threadID);
// Name the thread so that purify will specify the name of
// the processor and thread when using issuing messages
pure_name_thread(processorNameString);
// Put a message into the logfile (or in the viewer) to report the processor
number and thread ID
- purify_printf ("A++/P++ using Purify: %s \n",processorNameString);
+ purify_if (showInfo) printf ("A++/P++ using Purify: %s
\n",processorNameString);
#endif
- printf ("\n");
- printf ("***************************************************** \n");
- // printf ("P++ Virtual Machine Initialized (Application_Program_Name = %s
Number_Of_Processors = %d) \n",
+ if (showInfo) printf ("\n");
+ if (showInfo) printf
("***************************************************** \n");
+ // if (showInfo) printf ("P++ Virtual Machine Initialized
(Application_Program_Name = %s Number_Of_Processors = %d) \n",
// Application_Program_Name,Number_Of_Processors);
- printf ("P++ Virtual Machine Initialized: \n");
- printf (" Process Number = %d \n",
Communication_Manager::My_Process_Number);
+ if (showInfo) printf ("P++ Virtual Machine Initialized: \n");
+ if (showInfo) printf (" Process Number = %d \n",
Communication_Manager::My_Process_Number);
- printf (" UNIX process ID = %d \n",getpid());
+ if (showInfo) printf (" UNIX process ID = %d
\n",getpid());
char namehost[128] = "gethostname() system function unavailable";
@@ -1319,24 +1319,24 @@ Optimization_Manager::Initialize_Virtual
MPI_Get_processor_name(namehost,&hostNameLength);
namehost[hostNameLength] = NULL;
- printf (" Process located on machine = %s \n",namehost);
- printf (" Number_Of_Processors = %d \n",
Communication_Manager::Number_Of_Processors);
+ if (showInfo) printf (" Process located on machine = %s
\n",namehost);
+ if (showInfo) printf (" Number_Of_Processors = %d \n",
Communication_Manager::Number_Of_Processors);
#if defined(AUTO_INITIALIZE_APPLICATION_PATH_NAME)
// ... memory leak, store this so it can be deleted ...
char* temp_path = getcwd(NULL, 500);
- printf (" Local directory (for file I/O) = %s \n", temp_path);
- //printf (" Local directory (for file I/O) = %s \n", getcwd(NULL,
500));
+ if (showInfo) printf (" Local directory (for file I/O) = %s \n",
temp_path);
+ //if (showInfo) printf (" Local directory (for file I/O) = %s \n",
getcwd(NULL, 500));
free (temp_path);
temp_path = NULL;
// delete temp_path;
#endif
- printf (" Application_Program_Name = %s \n",
Application_Program_Name);
+ if (showInfo) printf (" Application_Program_Name = %s \n",
Application_Program_Name);
// While we redebug the overlap update we want to make the VSG update the
default.
- printf (" Default communication model = %s \n",
+ if (showInfo) printf (" Default communication model = %s \n",
(ForceVSG_Update) ? "VSG everywhere" : "Overlap where possible
otherwise VSG");
- printf ("***************************************************** \n");
- printf ("\n");
+ if (showInfo) printf
("***************************************************** \n");
+ if (showInfo) printf ("\n");
// These can't be initialized until after the number of processors is known
// Internal_Partitioning_Type::DefaultStarting_Processor = 0;
@@ -1347,11 +1347,11 @@ Optimization_Manager::Initialize_Virtual
#else
// Use these to avoid compiler warnings
Number_Of_Processors = 1;
- printf ("A++ Virtual Machine Initialized (Application_Program_Name = %s
Number_Of_Processors = %d) \n",
+ if (showInfo) printf ("A++ Virtual Machine Initialized
(Application_Program_Name = %s Number_Of_Processors = %d) \n",
Application_Program_Name,Number_Of_Processors);
#endif
- // printf ("At base of Optimization_Manager::Initialize_Virtual_Machine()
\n");
+ // if (showInfo) printf ("At base of
Optimization_Manager::Initialize_Virtual_Machine() \n");
}
//
*****************************************************************************
--- A++P++-0.8.0/P++/src/array_src/index.C 2010-09-28 10:04:11.000000000
-0400
+++ a++p++/P++/src/array_src/index.C 2011-07-31 12:06:23.000000000 -0400
@@ -799,19 +799,19 @@ Internal_Index::Consistency_Check( const
}
void
-Internal_Index::setBoundsCheck ( On_Off_Type On_Off )
+Internal_Index::setBoundsCheck ( On_Off_Type On_Off, bool showInfo )
{
// This function does nothing since currently index
// checking is turned on by a preprocessor statement!
if ( (On_Off == ON) || (On_Off == On) || (On_Off == on) )
{
- printf ("A++ Internal_Index bounds checking: ON \n");
+ if (showInfo) printf ("A++ Internal_Index bounds checking: ON \n");
Index_Bounds_Checking = TRUE;
}
else
{
- printf ("A++ Internal_Index bounds checking: OFF \n");
+ if (showInfo) printf ("A++ Internal_Index bounds checking: OFF \n");
Index_Bounds_Checking = FALSE;
}
}
--- A++P++-0.8.0/P++/include/optimization.h 2010-09-28 10:04:13.000000000
-0400
+++ a++p++/P++/include/optimization.h 2011-07-31 12:06:23.000000000 -0400
@@ -46,8 +46,8 @@ class Optimization_Manager
// This new version of the initialization function takes all the
arguments in the union
// of PVM and MPI requirements
// static void Initialize_Virtual_Machine ( char*
Application_Program_Name = "" , int Number_Of_Processors = 1 );
- static void Initialize_Virtual_Machine (
- const char* Application_Program_Name , int &
Number_Of_Processors , int & argc , char** & argv );
+ static void Initialize_Virtual_Machine ( const char*
Application_Program_Name , int & Number_Of_Processors ,
+ int & argc , char** & argv,
bool showInfo = false );
static void Exit_Virtual_Machine ();
static void setOptimizedScalarIndexing ( On_Off_Type On_Off = On );
--- A++P++-0.8.0/P++/include/index.h 2010-09-28 10:04:13.000000000 -0400
+++ a++p++/P++/include/index.h 2011-07-31 12:06:23.000000000 -0400
@@ -232,7 +232,7 @@ class Internal_Index
void list( const char* Label = "default display string" ) const;
void display( const char* Label = "default display string" ) const;
- static void setBoundsCheck ( On_Off_Type On_Off );
+ static void setBoundsCheck ( On_Off_Type On_Off, bool showInfo=false );
// made this function inline Jan 15th 1997.
inline bool operator== ( const Internal_Index & X ) const
--- A++P++-0.8.0/P++/TESTS/Makefile.am 2010-09-28 10:04:11.000000000 -0400
+++ a++p++/P++/TESTS/Makefile.am 2011-07-31 12:06:23.000000000 -0400
@@ -81,7 +81,7 @@ test2000_21_DEPENDENCIES =
test2000_22_DEPENDENCIES =
test2000_23_DEPENDENCIES =
-LDADD = $(PPP_PATH_TO_SHARED_LIB) $(PXX_RPATH)
+# LDADD = $(PPP_PATH_TO_SHARED_LIB) $(PXX_RPATH)
## Talk to Brian about this!!!
## LDADD = $(PADRE_INCLUDES) $(PXX_LIBS) -lPpp_static
--- A++P++-0.8.0/P++/STL-link/hvector.h 2010-09-28 10:04:14.000000000 -0400
+++ a++p++/P++/STL-link/hvector.h 2011-07-31 12:06:23.000000000 -0400
@@ -24,7 +24,7 @@
#define Allocator huge_allocator
#define vector huge_vector
#include <hugalloc.h>
-#include <vector.h>
+#include <vector>
#undef VECTOR_H
--- A++P++-0.8.0/P++/PARTI/datamove.c 2010-09-28 10:04:14.000000000 -0400
+++ a++p++/P++/PARTI/datamove.c 2011-07-31 12:06:23.000000000 -0400
@@ -15,7 +15,7 @@
/* This is redundent since port.h is included at the base of bsparti.h */
/* include"port.h" */
-#define GRPSIZE 64
+#define GRPSIZE MAX_PROCESSORS
#define NTYPE1 100
#define NODE_PID 0
--- A++P++-0.8.0/P++/PARTI/addition_by_quinlan.c 2010-09-28
10:04:14.000000000 -0400
+++ a++p++/P++/PARTI/addition_by_quinlan.c 2011-07-31 12:06:23.000000000
-0400
@@ -6,7 +6,7 @@
#include"List.h"
/* Copied from datamove.c */
-#define GRPSIZE 64
+#define GRPSIZE MAX_PROCESSORS
#define NTYPE1 100
#define NODE_PID 0
/* wdh 100924 #define MAX_NODES 128 */
--- A++P++-0.8.0/P++/PADRE/src/PADRE_SublibraryNames.h 2010-09-28
10:04:11.000000000 -0400
+++ a++p++/P++/PADRE/src/PADRE_SublibraryNames.h 2011-07-31
12:06:23.000000000 -0400
@@ -36,10 +36,10 @@ typedef int bool;
// STL headers.
#ifndef STL_VECTOR_HEADER_FILE
-#define STL_VECTOR_HEADER_FILE <vector.h>
+#define STL_VECTOR_HEADER_FILE <vector>
#endif
#ifndef STL_ALGO_HEADER_FILE
-#define STL_ALGO_HEADER_FILE <algo.h>
+#define STL_ALGO_HEADER_FILE <algorithm>
#endif
#include STL_VECTOR_HEADER_FILE
#include STL_ALGO_HEADER_FILE
@@ -153,31 +153,14 @@ public: bool doesContain( Name k ) const
#if !defined(PADRE_DO_NOT_USE_SET_FOR_SUBLIBRARY_NAME_CONTAINER)
//! Insert the given sublibrary name into the sublibrary name container.
-public: void insert( SublibraryNames::Container::key_type l ) {
- SublibraryNameSTLContainer::insert(l);
- // If neccessary, this function should pass on information to objects.
-}
+ public: void insert( SublibraryNames::Container::key_type l );
//! Remove the given sublibrary name into the sublibrary name container.
-public: void erase( SublibraryNames::Container::key_type l ) {
- SublibraryNameSTLContainer::erase(l);
- // If neccessary, this function should pass on information to objects.
-}
+ public: void erase( SublibraryNames::Container::key_type l );
#else
//! Insert the given sublibrary name into the sublibrary name container.
-public: void insert( SublibraryNames::Name l ) {
- SublibraryNameSTLContainer::insert(begin(), l);
- // If neccessary, this function should pass on information to objects.
-}
+ public: void insert( SublibraryNames::Name l );
//! Remove the given sublibrary name into the sublibrary name container.
-public: void erase( SublibraryNames::Name l ) {
- SublibraryNameSTLContainer::erase(
- (SublibraryNameSTLContainer::iterator) /* Type cast required with
- SunPro4.2 CC using the
- package-provided STL */
- find( begin(), end(), l )
- );
- // If neccessary, this function should pass on information to objects.
-}
+ public: void erase( SublibraryNames::Name l );
#endif
--- A++P++-0.8.0/P++/PADRE/src/PADRE_Parti.h 2010-09-28 10:04:11.000000000
-0400
+++ a++p++/P++/PADRE/src/PADRE_Parti.h 2011-07-31 12:06:23.000000000 -0400
@@ -28,9 +28,13 @@
#endif
#include <PADRE_forward-declarations.h>
-//extern "C" {
+/*
+ "C" linkage fix
+
http://lists.topica.com/lists/overture/read/message.html?mid=812592659&sort=d&start=900
+*/
+/*extern "C" {*/
#include "bsparti.h"
- //}
+/*}*/
// *wdh* #include <iostream.h>
#include <iostream>
@@ -38,7 +42,7 @@ using namespace std;
// STL headers.
#ifndef STL_LIST_HEADER_FILE
-#define STL_LIST_HEADER_FILE <list.h>
+#define STL_LIST_HEADER_FILE <list>
#endif
#include STL_LIST_HEADER_FILE
--- A++P++-0.8.0/P++/PADRE/src/PADRE_GlobalArrays.h 2010-09-28
10:04:11.000000000 -0400
+++ a++p++/P++/PADRE/src/PADRE_GlobalArrays.h 2011-07-31 12:06:23.000000000
-0400
@@ -56,10 +56,10 @@ using namespace std;
// Resolve STL header file names.
#ifndef STL_LIST_HEADER_FILE
-#define STL_LIST_HEADER_FILE <list.h>
+#define STL_LIST_HEADER_FILE <list>
#endif
#ifndef STL_VECTOR_HEADER_FILE
-#define STL_VECTOR_HEADER_FILE <vector.h>
+#define STL_VECTOR_HEADER_FILE <vector>
#endif
// STL headers.
#include STL_LIST_HEADER_FILE
--- A++P++-0.8.0/P++/PADRE/src/PADRE_Global.h 2010-09-28 10:04:11.000000000
-0400
+++ a++p++/P++/PADRE/src/PADRE_Global.h 2011-07-31 12:06:23.000000000 -0400
@@ -22,13 +22,13 @@ using namespace std;
// STL headers.
#if !defined(STL_VECTOR_HEADER_FILE)
-#define STL_VECTOR_HEADER_FILE <vector.h>
+#define STL_VECTOR_HEADER_FILE <vector>
#endif
#include STL_VECTOR_HEADER_FILE
#if !defined(STL_STRING_IS_BROKEN)
#if !defined(STL_STRING_HEADER_FILE)
-#define STL_STRING_HEADER_FILE <string.h>
+#define STL_STRING_HEADER_FILE <string>
#endif
#include STL_STRING_HEADER_FILE
#endif
--- A++P++-0.8.0/P++/PADRE/src/PADRE_Global.C 2010-09-28 10:04:11.000000000
-0400
+++ a++p++/P++/PADRE/src/PADRE_Global.C 2011-07-31 12:06:23.000000000 -0400
@@ -23,13 +23,13 @@
#endif
#if !defined(STL_VECTOR_HEADER_FILE)
-#define STL_VECTOR_HEADER_FILE <vector.h>
+#define STL_VECTOR_HEADER_FILE <vector>
#endif
#include STL_VECTOR_HEADER_FILE
#if !defined(STL_STRING_IS_BROKEN)
#if !defined(STL_STRING_HEADER_FILE)
-#define STL_STRING_HEADER_FILE <string.h>
+#define STL_STRING_HEADER_FILE <string>
#endif
#include STL_STRING_HEADER_FILE
#endif
@@ -163,8 +163,10 @@ void PADRE::Initialization::checkInitial
#if !defined(NO_GlobalArrays)
PADRE::permitSublibrary( SublibraryNames::GlobalArrays );
#endif
+ /*
cout << "PADRE initially permitting these distribution libraries: "
<< PermittedSublibrarySet << endl;
+ */
PADRE::Initialization::initialized = true;
}
--- A++P++-0.8.0/P++/PADRE/src/PADRE_Distribution.h 2010-09-28
10:04:11.000000000 -0400
+++ a++p++/P++/PADRE/src/PADRE_Distribution.h 2011-07-31 12:06:23.000000000
-0400
@@ -20,7 +20,7 @@
// STL headers.
#ifndef STL_VECTOR_HEADER_FILE
-#define STL_VECTOR_HEADER_FILE <vector.h>
+#define STL_VECTOR_HEADER_FILE <vector>
#endif
#include STL_VECTOR_HEADER_FILE
--- A++P++-0.8.0/P++/PADRE/src/PADRE_Descriptor.h 2010-09-28
10:04:11.000000000 -0400
+++ a++p++/P++/PADRE/src/PADRE_Descriptor.h 2011-09-09 17:55:10.000000000
-0400
@@ -441,8 +441,9 @@ public:
// These are the pointers to the sublibrary specific objects
// wrapped in objects to provide a standard interface.
+// Christian Hansen: Changed PARTI_Descriptor from private to public for
Intercomm
#if !defined(NO_Parti)
-private: PARTI_Descr *pPARTI_Descriptor;
+public: PARTI_Descr *pPARTI_Descriptor;
#endif
#if !defined(NO_GlobalArrays)
private: GlobalArrays_Descr *pGlobalArrays_Descriptor;
--- A++P++-0.8.0/P++/PADRE/src/PADRE_CommonInterface.h 2010-09-28
10:04:11.000000000 -0400
+++ a++p++/P++/PADRE/src/PADRE_CommonInterface.h 2011-07-31
12:06:23.000000000 -0400
@@ -19,7 +19,7 @@ using namespace std;
// STL headers.
#ifndef STL_VECTOR_HEADER_FILE
-#define STL_VECTOR_HEADER_FILE <vector.h>
+#define STL_VECTOR_HEADER_FILE <vector>
#endif
#include STL_VECTOR_HEADER_FILE
--- A++P++-0.8.0/P++/PADRE/src/PADRE_CommonInterface.C 2010-09-28
10:04:11.000000000 -0400
+++ a++p++/P++/PADRE/src/PADRE_CommonInterface.C 2011-07-31
12:06:23.000000000 -0400
@@ -14,7 +14,7 @@
#include <bsparti.h>
#endif
-#include <iostream.h>
+#include <iostream>
int PADRE_CommonInterface :: idCount = 0;
--- A++P++-0.8.0/P++/PADRE/src/Makefile.am 2010-09-28 10:04:11.000000000
-0400
+++ a++p++/P++/PADRE/src/Makefile.am 2011-07-31 12:06:23.000000000 -0400
@@ -79,6 +79,7 @@ PADRE_PGSLIB_OBJS = \
## PADRE source files
libPADRE_a_SOURCES = \
PADRE_CommonInterface.C \
+ PADRE_SublibraryNames.C \
PADRE_Global.C \
PADRE_Descriptor.C \
PADRE_Representation.C \
--- A++P++-0.8.0/P++/PADRE/STL-link/hvector.h 2010-09-28 10:04:11.000000000
-0400
+++ a++p++/P++/PADRE/STL-link/hvector.h 2011-07-31 12:06:23.000000000 -0400
@@ -24,7 +24,7 @@
#define Allocator huge_allocator
#define vector huge_vector
#include <hugalloc.h>
-#include <vector.h>
+#include <vector>
#undef VECTOR_H
--- A++P++-0.8.0/P++/PADRE/IndirectAddressing/STL-link/hvector.h
2010-09-28 10:04:11.000000000 -0400
+++ a++p++/P++/PADRE/IndirectAddressing/STL-link/hvector.h 2011-07-31
12:06:24.000000000 -0400
@@ -24,7 +24,7 @@
#define Allocator huge_allocator
#define vector huge_vector
#include <hugalloc.h>
-#include <vector.h>
+#include <vector>
#undef VECTOR_H
--- A++P++-0.8.0/P++/EXAMPLES/Makefile.am 2010-09-28 10:04:14.000000000
-0400
+++ a++p++/P++/EXAMPLES/Makefile.am 2011-07-31 12:06:24.000000000 -0400
@@ -20,7 +20,7 @@ test_Ppp_execution_SOURCES = test_
riemann_SOURCES = riemann.C
## The use of templates requires that we include the path to the templates (in
PADRE/src)
-LDADD = $(PPP_PATH_TO_SHARED_LIB) $(PXX_RPATH)
+# LDADD = $(PPP_PATH_TO_SHARED_LIB) $(PXX_RPATH)
## This would be defined to be the value of the _LDADD suffix variables and we
want
## to avoid that dependency (since it gets in the way of tests using "make -n")
--- A++P++-0.8.0/A++/aclocal.m4 2010-09-28 10:04:11.000000000 -0400
+++ a++p++/A++/aclocal.m4 2011-07-31 12:06:24.000000000 -0400
@@ -970,8 +970,7 @@ AC_ARG_ENABLE(C_WARNINGS,
C_WARNINGS=$enableval,
[
case "$CC_ID" in
-dnl *wdh* 100924 gnu) C_WARNINGS='-Wstrict-prototypes' ;;
- gnu) C_WARNINGS='' ;;
+ gnu) C_WARNINGS='-Wstrict-prototypes' ;;
esac
] )
export C_WARNINGS # Make variable available to sublibrary configuration.
--- A++P++-0.8.0/A++/include/A++_notemplates.h 2010-09-28 10:04:11.000000000
-0400
+++ a++p++/A++/include/A++_notemplates.h 2011-07-31 12:06:24.000000000
-0400
@@ -26,8 +26,9 @@
-// *wdh* 061229 -- for gcc 4.1.1
-class Operand_Storage;
+
+
+
@@ -120,6 +121,7 @@ class Partitioning_Type;
// IBM xlC requires a forward declaration here
class Partitioning_Type;
+class Operand_Storage;
// IBM xlC requires that friend functions be declared in the scope where they
are
// used (declaration as a friend function in a class definition is not enough).
--- A++P++-0.8.0/A++/TESTS/Makefile.am 2010-09-28 10:04:09.000000000 -0400
+++ a++p++/A++/TESTS/Makefile.am 2011-07-31 12:06:24.000000000 -0400
@@ -19,12 +19,13 @@ CXX_TEMPLATE_REPOSITORY_PATH=.
# ARCH = @ARCH@
# CC = @CC@
# CXX = @CXX@
-APP_PATH_TO_SHARED_LIB = -L$(libdir)
+#libdir=../src
+#APP_PATH_TO_SHARED_LIB = -L$(libdir)
# DQ: (12/24/2000) need to avoid early specification of -lApp_static
$(PTHREADS_LIB)
# LDADD = $(APP_PATH_TO_SHARED_LIB) $(AXX_LIB_PATH) $(AXX_LIBS) -lApp_static
$(PTHREADS_LIB)
# LDADD = $(APP_PATH_TO_SHARED_LIB) $(AXX_LIB_PATH)
-LDADD = $(APP_PATH_TO_SHARED_LIB) $(AXX_RPATH)
+# LDADD = $(APP_PATH_TO_SHARED_LIB) $(AXX_RPATH)
## Add bugs to this line as they are fixed so that they can be used as test
problems
## At least we should not reintroduce these fixed bugs again later.
--- A++P++-0.8.0/A++/EXAMPLES/Makefile.am 2010-09-28 10:04:11.000000000
-0400
+++ a++p++/A++/EXAMPLES/Makefile.am 2011-07-31 12:06:24.000000000 -0400
@@ -32,7 +32,7 @@ riemann_SOURCES = riemann.C
# DQ: (12/25/2000) need to avoid early specification of -lApp_static
$(PTHREADS_LIB)
## LDADD = $(APP_PATH_TO_SHARED_LIB) $(AXX_LIB_PATH) $(AXX_LIBS) -lApp_static
$(PTHREADS_LIB)
# LDADD = $(APP_PATH_TO_SHARED_LIB) $(AXX_LIB_PATH) $(AXX_LIBS)
-LDADD = $(APP_PATH_TO_SHARED_LIB) $(AXX_RPATH)
+# LDADD = $(APP_PATH_TO_SHARED_LIB) $(AXX_RPATH)
## This would be defined to be the value of the _LDADD suffix variables and we
want
## to avoid that dependency (since it gets in the way of tests using "make -n")
--- A++P++-0.8.0/NOTES.wilsone 1969-12-31 19:00:00.000000000 -0500
+++ a++p++/NOTES.wilsone 2011-10-07 18:43:57.000000000 -0400
@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+
+# Author: Erik Wilson
+# Last Updated: 8-17-10
+# These are notes for compiling A++/P++
+
+#MISC
+# Why 64-bit AIX fails for unpatched code:
+# http://www.llnl.gov/computing/mpi/faq.html#question12
+
+# for AIX 32 bit compilation:
+# unset OBJECT_MODE
+# for AIX 64 bit compilation:
+# setenv OBJECT_MODE 64
+
+# Do not compile with -lc or -lm:
+# find . -name configure -exec perl -ne 's/-l(c|m)(\W)/$2/g;print' -i {} \;
+
+# Do not remove include/*.h during make clean:
+# find . -name 'Makefile.*' -exec perl -ne 's|([^#])(rm -f
\*\.h)|$1#$2|g;print' -i {} \;
+
+# Use make instead of gmake, run if make complains there is no gmake:
+# find . -name 'Makefile' -exec perl -ne
's|^\s*MAKE\s*=\s*gmake\s*$||g;print' -i {} \;
+
+# To display what changed from svn checkout:
+# (for f in $(svn status | grep -v '^?' | sed -e 's|^. *||'); do
+# echo ------------------------------------------------; echo $f; svn
diff $f;
+# done)
+
+#CONFIGURING
+# The following configure commands use the environment variables PREFIX, CC,
CXX, MPICC, and MPICXX.
+
+export PREFIX=
+export CC=
+export CXX=
+export MPICC=
+export MPICXX=
+export OPT=
+
+if [ "$(uname -n|head -c6)" = "kraken" ]; then
+ echo "Using Kraken settings..."
+ export PREFIX=$HOME/share/a++p++
+ export CC=pgcc
+ export CXX=pgCC
+ export MPICC=cc
+ export MPICXX=CC
+ export OPT="-O3"
+fi
+
+if [ "$(uname -n|perl -pe 's|^be(\d+)en$|bluefire|')" = "bluefire" ]; then
+ echo "Using Bluefire settings..."
+ export PREFIX=$HOME/share/a++p++
+ export CC=xlc
+ export CXX=xlC
+ export MPICC=mpcc
+ export MPICXX=mpCC
+ export OPT="-O3 -qcpluscmt -qkeyword=inline"
+
+ module load autoconf automake # needed for speedy builds
+fi
+
+if [ "$(uname -n)" = "titan" ]; then
+ echo "Using Titan settings..."
+ export PREFIX=$HOME/scratch/pgi/install/openmpi/0.8.0
+ export CC=pgcc
+ export CXX=pgCC
+ export MPICC=mpicc.openmpi.pgi
+ export MPICXX=mpicxx.openmpi.pgi
+ export OPT="-O3"
+fi
+
+echo
------------------------------------------------------------------------------------------
+
+# Top level config directive
+./configure --prefix=$PREFIX --enable-PXX --no-recursion
+
+# A++ config
+(
+ cd A++;
+ echo
------------------------------------------------------------------------------------------
+ echo `pwd`;
+ ./configure --prefix=$PREFIX --with-CC=$CC --with-CXX=$CXX LD=ld
--enable-C_OPT="$OPT" --enable-CXX_OPT="$OPT"
+)
+
+# P++ config
+# Disable using -lmpi, -L/..mpi.., -I/..mpi.. via --with-mpi-libs, we are
using mpcc/mpCC anyways
+# To configure without modifying config file, pretend we are cross compiling
using --host to avoid compiler check
+# For AIX also include flag: --host=powerpc-ibm-aix5
+(
+ cd P++;
+ echo
------------------------------------------------------------------------------------------
+ echo `pwd`;
+ ./configure --prefix=$PREFIX --enable-PXX --disable-mpirun-check
--with-mpi-libs=" " \
+ --with-CC=$MPICC --with-CXX=$MPICXX --enable-C_OPT="$OPT"
--enable-CXX_OPT="$OPT" \
+ --host=powerpc-ibm-aix5
+)
--- Overture.v24/configure 2011-05-18 11:21:54.000000000 -0400
+++ overture/configure 2012-03-06 22:40:40.317224991 -0500
@@ -13,7 +13,8 @@ $machine = $ARGV[0];
$buildOgmg = "true"; # this is now always built
$buildRapsodi = "";
$useX11 = 1; # set to 0 to build without X11 graphics (for machines without
X11 libraries)
-
+$useGL = 1;
+$usePERL = 1;
if( $machine eq "help" || $machine eq "-help" || $machine eq "--help" )
{
@@ -63,6 +64,16 @@ foreach $arg ( @ARGV )
$useX11 = 0;
printf("Do NOT use X11.\n");
}
+ if ( $arg =~ "noGL" )
+ {
+ $useGL = 0;
+ printf("Do NOT use OpenGL.\n");
+ }
+ if ( $arg =~ "noPERL" )
+ {
+ $usePERL = 0;
+ printf("Do NOT use PERL.\n");
+ }
}
# should use : *** these are NOT supported yet ****
@@ -78,6 +89,7 @@ if( $machine ne "aix" &&
$machine ne "dec-linux-compaq" &&
$machine ne "hpux" &&
$machine ne "linux" &&
+ $machine ne "pgi" &&
$machine ne "irix" &&
$machine ne "sun5" &&
$machine ne "darwin" &&
@@ -142,6 +154,12 @@ if( $machineType eq "x86_64" )
printf("First checking for proper definition of Overture environmental
variables:\n");
+use Cwd;
+
+if (!defined($ENV{"Overture"})) {
+ $ENV{"Overture"} = &Cwd::cwd() if (!defined($ENV{"Overture"}));
+}
+
@environmentalVariables=(
"APlusPlus",
"OpenGL",
@@ -153,6 +171,8 @@ $numberOfErrors =0;
foreach $ev ( @environmentalVariables )
{
next if $ev eq "XLIBS" && !$useX11 ; # skip XLIBS if we don''t use X11
+ next if $ev eq "OpenGL" && !$useGL ; # skip XLIBS if we don''t use X11
+
$eev = $ENV{$ev};
if( -e $eev )
{
@@ -174,7 +194,10 @@ if( $useX11 ){ $XLIBS = $ENV{"XLIBS"}; }
# check for the Mesa or native OpenGL libraries.
# Note in the latest version of Mesa the libraries no longer include the name
MESA
# $OpenGLibs = "-lMesaGL -lMesaGLU -lGLw";
+if ($useGL)
+{
$OpenGLibs = "-lMesaGL -lMesaGLU"; # we no longer look for -lGLw
+}
# library locations for OpenGL and XLIBS (lib or lib64):
$OpenGLibPath = "$OpenGL/$LIB64";
@@ -186,6 +209,8 @@ $useMesa = "";
$buildOSMesa = "";
if( $length ne 0 )
{
+ if ($useGL)
+ {
if( $useX11 )
{
$OpenGLibs = "-lGL -lGLU"; # we no longer look for -lGLw
@@ -273,8 +298,12 @@ if( $length ne 0 )
print "Using native OpenGL libraries since gl.h does not contain the word
Mesa\n";
}
}
+
+}
else
{
+ if ($useGL)
+ {
@libGLNames = <$OpenGLibPath/libMesaGL.*>;
$length = @libGLNames;
if( $length ne 0 )
@@ -289,6 +318,7 @@ else
$numberOfErrors++;
}
}
+}
# check for the libGLw.a or .so library **** we nolonger require this to be
built ****
#@libAGLwNames = <$OpenGLibPath/libGLw.a>;
@@ -380,15 +410,9 @@ if( $useX11 )
close(MOTIF_FILE);
printf("Using $motif. \n");
}
-if( $useX11 )
-{ # use mog.C.backup if we use X11
- system("cp static/mogl.C.backup static/mogl.C");
-}
-else
-{ # use moglNull.C if we don't use X11
- system("cp static/moglNull.C static/mogl.C");
-}
+if( $usePERL )
+{
# Find the location of the perl CORE libraries for the Overture parser
system("perl -V > config/perl-V");
open(PERLMV,"config/perl-V") || die print "unable to open config/perl-V\n";
@@ -399,8 +423,7 @@ use Config;
$perlloc="$Config{archlib}/CORE";
printf("perlloc = [$perlloc]\n");
-while( <PERLMV> )
-{
+ while( <PERLMV> ) {
if( /perllibs=/ )
{
$perllibs = $_;
@@ -419,16 +442,16 @@ while( <PERLMV> )
# }
}
close(PERLMV);
-if( $perllibs ne "" && $perlloc ne "" )
-{
+ if( $perllibs ne "" && $perlloc ne "" ) {
printf("Using perl headers and lib from perllibs=[$perlloc]\n");
printf("Will link to the libraries perllibs=[$perllibs]\n");
-}
-else
-{
+ } else {
printf("configure:ERROR: searching for the location of the perl headers and
lib! Will use the\n");
printf(" info supplied in config/MakeDef.$machine\n");
}
+} else {
+ $perlloc = ".";
+}
# look to see if we are using hdf5
$hdf = $ENV{"HDF"};
@@ -555,6 +578,7 @@ foreach $arg ( @ARGV )
{
$parallel="parallel";
$useHDF5 = "useHDF5";
+ $ENV{APlusPlus} = $ENV{PPlusPlus};
print "Compiling Overture in parallel (will use hdf5.)\n";
}
elsif( $arg eq "headers" )
@@ -589,7 +613,7 @@ foreach $arg ( @ARGV )
{
#
}
- elsif ( $arg eq "noX11" )
+ elsif ( $arg eq "noX11" or $arg eq "noGL" or $arg eq "noPERL")
{
#
}
@@ -1125,6 +1149,18 @@ if( $parallel eq "parallel" )
while( <PPP_MAKEFILE> )
{
chop($_);
+
+ if( $_ =~ /^CC\s*=/ )
+ {
+ $mpiCC = $_;
+ $mpiCC =~ s/^.*?=\s*//;
+ }
+ if( $_ =~ /^CXX\s*=/ )
+ {
+ $mpiCXX = $_;
+ $mpiCXX =~ s/^.*?=\s*//;
+ }
+
if( $_ =~ /^MPIINCLUDE/ )
{
$mpiInclude = $_;
@@ -1166,11 +1202,11 @@ if( $parallel eq "parallel" )
}
}
close(PPP_MAKEFILE);
- if( $mpiInclude eq "" )
- {
- printf("ERROR looking for MPIINCLUDE !\n");
- exit 1;
- }
+ # if( $mpiInclude eq "" )
+ # {
+ # printf("ERROR looking for MPIINCLUDE !\n");
+ # exit 1;
+ # }
}
# Now create the file include/OvertureDefine.h
@@ -1185,6 +1221,7 @@ while( <OVERTURE_DEFINE_IN> )
if( $arch eq "aix" ){ $line =~ s/^#undef OV_ARCH/#define OV_ARCH_AIX/; }
if( $arch eq "darwin" ){ $line =~ s/^#undef OV_ARCH/#define OV_ARCH_DARWIN/;
}
if( $arch eq "linux" ){ $line =~ s/^#undef OV_ARCH/#define OV_ARCH_LINUX/; }
+ if( $arch eq "pgi" ){ $line =~ s/^#undef OV_ARCH/#define OV_ARCH_LINUX/; }
if( $bFC eq "xlf" )
{ # IBM xlf compiler does not add an underscore to fortran names:
@@ -1211,6 +1248,14 @@ while( <OVERTURE_DEFINE_IN> )
{
$line =~ s/^#undef OV_USE_X11/#define OV_USE_X11/g;
}
+ if( $useGL )
+ {
+ $line =~ s/^#undef OV_USE_GL/#define OV_USE_GL/g;
+ }
+ if( $usePERL )
+ {
+ $line =~ s/^#undef OV_USE_PERL/#define OV_USE_PERL/g;
+ }
if( $exceptionsSupported==0 )
{
$line =~ s/^#undef OV_EXCEPTIONS_NOT_SUPPORTED/#define
OV_EXCEPTIONS_NOT_SUPPORTED/g;
@@ -1366,6 +1411,14 @@ foreach $dir ( @directories )
while( <MAKE_DEFS> )
{
$line = $_;
+ chomp($line);
+
+ $line =~ s/^(Overture *= *)$/$1 $ENV{Overture}/;
+ $line =~ s/^(APlusPlus *= *)$/$1 $ENV{APlusPlus}/;
+ $line =~ s/^(HDF *= *)$/$1 $ENV{HDF}/;
+ $line =~ s/^(XLIBS *= *)$/$1 $ENV{XLIBS}/;
+ $line =~ s/^(OpenGL *= *)$/$1 $ENV{OpenGL}/;
+
# *wdh* $line =~ s/\$\(OverturePrecision\)/$double/g;
$line =~ s/\$\(OverturePrecision\)//g;
$line =~ s/\$\(FortranDouble\)/$FortranDouble/g;
@@ -1425,21 +1478,24 @@ foreach $dir ( @directories )
$line =~ s/STL_INCLUDE = .*/STL_INCLUDE = $STLINC/;
- if( $perllibs ne "" && $perlloc ne "" )
- {
$line =~ s/^OV_PERL_INCLUDE.*/OV_PERL_INCLUDE = $perlloc/;
$line =~ s/^OV_PERL_LIB[ =].*/OV_PERL_LIB = $perlloc/;
- if ( $rpath ne "" )
- {
- if( $bCC eq "g++" )
+
+ if( $perllibs ne "" && $perlloc ne "" && $usePERL )
{
- # No space between rpath command and location
- $line =~ s/^OV_PERL_LIBRARIES.*/OV_PERL_LIBRARIES =
\$(OV_RPATH)\$(OV_PERL_LIB) -L\$(OV_PERL_LIB) $perllibs/;
- }
- else
+ if ( $rpath ne "" )
{
$line =~ s/^OV_PERL_LIBRARIES.*/OV_PERL_LIBRARIES = \$(OV_RPATH)
\$(OV_PERL_LIB) -L\$(OV_PERL_LIB) $perllibs/;
- }
+
+ # if( $bCC eq "g++" )
+ # {
+ # # No space between rpath command and location
+ # $line =~ s/^OV_PERL_LIBRARIES.*/OV_PERL_LIBRARIES =
\$(OV_RPATH)\$(OV_PERL_LIB) -L\$(OV_PERL_LIB) $perllibs/;
+ # }
+ # else
+ # {
+ # $line =~ s/^OV_PERL_LIBRARIES.*/OV_PERL_LIBRARIES =
\$(OV_RPATH) \$(OV_PERL_LIB) -L\$(OV_PERL_LIB) $perllibs/;
+ # }
}
else
{
@@ -1551,11 +1607,11 @@ foreach $dir ( @directories )
$line =~ s/-lApp -lApp_static/-lPpp -lPpp_static $mpiLibDirs
$mpiLibs/;
$line =~ s/APlusPlus/PPlusPlus/g;
- $line =~ s/(CC_INCLUDES.?= .*)/\1 $mpiInclude -DUSE_PPP/;
+ $line =~ s/(CC_INCLUDES.?= .*)/\1 $mpiInclude/;
$line =~ s/(CFLAGS.?= .*)/\1 -DUSE_PPP/;
}
if ( $headers ne "headers" ){
- print OUTFILE $line;
+ print OUTFILE $line."\n";
}
}
close(MAKE_DEFS);
@@ -1567,6 +1623,8 @@ foreach $dir ( @directories )
while( <MAKEFILE_IN> )
{
$line = $_;
+ chomp($line);
+
$line =~ s/$mc //g; # uncomment lines that start with #$machine
if( $opt ne "" )
{
@@ -1623,13 +1681,14 @@ foreach $dir ( @directories )
}
if( $parallel ne "" )
{
+ $line =~ s/^(MPICXX *= *).*$/$1 $mpiCXX/;
$line =~ s/^#parallel //g; # uncomment lines that start with
#parallel
}
if( $buildOSMesa ne "" )
{
$line =~ s/^#buildOSMesa//; # uncomment lines that start with
#buildOSMesa
}
- print OUTFILE $line;
+ print OUTFILE $line."\n";
}
close(MAKEFILE_IN);
close(OUTFILE);
--- Overture.v24/check.p 2011-05-18 11:21:54.000000000 -0400
+++ overture/check.p 2011-07-31 12:16:54.000000000 -0400
@@ -24,6 +24,9 @@ sub checkError
# redirect STDERR to be the same as STDOUT
open(STDERR,">&STDOUT" ) || die print "Can't dup STDERR as STDOUT\n";
+use Cwd;
+
+$ENV{"Overture"} = &Cwd::cwd() if (!defined($ENV{"Overture"}));
$Overture = $ENV{"Overture"};
$fileName = "$Overture/configure.options";
--- Overture.v24/Makefile.in 2011-05-18 11:21:54.000000000 -0400
+++ overture/Makefile.in 2011-07-31 12:16:54.000000000 -0400
@@ -59,7 +59,6 @@ all:
@echo
"----------------------------------------------------------------------- "
@echo "type <make help> for help. Run the configure script before
running make"
@echo
"----------------------------------------------------------------------- "
- rm -rf A++; rm -f OpenGL; rm -f HDF; ln -s $(APlusPlus) A++; ln -s
$(OpenGL) OpenGL; ln -s $(HDF) HDF
@cd DataBase; $(MAKE) -$(MAKEFLAGS) FLAGS1="$(FLAGS)"
@cd GridFunction; $(MAKE) -$(MAKEFLAGS) FLAGS1="$(FLAGS)"
@cd templates; $(MAKE) -$(MAKEFLAGS) FLAGS1="$(FLAGS)"
@@ -83,7 +82,6 @@ rapsodi:
@echo
"----------------------------------------------------------------------- "
@echo "type <make help> for help. Run the configure script before
running make"
@echo
"----------------------------------------------------------------------- "
- rm -rf A++; rm -f OpenGL; rm -f HDF; ln -s $(APlusPlus) A++; ln -s
$(OpenGL) OpenGL; ln -s $(HDF) HDF
@cd DataBase; $(MAKE) -$(MAKEFLAGS) FLAGS1="$(FLAGS)"
@cd boxlib; $(MAKE) -$(MAKEFLAGS) FLAGS1="$(FLAGS)"
@cd Mapping; $(MAKE) -$(MAKEFLAGS) FLAGS1="$(FLAGS)"
@@ -200,14 +198,10 @@ rapsodi.tgz:
tar zcf $@ $(RapsodiMainFiles) $(RapsodiLibraryFiles)
$(RapsodiStaticFiles) $(RapsodiBinFiles)
-clean:; rm -rf A++
- rm -f OpenGL
- rm -f HDF
- rm -f */*.a */*.o */*~ */*_date bin/ogen bin/plotStuff bin/ps2ppm
bin/rap bin/decompress configure.options
+clean:;
+ rm -f */*.a */*.o */*~ */*_date bin/ogen bin/plotStuff bin/ps2ppm
bin/rap bin/decompress
rm -f */*.so*
rm -rf */Templates.DB
- rm -rf A++
- rm -rf OpenGL
if [ -d Ogmg ] ; then rm -f Ogmg/*.a Ogmg/*.o Ogmg/*~ Ogmg/*_date
; fi
# clean up dependency files
rm -f bin/depend; touch bin/depend
--- Overture.v24/tests/Makefile.in 2011-05-18 11:21:54.000000000 -0400
+++ overture/tests/Makefile.in 2011-07-31 12:16:52.000000000 -0400
@@ -3,6 +3,9 @@
# Regression tests for Overture.
#
+MPICXX =
+#parallel CC=$(MPICXX)
+
# Here are the things we can make
PROGRAMS = paperplane tgf tbc tbcc tderivatives testIntegrate tcm tcm2 tcm3
tcm4 \
moveAndSolve tz ti tifc toges
--- Overture.v24/static/overlay.c 2011-05-18 11:21:54.000000000 -0400
+++ overture/static/overlay.c 2011-07-31 12:16:52.000000000 -0400
@@ -5,11 +5,16 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
+#include "OvertureDefine.h"
+
+#ifdef OV_USE_X11
+
#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xmd.h>
+
/* Transparent type values */
/* None 0 */
#define TransparentPixel 1
@@ -21,6 +26,7 @@
#define VisualTransparentValue 0x800
#define VisualAllLayerMask 0xFFF
+
/* layered visual info structure */
typedef struct _sovVisualInfo {
XVisualInfo vinfo;
@@ -198,7 +204,6 @@ sovMatchVisualInfo(Display *display, int
void detectOverlaySupport(Display *dpy, Visual *overlayVisual, int
*overlayDepth, Colormap *overlayColormap)
{
-
sovVisualInfo template, *overlayVisuals;
int layer, nVisuals, i, entries;
@@ -225,5 +230,7 @@ void detectOverlaySupport(Display *dpy,
/* printf("**** info: overlay visual found *****\n"); */
*overlayColormap = XCreateColormap(dpy,
DefaultRootWindow(dpy),overlayVisual, AllocNone); /* wdh */
}
-
}
+
+
+#endif // OV_USE_X11
--- Overture.v24/include/RandomSampling.h 2011-05-18 11:21:54.000000000
-0400
+++ overture/include/RandomSampling.h 2011-07-31 12:16:53.000000000 -0400
@@ -1,7 +1,7 @@
#ifndef RANDOMSAMPLING_H
#define RANDOMSAMPLING_H
-#include <cmath>
+//#include <cmath>
class RandomSampling {
public:
--- Overture.v24/include/OvertureDefine.h.in 2011-05-18 11:21:56.000000000
-0400
+++ overture/include/OvertureDefine.h.in 2011-07-31 12:16:53.000000000
-0400
@@ -19,6 +19,9 @@
#undef OV_NO_DEFAULT_TEMPL_ARGS
#undef OV_USE_HDF5
#undef OV_USE_X11
+#undef OV_USE_GL
+#undef OV_USE_PERL
+
#ifndef __sgi
#define OV_USINGNAMESPACE(x)
#else
--- Overture.v24/include/GL_GraphicsInterface.h 2011-05-18 11:21:57.000000000
-0400
+++ overture/include/GL_GraphicsInterface.h 2011-07-31 12:16:54.000000000
-0400
@@ -22,14 +22,22 @@
//
//===========================================================================================
+#include "OvertureDefine.h"
#include "GenericGraphicsInterface.h"
#include "GraphicsParameters.h"
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include <math.h>
+
+#ifdef OV_USE_GL
#include <GL/gl.h>
#include <GL/glu.h>
+#else
+#include "nullgl.h"
+#include "nullglu.h"
+#endif
+
#include "mogl.h"
#include "GUIState.h"
#include "ColourBar.h"
--- Overture.v24/bin/Makefile.in 2011-05-18 11:21:54.000000000 -0400
+++ overture/bin/Makefile.in 2011-07-31 12:16:54.000000000 -0400
@@ -5,12 +5,14 @@
# define the enviromental variables HDF and OpenGL
# The .so library needs a full path name:
-Overture="`pwd`/.."
+#Overture="`pwd`/.."
INCLUDE= -I$(MOTIF)/include -I$(XLIBS)/include #kkc 100325 -I$(HDF)/include
CCFLAGS2 = $(CCFLAGS) # removed by kkc $(INCLUDE)
+MPICXX =
+#parallel CC=$(MPICXX)
.SUFFIXES:
.SUFFIXES:.C .o
--- Overture.v24/Ogshow/stroke.C 2011-05-18 11:21:57.000000000 -0400
+++ overture/Ogshow/stroke.C 2011-07-31 12:16:54.000000000 -0400
@@ -1,4 +1,3 @@
-#include <GL/gl.h>
#include "GL_GraphicsInterface.h"
//================================================================================
--- Overture.v24/Ogshow/osRender.C 2011-05-18 11:21:57.000000000 -0400
+++ overture/Ogshow/osRender.C 2011-07-31 12:16:54.000000000 -0400
@@ -45,7 +45,10 @@ offScreenRender(const char * fileName,
#ifdef OV_USE_X11
+#ifdef OV_USE_GL
#include <GL/glx.h>
+#endif // OV_USE_GL
+
int
moglGetInfo( Display *&dpy_, XVisualInfo *&vi, GLXContext & cx );
--- Overture.v24/Ogshow/label.C 2011-05-18 11:21:57.000000000 -0400
+++ overture/Ogshow/label.C 2011-07-31 12:16:54.000000000 -0400
@@ -1,5 +1,5 @@
+
#include "GL_GraphicsInterface.h"
-#include <GL/glu.h>
#ifdef NO_APP
using GUITypes::real;
--- Overture.v24/Ogshow/getAnswer.C 2011-05-18 11:21:57.000000000 -0400
+++ overture/Ogshow/getAnswer.C 2011-07-31 12:16:54.000000000 -0400
@@ -4,8 +4,6 @@
#endif
#include <string.h>
#include "mogl.h"
-#include <GL/gl.h>
-#include <GL/glu.h>
#include "xColours.h"
#ifdef NO_APP
--- Overture.v24/Ogshow/OvertureParser.C 2011-05-18 11:21:57.000000000
-0400
+++ overture/Ogshow/OvertureParser.C 2011-07-31 12:16:54.000000000 -0400
@@ -2,12 +2,14 @@
#include "OvertureParser.h"
// On the dec: these next includes seem to mess with bool -- causes problems
if we include Overture stuff
+#ifdef OV_USE_PERL
extern "C"
{
#include <EXTERN.h>
#include <perl.h>
#include <XSUB.h>
}
+#endif
int OvertureParser::debug=1;
@@ -19,6 +21,7 @@ OvertureParser(int argc, char **argv) :
// are replaced.
//===============================================================================================
{
+#ifdef OV_USE_PERL
PerlInterpreter *const& my_perl_c = (PerlInterpreter *)parserPointer;
PerlInterpreter *& my_perl = (PerlInterpreter *&)my_perl_c;
@@ -52,11 +55,15 @@ OvertureParser(int argc, char **argv) :
perl_run(my_perl);
delete [] embedding;
+#else
+ printf("OvertureParser:: ***WARNING*** Ignoring PERL...\n");
+#endif
}
OvertureParser::
~OvertureParser()
{
+#ifdef OV_USE_PERL
PerlInterpreter *const& my_perl_c = (PerlInterpreter *)parserPointer;
PerlInterpreter *& my_perl = (PerlInterpreter *&)my_perl_c;
@@ -65,6 +72,7 @@ OvertureParser::
perl_destruct(my_perl);
perl_free(my_perl);
}
+#endif
}
int OvertureParser::
@@ -85,6 +93,7 @@ parse(aString & answer )
{
int returnValue=0;
+#ifdef OV_USE_PERL
const char * canswer=answer.c_str();
if( strchr(canswer,';')!=NULL )
@@ -118,6 +127,9 @@ parse(aString & answer )
}
answer=result;
}
+#else
+ printf("OvertureParser:: ***WARNING*** Ignoring PERL...\n");
+#endif
return returnValue;
}
--- Overture.v24/Ogshow/GL_GraphicsInterface.C 2011-05-18 11:21:57.000000000
-0400
+++ overture/Ogshow/GL_GraphicsInterface.C 2011-07-31 12:16:54.000000000
-0400
@@ -1,7 +1,5 @@
#include "GL_GraphicsInterface.h"
#include <string.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
#include "xColours.h"
#ifndef NO_APP
--- Overture.v24/GridFunction/partitioning.C 2011-05-18 11:21:56.000000000
-0400
+++ overture/GridFunction/partitioning.C 2011-07-31 12:16:55.000000000
-0400
@@ -9,6 +9,8 @@
//kkc 061031 put the mpi header here to prevent an mpich mpi++.h include
problem from bsparti.h
#include <mpi.h>
#include<A++.h>
+#define PPP
+
#include<dimension_macros.h>
// After PADRE is more stable within A++/P++ we can remove the
Internal_Partitioning_Type
@@ -197,18 +199,18 @@ Internal_Partitioning_Type::getProcessor
printf ("Inside of Internal_Partitioning_Type::getProcessorSet ()!
\n");
#endif
-#if defined(USE_PADRE)
- int*processorArray = NULL;
- int numberOfProcessors = 0;
- //
PADRE_Distribution<BaseArray,Array_Domain_Type,SerialArray_Domain_Type>::getProcessorSet(processorArray,numberOfProcessors);
- distributionPointer->getProcessorSet(processorArray,numberOfProcessors);
- return intSerialArray (processorArray,numberOfProcessors);
-#else
- intSerialArray Temp_Set ((Ending_Processor - Starting_Processor) + 1);
- Temp_Set.seqAdd (Starting_Processor);
+// #if defined(USE_PADRE)
+// int*processorArray = NULL;
+// int numberOfProcessors = 0;
+// //
PADRE_Distribution<BaseArray,Array_Domain_Type,SerialArray_Domain_Type>::getProcessorSet(processorArray,numberOfProcessors);
+//
distributionPointer->getProcessorSet(processorArray,numberOfProcessors);
+// return intSerialArray (processorArray,numberOfProcessors);
+// #else
+ intSerialArray Temp_Set (Communication_Manager::Number_Of_Processors);
+ Temp_Set.seqAdd (0);
return Temp_Set;
-#endif
+// #endif
}
#else
// The A++ definition of getProcessorSet
--- Overture.v24/GridFunction/p_descriptor.C 2011-05-18 11:21:57.000000000
-0400
+++ overture/GridFunction/p_descriptor.C 2011-07-31 12:16:55.000000000
-0400
@@ -20,6 +20,8 @@
// kkc 061031 include mpi here to avoid mpich/bsparti error
#include <mpi.h>
#include "A++.h"
+#define PPP
+
extern "C"
{
/* machine.h is found in MDI/machine.h through a link in A++/inc lude and
P++/inc lude */
--- Overture.v24/GridFunction/p_array.C 2011-05-18 11:21:57.000000000 -0400
+++ overture/GridFunction/p_array.C 2011-07-31 12:16:55.000000000 -0400
@@ -34,6 +34,8 @@
#include <mpi.h>
#include "A++.h"
+#define PPP
+
// *********************************************************
// Include header files for Machine Dependent Interface (MDI) layer
// *********************************************************
--- Overture.v24/GridFunction/p_abstract_op.C 2011-05-18 11:21:57.000000000
-0400
+++ overture/GridFunction/p_abstract_op.C 2011-07-31 12:16:55.000000000
-0400
@@ -5,6 +5,8 @@ extern bool automaticCommunication; //
// kkc 061031 include mpi here to avoid mpich/bsparti error
#include <mpi.h>
#include"A++.h"
+#define PPP
+
// Inline functions specific to use by the abstract operators
#include<inline_support.h>
--- Overture.v24/GridFunction/conform_enforce.C 2011-05-18 11:21:57.000000000
-0400
+++ overture/GridFunction/conform_enforce.C 2011-07-31 12:16:55.000000000
-0400
@@ -5,6 +5,7 @@ bool automaticCommunication = true; //
// kkc 061031 include mpi here to avoid mpich/bsparti error
#include <mpi.h>
#include "A++.h"
+#define PPP
#if defined(USE_PARALLEL_INDIRECT_ADDRESSING_SUPPORT)
// low level support for indirect addressing
--- Overture.v24/GridFunction/array.C 2011-05-18 11:21:57.000000000 -0400
+++ overture/GridFunction/array.C 2011-07-31 12:16:55.000000000 -0400
@@ -30,8 +30,10 @@
// Include A++ header files
// *********************************************************
// kkc 061031 include mpi here to avoid mpich/bsparti error
-#include <mpi.h>
#include "A++.h"
+#include <mpi.h>
+
+#undef PPP
// *********************************************************
// Include header files for Machine Dependent Interface (MDI) layer
--- Overture.v24/GridFunction/Makefile.in 2011-05-18 11:21:54.000000000
-0400
+++ overture/GridFunction/Makefile.in 2011-07-31 12:16:55.000000000 -0400
@@ -105,14 +105,12 @@ GridFunction_Opt_date: ${filesOpt:.C=.o}
# Here are files from P++ that include some fixes -- these fixes will
eventually move to the P++ source
+# ----------- here is how we compile P++ files --------------------------
+PFLAGS = -DHAVE_CONFIG_H -I. -I$(PPlusPlus)/include $(STD_OPT_FLAG) $(CCFLAGS)
$(CC_FLAGS)
+
# Here is how we would compile datamove.c -- but for now it is not needed
since it is the same as in P++
-PFLAGSC = -DHAVE_CONFIG_H -I. -I$(P)/../.. -I$(P)/../../include
-I$(P)/../../PARTI -I$(P)/../PARTI -I$(MPI_ROOT)/include
-I$(P)/../../PADRE/src -I$(P)/../../PADRE -I$(P)/../../PARTI -I$(P)/../../PARTI
-I$(P)/../../PADRE/PGSLIB -I$(P)/../../PADRE/PGSLIB -I$(P)/../../PGSLIB
-I$(P)/../PGSLIB $(STD_OPT_FLAG) -fPIC -Wstrict-prototypes
datamove.o: datamove.c
- $(cc) $(PFLAGSC) -c datamove.c
-
-# ----------- here is how we compile P++ files --------------------------
-P = $(PPlusPlus)/../src/array_src
-PFLAGS = -DHAVE_CONFIG_H -I. -I$(P)/../.. -I$(P)/../../include
-I$(P)/../../PARTI -I$(P)/../PARTI -I$(MPI_ROOT)/include
-I$(P)/../../PADRE/src -I$(P)/../../PADRE -I$(P)/../../PARTI -I$(P)/../../PARTI
-I$(P)/../../PADRE/PGSLIB -I$(P)/../../PADRE/PGSLIB -I$(P)/../../PGSLIB
-I$(P)/../PGSLIB $(STD_OPT_FLAG) -fPIC -Wno-deprecated
+ $(cc) $(PFLAGS) -c datamove.c
partitioning.o: partitioning.C
$(CC) $(PFLAGS) -c partitioning.C
--- Overture.v24/GridFunction/GridDistribution.C 2011-05-18
11:21:57.000000000 -0400
+++ overture/GridFunction/GridDistribution.C 2011-07-31 12:16:55.000000000
-0400
@@ -242,7 +242,7 @@ int leastPrimeFactor(int n)
if (n < 2) return n;
if (n % 2 == 0) return 2;
- int sqrtn = int(sqrt(n));
+ int sqrtn = int(sqrt(float(n)));
for (i = 3; i <= sqrtn; i+=2)
{
if (n % i == 0) return i;
--- Overture.v24/Grid/MappedGrid.C 2011-05-18 11:21:54.000000000 -0400
+++ overture/Grid/MappedGrid.C 2011-07-31 12:16:55.000000000 -0400
@@ -2296,12 +2296,14 @@ specifyProcesses(const Range& range)
else
{
#ifdef USE_PPP
+#if !defined(USE_PADRE)
partition.Internal_Partitioning_Object->Starting_Processor=range.getBase();
partition.Internal_Partitioning_Object->Ending_Processor=range.getBound();
matrixPartition.Internal_Partitioning_Object->Starting_Processor=range.getBase();
matrixPartition.Internal_Partitioning_Object->Ending_Processor=range.getBound();
#endif
+#endif
}
if( numberOfDimensions>0 )
--- Overture.v24/Grid/CompositeGrid.C 2011-05-18 11:21:54.000000000 -0400
+++ overture/Grid/CompositeGrid.C 2011-07-31 12:16:55.000000000 -0400
@@ -1423,9 +1423,11 @@ specifyProcesses(const Range& range)
// rcData->initializePartition();
#ifdef USE_PPP
// rcData->partition.SpecifyProcessorRange(range);
+#if !defined(USE_PADRE)
rcData->partition.Internal_Partitioning_Object->Starting_Processor=range.getBase();
rcData->partition.Internal_Partitioning_Object->Ending_Processor=range.getBound();
#endif
+ #endif
}
--- Overture.v24/Cad/nurbsCurveEditor.C 2011-05-18 11:21:54.000000000 -0400
+++ overture/Cad/nurbsCurveEditor.C 2011-07-31 12:16:55.000000000 -0400
@@ -1,6 +1,7 @@
#include "nurbsCurveEditor.h"
#include "Point.h"
#include "ArraySimple.h"
+#include "GL_GraphicsInterface.h"
static int
plotPickingSquare(GenericGraphicsInterface & gi, real *pxb);
@@ -1638,10 +1639,6 @@ assembleSubCurves(int & currentCurve,
return returnValue;
}
-// ******************** move these to GL_GraphicsInterface ********************
-
-#include <GL/gl.h>
-#include <GL/glu.h>
static int
plotPickingSquare(GenericGraphicsInterface & gi, real *pxb) // draw a white
square and make it pickable
--- Overture.v24/Cad/fillVolumeWithSpheres.C 2011-05-18 11:21:54.000000000
-0400
+++ overture/Cad/fillVolumeWithSpheres.C 2011-07-31 12:16:55.000000000
-0400
@@ -62,10 +62,10 @@ isOverlapping(const RealArray &oneSphere
static double
dsign(double arg, double signP) {
if (signP < 0.0) {
- return -abs(arg);
+ return -fabs(arg);
}
else {
- return abs(arg);
+ return fabs(arg);
}
}
@@ -153,14 +153,14 @@ fillVolumeWithSpheres( CompositeSurface
double tv = 0.0;
double tvf = 0.0;
const double distTolerance = 0.01;
- volumeFraction = abs(sphereDist.volumeFraction);
+ volumeFraction = fabs(sphereDist.volumeFraction);
for (int j = 0; j < numberOfRadii; j++) {
tvf += sphereDist.sphereDistribution(j,1);
cumulativeProbability(j) = tvf;
numberOfParticles(j) = 0;
}
- if (abs(1.0 - tvf) > distTolerance) {
+ if (fabs(1.0 - tvf) > distTolerance) {
printf("WARNING: volume fraction probabilities don't sum to 1 [%lg]\n",
tvf);
}
--- Overture.v24/Cad/RandomSampling.C 2011-05-18 11:21:54.000000000 -0400
+++ overture/Cad/RandomSampling.C 2011-07-31 12:16:55.000000000 -0400
@@ -1,5 +1,5 @@
#include "RandomSampling.h"
-#include "math.h"
+#include <math.h>
//
// C++'ization of Bill Bateson's Dune RandomSampling module
--- Overture.v24/Cad/Point.C 2011-05-18 11:21:54.000000000 -0400
+++ overture/Cad/Point.C 2011-07-31 12:16:55.000000000 -0400
@@ -1,6 +1,5 @@
#include "Point.h"
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include "GL_GraphicsInterface.h"
Point::
Point() // constructor
--- Overture.v24/include/nullgl.h 1969-12-31 19:00:00.000000000 -0500
+++ overture/include/nullgl.h 2011-07-31 12:16:53.000000000 -0400
@@ -0,0 +1,1286 @@
+#ifndef NULLGL_H
+#define NULLGL_H
+
+typedef unsigned int GLenum;
+typedef unsigned char GLboolean;
+typedef unsigned int GLbitfield;
+typedef void GLvoid;
+typedef signed char GLbyte; /* 1-byte signed */
+typedef short GLshort; /* 2-byte signed */
+typedef int GLint; /* 4-byte signed */
+typedef unsigned char GLubyte; /* 1-byte unsigned */
+typedef unsigned short GLushort; /* 2-byte unsigned */
+typedef unsigned int GLuint; /* 4-byte unsigned */
+typedef int GLsizei; /* 4-byte signed */
+typedef float GLfloat; /* single precision float */
+typedef float GLclampf; /* single precision float in [0,1] */
+typedef double GLdouble; /* double precision float */
+typedef double GLclampd; /* double precision float in [0,1] */
+
+#define GL_VERSION_1_1 1
+#define GL_VERSION_1_2 1
+#define GL_VERSION_1_3 1
+#define GL_ARB_imaging 1
+#define GL_FALSE 0x0
+#define GL_TRUE 0x1
+#define GL_BYTE 0x1400
+#define GL_UNSIGNED_BYTE 0x1401
+#define GL_SHORT 0x1402
+#define GL_UNSIGNED_SHORT 0x1403
+#define GL_INT 0x1404
+#define GL_UNSIGNED_INT 0x1405
+#define GL_FLOAT 0x1406
+#define GL_2_BYTES 0x1407
+#define GL_3_BYTES 0x1408
+#define GL_4_BYTES 0x1409
+#define GL_DOUBLE 0x140A
+#define GL_POINTS 0x0000
+#define GL_LINES 0x0001
+#define GL_LINE_LOOP 0x0002
+#define GL_LINE_STRIP 0x0003
+#define GL_TRIANGLES 0x0004
+#define GL_TRIANGLE_STRIP 0x0005
+#define GL_TRIANGLE_FAN 0x0006
+#define GL_QUADS 0x0007
+#define GL_QUAD_STRIP 0x0008
+#define GL_POLYGON 0x0009
+#define GL_VERTEX_ARRAY 0x8074
+#define GL_NORMAL_ARRAY 0x8075
+#define GL_COLOR_ARRAY 0x8076
+#define GL_INDEX_ARRAY 0x8077
+#define GL_TEXTURE_COORD_ARRAY 0x8078
+#define GL_EDGE_FLAG_ARRAY 0x8079
+#define GL_VERTEX_ARRAY_SIZE 0x807A
+#define GL_VERTEX_ARRAY_TYPE 0x807B
+#define GL_VERTEX_ARRAY_STRIDE 0x807C
+#define GL_NORMAL_ARRAY_TYPE 0x807E
+#define GL_NORMAL_ARRAY_STRIDE 0x807F
+#define GL_COLOR_ARRAY_SIZE 0x8081
+#define GL_COLOR_ARRAY_TYPE 0x8082
+#define GL_COLOR_ARRAY_STRIDE 0x8083
+#define GL_INDEX_ARRAY_TYPE 0x8085
+#define GL_INDEX_ARRAY_STRIDE 0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C
+#define GL_VERTEX_ARRAY_POINTER 0x808E
+#define GL_NORMAL_ARRAY_POINTER 0x808F
+#define GL_COLOR_ARRAY_POINTER 0x8090
+#define GL_INDEX_ARRAY_POINTER 0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093
+#define GL_V2F 0x2A20
+#define GL_V3F 0x2A21
+#define GL_C4UB_V2F 0x2A22
+#define GL_C4UB_V3F 0x2A23
+#define GL_C3F_V3F 0x2A24
+#define GL_N3F_V3F 0x2A25
+#define GL_C4F_N3F_V3F 0x2A26
+#define GL_T2F_V3F 0x2A27
+#define GL_T4F_V4F 0x2A28
+#define GL_T2F_C4UB_V3F 0x2A29
+#define GL_T2F_C3F_V3F 0x2A2A
+#define GL_T2F_N3F_V3F 0x2A2B
+#define GL_T2F_C4F_N3F_V3F 0x2A2C
+#define GL_T4F_C4F_N3F_V4F 0x2A2D
+#define GL_MATRIX_MODE 0x0BA0
+#define GL_MODELVIEW 0x1700
+#define GL_PROJECTION 0x1701
+#define GL_TEXTURE 0x1702
+#define GL_POINT_SMOOTH 0x0B10
+#define GL_POINT_SIZE 0x0B11
+#define GL_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_POINT_SIZE_RANGE 0x0B12
+#define GL_LINE_SMOOTH 0x0B20
+#define GL_LINE_STIPPLE 0x0B24
+#define GL_LINE_STIPPLE_PATTERN 0x0B25
+#define GL_LINE_STIPPLE_REPEAT 0x0B26
+#define GL_LINE_WIDTH 0x0B21
+#define GL_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_LINE_WIDTH_RANGE 0x0B22
+#define GL_POINT 0x1B00
+#define GL_LINE 0x1B01
+#define GL_FILL 0x1B02
+#define GL_CW 0x0900
+#define GL_CCW 0x0901
+#define GL_FRONT 0x0404
+#define GL_BACK 0x0405
+#define GL_POLYGON_MODE 0x0B40
+#define GL_POLYGON_SMOOTH 0x0B41
+#define GL_POLYGON_STIPPLE 0x0B42
+#define GL_EDGE_FLAG 0x0B43
+#define GL_CULL_FACE 0x0B44
+#define GL_CULL_FACE_MODE 0x0B45
+#define GL_FRONT_FACE 0x0B46
+#define GL_POLYGON_OFFSET_FACTOR 0x8038
+#define GL_POLYGON_OFFSET_UNITS 0x2A00
+#define GL_POLYGON_OFFSET_POINT 0x2A01
+#define GL_POLYGON_OFFSET_LINE 0x2A02
+#define GL_POLYGON_OFFSET_FILL 0x8037
+#define GL_COMPILE 0x1300
+#define GL_COMPILE_AND_EXECUTE 0x1301
+#define GL_LIST_BASE 0x0B32
+#define GL_LIST_INDEX 0x0B33
+#define GL_LIST_MODE 0x0B30
+#define GL_NEVER 0x0200
+#define GL_LESS 0x0201
+#define GL_EQUAL 0x0202
+#define GL_LEQUAL 0x0203
+#define GL_GREATER 0x0204
+#define GL_NOTEQUAL 0x0205
+#define GL_GEQUAL 0x0206
+#define GL_ALWAYS 0x0207
+#define GL_DEPTH_TEST 0x0B71
+#define GL_DEPTH_BITS 0x0D56
+#define GL_DEPTH_CLEAR_VALUE 0x0B73
+#define GL_DEPTH_FUNC 0x0B74
+#define GL_DEPTH_RANGE 0x0B70
+#define GL_DEPTH_WRITEMASK 0x0B72
+#define GL_DEPTH_COMPONENT 0x1902
+#define GL_LIGHTING 0x0B50
+#define GL_LIGHT0 0x4000
+#define GL_LIGHT1 0x4001
+#define GL_LIGHT2 0x4002
+#define GL_LIGHT3 0x4003
+#define GL_LIGHT4 0x4004
+#define GL_LIGHT5 0x4005
+#define GL_LIGHT6 0x4006
+#define GL_LIGHT7 0x4007
+#define GL_SPOT_EXPONENT 0x1205
+#define GL_SPOT_CUTOFF 0x1206
+#define GL_CONSTANT_ATTENUATION 0x1207
+#define GL_LINEAR_ATTENUATION 0x1208
+#define GL_QUADRATIC_ATTENUATION 0x1209
+#define GL_AMBIENT 0x1200
+#define GL_DIFFUSE 0x1201
+#define GL_SPECULAR 0x1202
+#define GL_SHININESS 0x1601
+#define GL_EMISSION 0x1600
+#define GL_POSITION 0x1203
+#define GL_SPOT_DIRECTION 0x1204
+#define GL_AMBIENT_AND_DIFFUSE 0x1602
+#define GL_COLOR_INDEXES 0x1603
+#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52
+#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51
+#define GL_LIGHT_MODEL_AMBIENT 0x0B53
+#define GL_FRONT_AND_BACK 0x0408
+#define GL_SHADE_MODEL 0x0B54
+#define GL_FLAT 0x1D00
+#define GL_SMOOTH 0x1D01
+#define GL_COLOR_MATERIAL 0x0B57
+#define GL_COLOR_MATERIAL_FACE 0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER 0x0B56
+#define GL_NORMALIZE 0x0BA1
+#define GL_CLIP_PLANE0 0x3000
+#define GL_CLIP_PLANE1 0x3001
+#define GL_CLIP_PLANE2 0x3002
+#define GL_CLIP_PLANE3 0x3003
+#define GL_CLIP_PLANE4 0x3004
+#define GL_CLIP_PLANE5 0x3005
+#define GL_ACCUM_RED_BITS 0x0D58
+#define GL_ACCUM_GREEN_BITS 0x0D59
+#define GL_ACCUM_BLUE_BITS 0x0D5A
+#define GL_ACCUM_ALPHA_BITS 0x0D5B
+#define GL_ACCUM_CLEAR_VALUE 0x0B80
+#define GL_ACCUM 0x0100
+#define GL_ADD 0x0104
+#define GL_LOAD 0x0101
+#define GL_MULT 0x0103
+#define GL_RETURN 0x0102
+#define GL_ALPHA_TEST 0x0BC0
+#define GL_ALPHA_TEST_REF 0x0BC2
+#define GL_ALPHA_TEST_FUNC 0x0BC1
+#define GL_BLEND 0x0BE2
+#define GL_BLEND_SRC 0x0BE1
+#define GL_BLEND_DST 0x0BE0
+#define GL_ZERO 0x0
+#define GL_ONE 0x1
+#define GL_SRC_COLOR 0x0300
+#define GL_ONE_MINUS_SRC_COLOR 0x0301
+#define GL_SRC_ALPHA 0x0302
+#define GL_ONE_MINUS_SRC_ALPHA 0x0303
+#define GL_DST_ALPHA 0x0304
+#define GL_ONE_MINUS_DST_ALPHA 0x0305
+#define GL_DST_COLOR 0x0306
+#define GL_ONE_MINUS_DST_COLOR 0x0307
+#define GL_SRC_ALPHA_SATURATE 0x0308
+#define GL_FEEDBACK 0x1C01
+#define GL_RENDER 0x1C00
+#define GL_SELECT 0x1C02
+#define GL_2D 0x0600
+#define GL_3D 0x0601
+#define GL_3D_COLOR 0x0602
+#define GL_3D_COLOR_TEXTURE 0x0603
+#define GL_4D_COLOR_TEXTURE 0x0604
+#define GL_POINT_TOKEN 0x0701
+#define GL_LINE_TOKEN 0x0702
+#define GL_LINE_RESET_TOKEN 0x0707
+#define GL_POLYGON_TOKEN 0x0703
+#define GL_BITMAP_TOKEN 0x0704
+#define GL_DRAW_PIXEL_TOKEN 0x0705
+#define GL_COPY_PIXEL_TOKEN 0x0706
+#define GL_PASS_THROUGH_TOKEN 0x0700
+#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2
+#define GL_SELECTION_BUFFER_POINTER 0x0DF3
+#define GL_SELECTION_BUFFER_SIZE 0x0DF4
+#define GL_FOG 0x0B60
+#define GL_FOG_MODE 0x0B65
+#define GL_FOG_DENSITY 0x0B62
+#define GL_FOG_COLOR 0x0B66
+#define GL_FOG_INDEX 0x0B61
+#define GL_FOG_START 0x0B63
+#define GL_FOG_END 0x0B64
+#define GL_LINEAR 0x2601
+#define GL_EXP 0x0800
+#define GL_EXP2 0x0801
+#define GL_LOGIC_OP 0x0BF1
+#define GL_INDEX_LOGIC_OP 0x0BF1
+#define GL_COLOR_LOGIC_OP 0x0BF2
+#define GL_LOGIC_OP_MODE 0x0BF0
+#define GL_CLEAR 0x1500
+#define GL_SET 0x150F
+#define GL_COPY 0x1503
+#define GL_COPY_INVERTED 0x150C
+#define GL_NOOP 0x1505
+#define GL_INVERT 0x150A
+#define GL_AND 0x1501
+#define GL_NAND 0x150E
+#define GL_OR 0x1507
+#define GL_NOR 0x1508
+#define GL_XOR 0x1506
+#define GL_EQUIV 0x1509
+#define GL_AND_REVERSE 0x1502
+#define GL_AND_INVERTED 0x1504
+#define GL_OR_REVERSE 0x150B
+#define GL_OR_INVERTED 0x150D
+#define GL_STENCIL_BITS 0x0D57
+#define GL_STENCIL_TEST 0x0B90
+#define GL_STENCIL_CLEAR_VALUE 0x0B91
+#define GL_STENCIL_FUNC 0x0B92
+#define GL_STENCIL_VALUE_MASK 0x0B93
+#define GL_STENCIL_FAIL 0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
+#define GL_STENCIL_REF 0x0B97
+#define GL_STENCIL_WRITEMASK 0x0B98
+#define GL_STENCIL_INDEX 0x1901
+#define GL_KEEP 0x1E00
+#define GL_REPLACE 0x1E01
+#define GL_INCR 0x1E02
+#define GL_DECR 0x1E03
+#define GL_NONE 0x0
+#define GL_LEFT 0x0406
+#define GL_RIGHT 0x0407
+#define GL_FRONT_LEFT 0x0400
+#define GL_FRONT_RIGHT 0x0401
+#define GL_BACK_LEFT 0x0402
+#define GL_BACK_RIGHT 0x0403
+#define GL_AUX0 0x0409
+#define GL_AUX1 0x040A
+#define GL_AUX2 0x040B
+#define GL_AUX3 0x040C
+#define GL_COLOR_INDEX 0x1900
+#define GL_RED 0x1903
+#define GL_GREEN 0x1904
+#define GL_BLUE 0x1905
+#define GL_ALPHA 0x1906
+#define GL_LUMINANCE 0x1909
+#define GL_LUMINANCE_ALPHA 0x190A
+#define GL_ALPHA_BITS 0x0D55
+#define GL_RED_BITS 0x0D52
+#define GL_GREEN_BITS 0x0D53
+#define GL_BLUE_BITS 0x0D54
+#define GL_INDEX_BITS 0x0D51
+#define GL_SUBPIXEL_BITS 0x0D50
+#define GL_AUX_BUFFERS 0x0C00
+#define GL_READ_BUFFER 0x0C02
+#define GL_DRAW_BUFFER 0x0C01
+#define GL_DOUBLEBUFFER 0x0C32
+#define GL_STEREO 0x0C33
+#define GL_BITMAP 0x1A00
+#define GL_COLOR 0x1800
+#define GL_DEPTH 0x1801
+#define GL_STENCIL 0x1802
+#define GL_DITHER 0x0BD0
+#define GL_RGB 0x1907
+#define GL_RGBA 0x1908
+#define GL_MAX_LIST_NESTING 0x0B31
+#define GL_MAX_EVAL_ORDER 0x0D30
+#define GL_MAX_LIGHTS 0x0D31
+#define GL_MAX_CLIP_PLANES 0x0D32
+#define GL_MAX_TEXTURE_SIZE 0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE 0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36
+#define GL_MAX_NAME_STACK_DEPTH 0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39
+#define GL_MAX_VIEWPORT_DIMS 0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B
+#define GL_ATTRIB_STACK_DEPTH 0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1
+#define GL_COLOR_CLEAR_VALUE 0x0C22
+#define GL_COLOR_WRITEMASK 0x0C23
+#define GL_CURRENT_INDEX 0x0B01
+#define GL_CURRENT_COLOR 0x0B00
+#define GL_CURRENT_NORMAL 0x0B02
+#define GL_CURRENT_RASTER_COLOR 0x0B04
+#define GL_CURRENT_RASTER_DISTANCE 0x0B09
+#define GL_CURRENT_RASTER_INDEX 0x0B05
+#define GL_CURRENT_RASTER_POSITION 0x0B07
+#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06
+#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08
+#define GL_CURRENT_TEXTURE_COORDS 0x0B03
+#define GL_INDEX_CLEAR_VALUE 0x0C20
+#define GL_INDEX_MODE 0x0C30
+#define GL_INDEX_WRITEMASK 0x0C21
+#define GL_MODELVIEW_MATRIX 0x0BA6
+#define GL_MODELVIEW_STACK_DEPTH 0x0BA3
+#define GL_NAME_STACK_DEPTH 0x0D70
+#define GL_PROJECTION_MATRIX 0x0BA7
+#define GL_PROJECTION_STACK_DEPTH 0x0BA4
+#define GL_RENDER_MODE 0x0C40
+#define GL_RGBA_MODE 0x0C31
+#define GL_TEXTURE_MATRIX 0x0BA8
+#define GL_TEXTURE_STACK_DEPTH 0x0BA5
+#define GL_VIEWPORT 0x0BA2
+#define GL_AUTO_NORMAL 0x0D80
+#define GL_MAP1_COLOR_4 0x0D90
+#define GL_MAP1_INDEX 0x0D91
+#define GL_MAP1_NORMAL 0x0D92
+#define GL_MAP1_TEXTURE_COORD_1 0x0D93
+#define GL_MAP1_TEXTURE_COORD_2 0x0D94
+#define GL_MAP1_TEXTURE_COORD_3 0x0D95
+#define GL_MAP1_TEXTURE_COORD_4 0x0D96
+#define GL_MAP1_VERTEX_3 0x0D97
+#define GL_MAP1_VERTEX_4 0x0D98
+#define GL_MAP2_COLOR_4 0x0DB0
+#define GL_MAP2_INDEX 0x0DB1
+#define GL_MAP2_NORMAL 0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1 0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2 0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3 0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4 0x0DB6
+#define GL_MAP2_VERTEX_3 0x0DB7
+#define GL_MAP2_VERTEX_4 0x0DB8
+#define GL_MAP1_GRID_DOMAIN 0x0DD0
+#define GL_MAP1_GRID_SEGMENTS 0x0DD1
+#define GL_MAP2_GRID_DOMAIN 0x0DD2
+#define GL_MAP2_GRID_SEGMENTS 0x0DD3
+#define GL_COEFF 0x0A00
+#define GL_ORDER 0x0A01
+#define GL_DOMAIN 0x0A02
+#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50
+#define GL_POINT_SMOOTH_HINT 0x0C51
+#define GL_LINE_SMOOTH_HINT 0x0C52
+#define GL_POLYGON_SMOOTH_HINT 0x0C53
+#define GL_FOG_HINT 0x0C54
+#define GL_DONT_CARE 0x1100
+#define GL_FASTEST 0x1101
+#define GL_NICEST 0x1102
+#define GL_SCISSOR_BOX 0x0C10
+#define GL_SCISSOR_TEST 0x0C11
+#define GL_MAP_COLOR 0x0D10
+#define GL_MAP_STENCIL 0x0D11
+#define GL_INDEX_SHIFT 0x0D12
+#define GL_INDEX_OFFSET 0x0D13
+#define GL_RED_SCALE 0x0D14
+#define GL_RED_BIAS 0x0D15
+#define GL_GREEN_SCALE 0x0D18
+#define GL_GREEN_BIAS 0x0D19
+#define GL_BLUE_SCALE 0x0D1A
+#define GL_BLUE_BIAS 0x0D1B
+#define GL_ALPHA_SCALE 0x0D1C
+#define GL_ALPHA_BIAS 0x0D1D
+#define GL_DEPTH_SCALE 0x0D1E
+#define GL_DEPTH_BIAS 0x0D1F
+#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1
+#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0
+#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9
+#define GL_PIXEL_MAP_S_TO_S 0x0C71
+#define GL_PIXEL_MAP_I_TO_I 0x0C70
+#define GL_PIXEL_MAP_I_TO_R 0x0C72
+#define GL_PIXEL_MAP_I_TO_G 0x0C73
+#define GL_PIXEL_MAP_I_TO_B 0x0C74
+#define GL_PIXEL_MAP_I_TO_A 0x0C75
+#define GL_PIXEL_MAP_R_TO_R 0x0C76
+#define GL_PIXEL_MAP_G_TO_G 0x0C77
+#define GL_PIXEL_MAP_B_TO_B 0x0C78
+#define GL_PIXEL_MAP_A_TO_A 0x0C79
+#define GL_PACK_ALIGNMENT 0x0D05
+#define GL_PACK_LSB_FIRST 0x0D01
+#define GL_PACK_ROW_LENGTH 0x0D02
+#define GL_PACK_SKIP_PIXELS 0x0D04
+#define GL_PACK_SKIP_ROWS 0x0D03
+#define GL_PACK_SWAP_BYTES 0x0D00
+#define GL_UNPACK_ALIGNMENT 0x0CF5
+#define GL_UNPACK_LSB_FIRST 0x0CF1
+#define GL_UNPACK_ROW_LENGTH 0x0CF2
+#define GL_UNPACK_SKIP_PIXELS 0x0CF4
+#define GL_UNPACK_SKIP_ROWS 0x0CF3
+#define GL_UNPACK_SWAP_BYTES 0x0CF0
+#define GL_ZOOM_X 0x0D16
+#define GL_ZOOM_Y 0x0D17
+#define GL_TEXTURE_ENV 0x2300
+#define GL_TEXTURE_ENV_MODE 0x2200
+#define GL_TEXTURE_1D 0x0DE0
+#define GL_TEXTURE_2D 0x0DE1
+#define GL_TEXTURE_WRAP_S 0x2802
+#define GL_TEXTURE_WRAP_T 0x2803
+#define GL_TEXTURE_MAG_FILTER 0x2800
+#define GL_TEXTURE_MIN_FILTER 0x2801
+#define GL_TEXTURE_ENV_COLOR 0x2201
+#define GL_TEXTURE_GEN_S 0x0C60
+#define GL_TEXTURE_GEN_T 0x0C61
+#define GL_TEXTURE_GEN_MODE 0x2500
+#define GL_TEXTURE_BORDER_COLOR 0x1004
+#define GL_TEXTURE_WIDTH 0x1000
+#define GL_TEXTURE_HEIGHT 0x1001
+#define GL_TEXTURE_BORDER 0x1005
+#define GL_TEXTURE_COMPONENTS 0x1003
+#define GL_TEXTURE_RED_SIZE 0x805C
+#define GL_TEXTURE_GREEN_SIZE 0x805D
+#define GL_TEXTURE_BLUE_SIZE 0x805E
+#define GL_TEXTURE_ALPHA_SIZE 0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE 0x8060
+#define GL_TEXTURE_INTENSITY_SIZE 0x8061
+#define GL_NEAREST_MIPMAP_NEAREST 0x2700
+#define GL_NEAREST_MIPMAP_LINEAR 0x2702
+#define GL_LINEAR_MIPMAP_NEAREST 0x2701
+#define GL_LINEAR_MIPMAP_LINEAR 0x2703
+#define GL_OBJECT_LINEAR 0x2401
+#define GL_OBJECT_PLANE 0x2501
+#define GL_EYE_LINEAR 0x2400
+#define GL_EYE_PLANE 0x2502
+#define GL_SPHERE_MAP 0x2402
+#define GL_DECAL 0x2101
+#define GL_MODULATE 0x2100
+#define GL_NEAREST 0x2600
+#define GL_REPEAT 0x2901
+#define GL_CLAMP 0x2900
+#define GL_S 0x2000
+#define GL_T 0x2001
+#define GL_R 0x2002
+#define GL_Q 0x2003
+#define GL_TEXTURE_GEN_R 0x0C62
+#define GL_TEXTURE_GEN_Q 0x0C63
+#define GL_VENDOR 0x1F00
+#define GL_RENDERER 0x1F01
+#define GL_VERSION 0x1F02
+#define GL_EXTENSIONS 0x1F03
+#define GL_NO_ERROR 0x0
+#define GL_INVALID_ENUM 0x0500
+#define GL_INVALID_VALUE 0x0501
+#define GL_INVALID_OPERATION 0x0502
+#define GL_STACK_OVERFLOW 0x0503
+#define GL_STACK_UNDERFLOW 0x0504
+#define GL_OUT_OF_MEMORY 0x0505
+#define GL_CURRENT_BIT 0x00000001
+#define GL_POINT_BIT 0x00000002
+#define GL_LINE_BIT 0x00000004
+#define GL_POLYGON_BIT 0x00000008
+#define GL_POLYGON_STIPPLE_BIT 0x00000010
+#define GL_PIXEL_MODE_BIT 0x00000020
+#define GL_LIGHTING_BIT 0x00000040
+#define GL_FOG_BIT 0x00000080
+#define GL_DEPTH_BUFFER_BIT 0x00000100
+#define GL_ACCUM_BUFFER_BIT 0x00000200
+#define GL_STENCIL_BUFFER_BIT 0x00000400
+#define GL_VIEWPORT_BIT 0x00000800
+#define GL_TRANSFORM_BIT 0x00001000
+#define GL_ENABLE_BIT 0x00002000
+#define GL_COLOR_BUFFER_BIT 0x00004000
+#define GL_HINT_BIT 0x00008000
+#define GL_EVAL_BIT 0x00010000
+#define GL_LIST_BIT 0x00020000
+#define GL_TEXTURE_BIT 0x00040000
+#define GL_SCISSOR_BIT 0x00080000
+#define GL_ALL_ATTRIB_BITS 0x000FFFFF
+#define GL_PROXY_TEXTURE_1D 0x8063
+#define GL_PROXY_TEXTURE_2D 0x8064
+#define GL_TEXTURE_PRIORITY 0x8066
+#define GL_TEXTURE_RESIDENT 0x8067
+#define GL_TEXTURE_BINDING_1D 0x8068
+#define GL_TEXTURE_BINDING_2D 0x8069
+#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
+#define GL_ALPHA4 0x803B
+#define GL_ALPHA8 0x803C
+#define GL_ALPHA12 0x803D
+#define GL_ALPHA16 0x803E
+#define GL_LUMINANCE4 0x803F
+#define GL_LUMINANCE8 0x8040
+#define GL_LUMINANCE12 0x8041
+#define GL_LUMINANCE16 0x8042
+#define GL_LUMINANCE4_ALPHA4 0x8043
+#define GL_LUMINANCE6_ALPHA2 0x8044
+#define GL_LUMINANCE8_ALPHA8 0x8045
+#define GL_LUMINANCE12_ALPHA4 0x8046
+#define GL_LUMINANCE12_ALPHA12 0x8047
+#define GL_LUMINANCE16_ALPHA16 0x8048
+#define GL_INTENSITY 0x8049
+#define GL_INTENSITY4 0x804A
+#define GL_INTENSITY8 0x804B
+#define GL_INTENSITY12 0x804C
+#define GL_INTENSITY16 0x804D
+#define GL_R3_G3_B2 0x2A10
+#define GL_RGB4 0x804F
+#define GL_RGB5 0x8050
+#define GL_RGB8 0x8051
+#define GL_RGB10 0x8052
+#define GL_RGB12 0x8053
+#define GL_RGB16 0x8054
+#define GL_RGBA2 0x8055
+#define GL_RGBA4 0x8056
+#define GL_RGB5_A1 0x8057
+#define GL_RGBA8 0x8058
+#define GL_RGB10_A2 0x8059
+#define GL_RGBA12 0x805A
+#define GL_RGBA16 0x805B
+#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002
+#define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF
+#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_CONSTANT_COLOR 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
+#define GL_CONSTANT_ALPHA 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_COLOR_TABLE 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
+#define GL_PROXY_COLOR_TABLE 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE 0x80D6
+#define GL_COLOR_TABLE_BIAS 0x80D7
+#define GL_COLOR_TABLE_FORMAT 0x80D8
+#define GL_COLOR_TABLE_WIDTH 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
+#define GL_CONVOLUTION_1D 0x8010
+#define GL_CONVOLUTION_2D 0x8011
+#define GL_SEPARABLE_2D 0x8012
+#define GL_CONVOLUTION_BORDER_MODE 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS 0x8015
+#define GL_REDUCE 0x8016
+#define GL_CONVOLUTION_FORMAT 0x8017
+#define GL_CONVOLUTION_WIDTH 0x8018
+#define GL_CONVOLUTION_HEIGHT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
+#define GL_CONSTANT_BORDER 0x8151
+#define GL_REPLICATE_BORDER 0x8153
+#define GL_CONVOLUTION_BORDER_COLOR 0x8154
+#define GL_COLOR_MATRIX 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
+#define GL_HISTOGRAM 0x8024
+#define GL_PROXY_HISTOGRAM 0x8025
+#define GL_HISTOGRAM_WIDTH 0x8026
+#define GL_HISTOGRAM_FORMAT 0x8027
+#define GL_HISTOGRAM_RED_SIZE 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
+#define GL_HISTOGRAM_SINK 0x802D
+#define GL_MINMAX 0x802E
+#define GL_MINMAX_FORMAT 0x802F
+#define GL_MINMAX_SINK 0x8030
+#define GL_TABLE_TOO_LARGE 0x8031
+#define GL_BLEND_EQUATION 0x8009
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
+#define GL_FUNC_ADD 0x8006
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_BLEND_COLOR 0x8005
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE3 0x84C3
+#define GL_TEXTURE4 0x84C4
+#define GL_TEXTURE5 0x84C5
+#define GL_TEXTURE6 0x84C6
+#define GL_TEXTURE7 0x84C7
+#define GL_TEXTURE8 0x84C8
+#define GL_TEXTURE9 0x84C9
+#define GL_TEXTURE10 0x84CA
+#define GL_TEXTURE11 0x84CB
+#define GL_TEXTURE12 0x84CC
+#define GL_TEXTURE13 0x84CD
+#define GL_TEXTURE14 0x84CE
+#define GL_TEXTURE15 0x84CF
+#define GL_TEXTURE16 0x84D0
+#define GL_TEXTURE17 0x84D1
+#define GL_TEXTURE18 0x84D2
+#define GL_TEXTURE19 0x84D3
+#define GL_TEXTURE20 0x84D4
+#define GL_TEXTURE21 0x84D5
+#define GL_TEXTURE22 0x84D6
+#define GL_TEXTURE23 0x84D7
+#define GL_TEXTURE24 0x84D8
+#define GL_TEXTURE25 0x84D9
+#define GL_TEXTURE26 0x84DA
+#define GL_TEXTURE27 0x84DB
+#define GL_TEXTURE28 0x84DC
+#define GL_TEXTURE29 0x84DD
+#define GL_TEXTURE30 0x84DE
+#define GL_TEXTURE31 0x84DF
+#define GL_ACTIVE_TEXTURE 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
+#define GL_MAX_TEXTURE_UNITS 0x84E2
+#define GL_NORMAL_MAP 0x8511
+#define GL_REFLECTION_MAP 0x8512
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
+#define GL_COMPRESSED_ALPHA 0x84E9
+#define GL_COMPRESSED_LUMINANCE 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
+#define GL_COMPRESSED_INTENSITY 0x84EC
+#define GL_COMPRESSED_RGB 0x84ED
+#define GL_COMPRESSED_RGBA 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
+#define GL_TEXTURE_COMPRESSED 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
+#define GL_MULTISAMPLE 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
+#define GL_SAMPLE_COVERAGE 0x80A0
+#define GL_SAMPLE_BUFFERS 0x80A8
+#define GL_SAMPLES 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
+#define GL_MULTISAMPLE_BIT 0x20000000
+#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
+#define GL_COMBINE 0x8570
+#define GL_COMBINE_RGB 0x8571
+#define GL_COMBINE_ALPHA 0x8572
+#define GL_SOURCE0_RGB 0x8580
+#define GL_SOURCE1_RGB 0x8581
+#define GL_SOURCE2_RGB 0x8582
+#define GL_SOURCE0_ALPHA 0x8588
+#define GL_SOURCE1_ALPHA 0x8589
+#define GL_SOURCE2_ALPHA 0x858A
+#define GL_OPERAND0_RGB 0x8590
+#define GL_OPERAND1_RGB 0x8591
+#define GL_OPERAND2_RGB 0x8592
+#define GL_OPERAND0_ALPHA 0x8598
+#define GL_OPERAND1_ALPHA 0x8599
+#define GL_OPERAND2_ALPHA 0x859A
+#define GL_RGB_SCALE 0x8573
+#define GL_ADD_SIGNED 0x8574
+#define GL_INTERPOLATE 0x8575
+#define GL_SUBTRACT 0x84E7
+#define GL_CONSTANT 0x8576
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PREVIOUS 0x8578
+#define GL_DOT3_RGB 0x86AE
+#define GL_DOT3_RGBA 0x86AF
+#define GL_CLAMP_TO_BORDER 0x812D
+#define GL_ARB_multitexture 1
+#define GL_TEXTURE0_ARB 0x84C0
+#define GL_TEXTURE1_ARB 0x84C1
+#define GL_TEXTURE2_ARB 0x84C2
+#define GL_TEXTURE3_ARB 0x84C3
+#define GL_TEXTURE4_ARB 0x84C4
+#define GL_TEXTURE5_ARB 0x84C5
+#define GL_TEXTURE6_ARB 0x84C6
+#define GL_TEXTURE7_ARB 0x84C7
+#define GL_TEXTURE8_ARB 0x84C8
+#define GL_TEXTURE9_ARB 0x84C9
+#define GL_TEXTURE10_ARB 0x84CA
+#define GL_TEXTURE11_ARB 0x84CB
+#define GL_TEXTURE12_ARB 0x84CC
+#define GL_TEXTURE13_ARB 0x84CD
+#define GL_TEXTURE14_ARB 0x84CE
+#define GL_TEXTURE15_ARB 0x84CF
+#define GL_TEXTURE16_ARB 0x84D0
+#define GL_TEXTURE17_ARB 0x84D1
+#define GL_TEXTURE18_ARB 0x84D2
+#define GL_TEXTURE19_ARB 0x84D3
+#define GL_TEXTURE20_ARB 0x84D4
+#define GL_TEXTURE21_ARB 0x84D5
+#define GL_TEXTURE22_ARB 0x84D6
+#define GL_TEXTURE23_ARB 0x84D7
+#define GL_TEXTURE24_ARB 0x84D8
+#define GL_TEXTURE25_ARB 0x84D9
+#define GL_TEXTURE26_ARB 0x84DA
+#define GL_TEXTURE27_ARB 0x84DB
+#define GL_TEXTURE28_ARB 0x84DC
+#define GL_TEXTURE29_ARB 0x84DD
+#define GL_TEXTURE30_ARB 0x84DE
+#define GL_TEXTURE31_ARB 0x84DF
+#define GL_ACTIVE_TEXTURE_ARB 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
+#define GL_MESA_shader_debug 1
+#define GL_DEBUG_OBJECT_MESA 0x8759
+#define GL_DEBUG_PRINT_MESA 0x875A
+#define GL_DEBUG_ASSERT_MESA 0x875B
+#define GL_MESA_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_MESA 0x8750
+#define GL_UNSIGNED_INT_24_8_MESA 0x8751
+#define GL_UNSIGNED_INT_8_24_REV_MESA 0x8752
+#define GL_UNSIGNED_SHORT_15_1_MESA 0x8753
+#define GL_UNSIGNED_SHORT_1_15_REV_MESA 0x8754
+#define GL_MESA_program_debug 1
+#define GL_FRAGMENT_PROGRAM_POSITION_MESA 0x8bb0
+#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA 0x8bb1
+#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA 0x8bb2
+#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA 0x8bb3
+#define GL_VERTEX_PROGRAM_POSITION_MESA 0x8bb4
+#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8bb5
+#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8bb6
+#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8bb7
+#define GL_ATI_blend_equation_separate 1
+#define GL_ALPHA_BLEND_EQUATION_ATI 0x883D
+
+inline void glClearIndex( GLfloat c ){};
+inline void glClearColor( GLclampf red, ... ){};
+inline void glClear( GLbitfield mask ){};
+inline void glIndexMask( GLuint mask ){};
+inline void glColorMask( GLboolean red, ... ){};
+inline void glAlphaFunc( GLenum func, ... ){};
+inline void glBlendFunc( GLenum sfactor, ... ){};
+inline void glLogicOp( GLenum opcode ){};
+inline void glCullFace( GLenum mode ){};
+inline void glFrontFace( GLenum mode ){};
+inline void glPointSize( GLfloat size ){};
+inline void glLineWidth( GLfloat width ){};
+inline void glLineStipple( GLint factor, ... ){};
+inline void glPolygonMode( GLenum face, ... ){};
+inline void glPolygonOffset( GLfloat factor, ... ){};
+inline void glPolygonStipple( const GLubyte *mask ){};
+inline void glGetPolygonStipple( GLubyte *mask ){};
+inline void glEdgeFlag( GLboolean flag ){};
+inline void glEdgeFlagv( const GLboolean *flag ){};
+inline void glScissor( GLint x, ... ){};
+inline void glClipPlane( GLenum plane, ... ){};
+inline void glGetClipPlane( GLenum plane, ... ){};
+inline void glDrawBuffer( GLenum mode ){};
+inline void glReadBuffer( GLenum mode ){};
+inline void glEnable( GLenum cap ){};
+inline void glDisable( GLenum cap ){};
+inline GLboolean glIsEnabled( GLenum cap ){};
+inline void glEnableClientState( GLenum cap ){}; /* 1.1 */
+inline void glDisableClientState( GLenum cap ){}; /* 1.1 */
+inline void glGetBooleanv( GLenum pname, ... ){};
+inline void glGetDoublev( GLenum pname, ... ){};
+inline void glGetFloatv( GLenum pname, ... ){};
+inline void glGetIntegerv( GLenum pname, ... ){};
+inline void glPushAttrib( GLbitfield mask ){};
+inline void glPopAttrib( void ){};
+inline void glPushClientAttrib( GLbitfield mask ){}; /* 1.1 */
+inline void glPopClientAttrib( void ){}; /* 1.1 */
+inline GLint glRenderMode( GLenum mode ){};
+inline GLenum glGetError( void ){};
+inline const GLubyte * glGetString( GLenum name ){};
+inline void glFinish( void ){};
+inline void glFlush( void ){};
+inline void glHint( GLenum target, ... ){};
+inline void glClearDepth( GLclampd depth ){};
+inline void glDepthFunc( GLenum func ){};
+inline void glDepthMask( GLboolean flag ){};
+inline void glDepthRange( GLclampd near_val, ... ){};
+inline void glClearAccum( GLfloat red, ... ){};
+inline void glAccum( GLenum op, ... ){};
+inline void glMatrixMode( GLenum mode ){};
+inline void glOrtho( GLdouble left, ... ){};
+inline void glFrustum( GLdouble left, ... ){};
+inline void glViewport( GLint x, ... ){};
+inline void glPushMatrix( void ){};
+inline void glPopMatrix( void ){};
+inline void glLoadIdentity( void ){};
+inline void glLoadMatrixd( const GLdouble *m ){};
+inline void glLoadMatrixf( const GLfloat *m ){};
+inline void glMultMatrixd( const GLdouble *m ){};
+inline void glMultMatrixf( const GLfloat *m ){};
+inline void glRotated( GLdouble angle, ... ){};
+inline void glRotatef( GLfloat angle, ... ){};
+inline void glScaled( GLdouble x, ... ){};
+inline void glScalef( GLfloat x, ... ){};
+inline void glTranslated( GLdouble x, ... ){};
+inline void glTranslatef( GLfloat x, ... ){};
+inline GLboolean glIsList( GLuint list ){};
+inline void glDeleteLists( GLuint list, ... ){};
+inline GLuint glGenLists( GLsizei range ){};
+inline void glNewList( GLuint list, ... ){};
+inline void glEndList( void ){};
+inline void glCallList( GLuint list ){};
+inline void glCallLists( GLsizei n, ... ){};
+inline void glListBase( GLuint base ){};
+inline void glBegin( GLenum mode ){};
+inline void glEnd( void ){};
+inline void glVertex2d( GLdouble x, ... ){};
+inline void glVertex2f( GLfloat x, ... ){};
+inline void glVertex2i( GLint x, ... ){};
+inline void glVertex2s( GLshort x, ... ){};
+inline void glVertex3d( GLdouble x, ... ){};
+inline void glVertex3f( GLfloat x, ... ){};
+inline void glVertex3i( GLint x, ... ){};
+inline void glVertex3s( GLshort x, ... ){};
+inline void glVertex4d( GLdouble x, ... ){};
+inline void glVertex4f( GLfloat x, ... ){};
+inline void glVertex4i( GLint x, ... ){};
+inline void glVertex4s( GLshort x, ... ){};
+inline void glVertex2dv( const GLdouble *v ){};
+inline void glVertex2fv( const GLfloat *v ){};
+inline void glVertex2iv( const GLint *v ){};
+inline void glVertex2sv( const GLshort *v ){};
+inline void glVertex3dv( const GLdouble *v ){};
+inline void glVertex3fv( const GLfloat *v ){};
+inline void glVertex3iv( const GLint *v ){};
+inline void glVertex3sv( const GLshort *v ){};
+inline void glVertex4dv( const GLdouble *v ){};
+inline void glVertex4fv( const GLfloat *v ){};
+inline void glVertex4iv( const GLint *v ){};
+inline void glVertex4sv( const GLshort *v ){};
+inline void glNormal3b( GLbyte nx, ... ){};
+inline void glNormal3d( GLdouble nx, ... ){};
+inline void glNormal3f( GLfloat nx, ... ){};
+inline void glNormal3i( GLint nx, ... ){};
+inline void glNormal3s( GLshort nx, ... ){};
+inline void glNormal3bv( const GLbyte *v ){};
+inline void glNormal3dv( const GLdouble *v ){};
+inline void glNormal3fv( const GLfloat *v ){};
+inline void glNormal3iv( const GLint *v ){};
+inline void glNormal3sv( const GLshort *v ){};
+inline void glIndexd( GLdouble c ){};
+inline void glIndexf( GLfloat c ){};
+inline void glIndexi( GLint c ){};
+inline void glIndexs( GLshort c ){};
+inline void glIndexub( GLubyte c ){}; /* 1.1 */
+inline void glIndexdv( const GLdouble *c ){};
+inline void glIndexfv( const GLfloat *c ){};
+inline void glIndexiv( const GLint *c ){};
+inline void glIndexsv( const GLshort *c ){};
+inline void glIndexubv( const GLubyte *c ){}; /* 1.1 */
+inline void glColor3b( GLbyte red, ... ){};
+inline void glColor3d( GLdouble red, ... ){};
+inline void glColor3f( GLfloat red, ... ){};
+inline void glColor3i( GLint red, ... ){};
+inline void glColor3s( GLshort red, ... ){};
+inline void glColor3ub( GLubyte red, ... ){};
+inline void glColor3ui( GLuint red, ... ){};
+inline void glColor3us( GLushort red, ... ){};
+inline void glColor4b( GLbyte red, ... ){};
+inline void glColor4d( GLdouble red, ... ){};
+inline void glColor4f( GLfloat red, ... ){};
+inline void glColor4i( GLint red, ... ){};
+inline void glColor4s( GLshort red, ... ){};
+inline void glColor4ub( GLubyte red, ... ){};
+inline void glColor4ui( GLuint red, ... ){};
+inline void glColor4us( GLushort red, ... ){};
+inline void glColor3bv( const GLbyte *v ){};
+inline void glColor3dv( const GLdouble *v ){};
+inline void glColor3fv( const GLfloat *v ){};
+inline void glColor3iv( const GLint *v ){};
+inline void glColor3sv( const GLshort *v ){};
+inline void glColor3ubv( const GLubyte *v ){};
+inline void glColor3uiv( const GLuint *v ){};
+inline void glColor3usv( const GLushort *v ){};
+inline void glColor4bv( const GLbyte *v ){};
+inline void glColor4dv( const GLdouble *v ){};
+inline void glColor4fv( const GLfloat *v ){};
+inline void glColor4iv( const GLint *v ){};
+inline void glColor4sv( const GLshort *v ){};
+inline void glColor4ubv( const GLubyte *v ){};
+inline void glColor4uiv( const GLuint *v ){};
+inline void glColor4usv( const GLushort *v ){};
+inline void glTexCoord1d( GLdouble s ){};
+inline void glTexCoord1f( GLfloat s ){};
+inline void glTexCoord1i( GLint s ){};
+inline void glTexCoord1s( GLshort s ){};
+inline void glTexCoord2d( GLdouble s, ... ){};
+inline void glTexCoord2f( GLfloat s, ... ){};
+inline void glTexCoord2i( GLint s, ... ){};
+inline void glTexCoord2s( GLshort s, ... ){};
+inline void glTexCoord3d( GLdouble s, ... ){};
+inline void glTexCoord3f( GLfloat s, ... ){};
+inline void glTexCoord3i( GLint s, ... ){};
+inline void glTexCoord3s( GLshort s, ... ){};
+inline void glTexCoord4d( GLdouble s, ... ){};
+inline void glTexCoord4f( GLfloat s, ... ){};
+inline void glTexCoord4i( GLint s, ... ){};
+inline void glTexCoord4s( GLshort s, ... ){};
+inline void glTexCoord1dv( const GLdouble *v ){};
+inline void glTexCoord1fv( const GLfloat *v ){};
+inline void glTexCoord1iv( const GLint *v ){};
+inline void glTexCoord1sv( const GLshort *v ){};
+inline void glTexCoord2dv( const GLdouble *v ){};
+inline void glTexCoord2fv( const GLfloat *v ){};
+inline void glTexCoord2iv( const GLint *v ){};
+inline void glTexCoord2sv( const GLshort *v ){};
+inline void glTexCoord3dv( const GLdouble *v ){};
+inline void glTexCoord3fv( const GLfloat *v ){};
+inline void glTexCoord3iv( const GLint *v ){};
+inline void glTexCoord3sv( const GLshort *v ){};
+inline void glTexCoord4dv( const GLdouble *v ){};
+inline void glTexCoord4fv( const GLfloat *v ){};
+inline void glTexCoord4iv( const GLint *v ){};
+inline void glTexCoord4sv( const GLshort *v ){};
+inline void glRasterPos2d( GLdouble x, ... ){};
+inline void glRasterPos2f( GLfloat x, ... ){};
+inline void glRasterPos2i( GLint x, ... ){};
+inline void glRasterPos2s( GLshort x, ... ){};
+inline void glRasterPos3d( GLdouble x, ... ){};
+inline void glRasterPos3f( GLfloat x, ... ){};
+inline void glRasterPos3i( GLint x, ... ){};
+inline void glRasterPos3s( GLshort x, ... ){};
+inline void glRasterPos4d( GLdouble x, ... ){};
+inline void glRasterPos4f( GLfloat x, ... ){};
+inline void glRasterPos4i( GLint x, ... ){};
+inline void glRasterPos4s( GLshort x, ... ){};
+inline void glRasterPos2dv( const GLdouble *v ){};
+inline void glRasterPos2fv( const GLfloat *v ){};
+inline void glRasterPos2iv( const GLint *v ){};
+inline void glRasterPos2sv( const GLshort *v ){};
+inline void glRasterPos3dv( const GLdouble *v ){};
+inline void glRasterPos3fv( const GLfloat *v ){};
+inline void glRasterPos3iv( const GLint *v ){};
+inline void glRasterPos3sv( const GLshort *v ){};
+inline void glRasterPos4dv( const GLdouble *v ){};
+inline void glRasterPos4fv( const GLfloat *v ){};
+inline void glRasterPos4iv( const GLint *v ){};
+inline void glRasterPos4sv( const GLshort *v ){};
+inline void glRectd( GLdouble x1, ... ){};
+inline void glRectf( GLfloat x1, ... ){};
+inline void glRecti( GLint x1, ... ){};
+inline void glRects( GLshort x1, ... ){};
+inline void glRectdv( const GLdouble *v1, ... ){};
+inline void glRectfv( const GLfloat *v1, ... ){};
+inline void glRectiv( const GLint *v1, ... ){};
+inline void glRectsv( const GLshort *v1, ... ){};
+inline void glVertexPointer( GLint size, ... ){};
+inline void glNormalPointer( GLenum type, ... ){};
+inline void glColorPointer( GLint size, ... ){};
+inline void glIndexPointer( GLenum type, ... ){};
+inline void glTexCoordPointer( GLint size, ... ){};
+inline void glEdgeFlagPointer( GLsizei stride, ... ){};
+inline void glGetPointerv( GLenum pname, ... ){};
+inline void glArrayElement( GLint i ){};
+inline void glDrawArrays( GLenum mode, ... ){};
+inline void glDrawElements( GLenum mode, ... ){};
+inline void glInterleavedArrays( GLenum format, ... ){};
+inline void glShadeModel( GLenum mode ){};
+inline void glLightf( GLenum light, ... ){};
+inline void glLighti( GLenum light, ... ){};
+inline void glLightfv( GLenum light, ... ){};
+inline void glLightiv( GLenum light, ... ){};
+inline void glGetLightfv( GLenum light, ... ){};
+inline void glGetLightiv( GLenum light, ... ){};
+inline void glLightModelf( GLenum pname, ... ){};
+inline void glLightModeli( GLenum pname, ... ){};
+inline void glLightModelfv( GLenum pname, ... ){};
+inline void glLightModeliv( GLenum pname, ... ){};
+inline void glMaterialf( GLenum face, ... ){};
+inline void glMateriali( GLenum face, ... ){};
+inline void glMaterialfv( GLenum face, ... ){};
+inline void glMaterialiv( GLenum face, ... ){};
+inline void glGetMaterialfv( GLenum face, ... ){};
+inline void glGetMaterialiv( GLenum face, ... ){};
+inline void glColorMaterial( GLenum face, ... ){};
+inline void glPixelZoom( GLfloat xfactor, ... ){};
+inline void glPixelStoref( GLenum pname, ... ){};
+inline void glPixelStorei( GLenum pname, ... ){};
+inline void glPixelTransferf( GLenum pname, ... ){};
+inline void glPixelTransferi( GLenum pname, ... ){};
+inline void glPixelMapfv( GLenum map, ... ){};
+inline void glPixelMapuiv( GLenum map, ... ){};
+inline void glPixelMapusv( GLenum map, ... ){};
+inline void glGetPixelMapfv( GLenum map, ... ){};
+inline void glGetPixelMapuiv( GLenum map, ... ){};
+inline void glGetPixelMapusv( GLenum map, ... ){};
+inline void glBitmap( GLsizei width, ... ){};
+inline void glReadPixels( GLint x, ... ){};
+inline void glDrawPixels( GLsizei width, ... ){};
+inline void glCopyPixels( GLint x, ... ){};
+inline void glStencilFunc( GLenum func, ... ){};
+inline void glStencilMask( GLuint mask ){};
+inline void glStencilOp( GLenum fail, ... ){};
+inline void glClearStencil( GLint s ){};
+inline void glTexGend( GLenum coord, ... ){};
+inline void glTexGenf( GLenum coord, ... ){};
+inline void glTexGeni( GLenum coord, ... ){};
+inline void glTexGendv( GLenum coord, ... ){};
+inline void glTexGenfv( GLenum coord, ... ){};
+inline void glTexGeniv( GLenum coord, ... ){};
+inline void glGetTexGendv( GLenum coord, ... ){};
+inline void glGetTexGenfv( GLenum coord, ... ){};
+inline void glGetTexGeniv( GLenum coord, ... ){};
+inline void glTexEnvf( GLenum target, ... ){};
+inline void glTexEnvi( GLenum target, ... ){};
+inline void glTexEnvfv( GLenum target, ... ){};
+inline void glTexEnviv( GLenum target, ... ){};
+inline void glGetTexEnvfv( GLenum target, ... ){};
+inline void glGetTexEnviv( GLenum target, ... ){};
+inline void glTexParameterf( GLenum target, ... ){};
+inline void glTexParameteri( GLenum target, ... ){};
+inline void glTexParameterfv( GLenum target, ... ){};
+inline void glTexParameteriv( GLenum target, ... ){};
+inline void glGetTexParameterfv( GLenum target, ... ){};
+inline void glGetTexParameteriv( GLenum target, ... ){};
+inline void glGetTexLevelParameterfv( GLenum target, ... ){};
+inline void glGetTexLevelParameteriv( GLenum target, ... ){};
+inline void glTexImage1D( GLenum target, ... ){};
+inline void glTexImage2D( GLenum target, ... ){};
+inline void glGetTexImage( GLenum target, ... ){};
+inline void glGenTextures( GLsizei n, ... ){};
+inline void glDeleteTextures( GLsizei n, ... ){};
+inline void glBindTexture( GLenum target, ... ){};
+inline void glPrioritizeTextures( GLsizei n, ... ){};
+inline GLboolean glAreTexturesResident( GLsizei n, ... ){};
+inline GLboolean glIsTexture( GLuint texture ){};
+inline void glTexSubImage1D( GLenum target, ... ){};
+inline void glTexSubImage2D( GLenum target, ... ){};
+inline void glCopyTexImage1D( GLenum target, ... ){};
+inline void glCopyTexImage2D( GLenum target, ... ){};
+inline void glCopyTexSubImage1D( GLenum target, ... ){};
+inline void glCopyTexSubImage2D( GLenum target, ... ){};
+inline void glMap1d( GLenum target, ... ){};
+inline void glMap1f( GLenum target, ... ){};
+inline void glMap2d( GLenum target, ... ){};
+inline void glMap2f( GLenum target, ... ){};
+inline void glGetMapdv( GLenum target, ... ){};
+inline void glGetMapfv( GLenum target, ... ){};
+inline void glGetMapiv( GLenum target, ... ){};
+inline void glEvalCoord1d( GLdouble u ){};
+inline void glEvalCoord1f( GLfloat u ){};
+inline void glEvalCoord1dv( const GLdouble *u ){};
+inline void glEvalCoord1fv( const GLfloat *u ){};
+inline void glEvalCoord2d( GLdouble u, ... ){};
+inline void glEvalCoord2f( GLfloat u, ... ){};
+inline void glEvalCoord2dv( const GLdouble *u ){};
+inline void glEvalCoord2fv( const GLfloat *u ){};
+inline void glMapGrid1d( GLint un, ... ){};
+inline void glMapGrid1f( GLint un, ... ){};
+inline void glMapGrid2d( GLint un, ... ){};
+inline void glMapGrid2f( GLint un, ... ){};
+inline void glEvalPoint1( GLint i ){};
+inline void glEvalPoint2( GLint i, ... ){};
+inline void glEvalMesh1( GLenum mode, ... ){};
+inline void glEvalMesh2( GLenum mode, ... ){};
+inline void glFogf( GLenum pname, ... ){};
+inline void glFogi( GLenum pname, ... ){};
+inline void glFogfv( GLenum pname, ... ){};
+inline void glFogiv( GLenum pname, ... ){};
+inline void glFeedbackBuffer( GLsizei size, ... ){};
+inline void glPassThrough( GLfloat token ){};
+inline void glSelectBuffer( GLsizei size, ... ){};
+inline void glInitNames( void ){};
+inline void glLoadName( GLuint name ){};
+inline void glPushName( GLuint name ){};
+inline void glPopName( void ){};
+inline void glDrawRangeElements( GLenum mode, ... ){};
+inline void glTexImage3D( GLenum target, ... ){};
+inline void glTexSubImage3D( GLenum target, ... ){};
+inline void glCopyTexSubImage3D( GLenum target, ... ){};
+inline void glColorTable( GLenum target, ... ){};
+inline void glColorSubTable( GLenum target, ... ){};
+inline void glColorTableParameteriv(GLenum target, ... ){};
+inline void glColorTableParameterfv(GLenum target, ... ){};
+inline void glCopyColorSubTable( GLenum target, ... ){};
+inline void glCopyColorTable( GLenum target, ... ){};
+inline void glGetColorTable( GLenum target, ... ){};
+inline void glGetColorTableParameterfv( GLenum target, ... ){};
+inline void glGetColorTableParameteriv( GLenum target, ... ){};
+inline void glBlendEquation( GLenum mode ){};
+inline void glBlendColor( GLclampf red, ... ){};
+inline void glHistogram( GLenum target, ... ){};
+inline void glResetHistogram( GLenum target ){};
+inline void glGetHistogram( GLenum target, ... ){};
+inline void glGetHistogramParameterfv( GLenum target, ... ){};
+inline void glGetHistogramParameteriv( GLenum target, ... ){};
+inline void glMinmax( GLenum target, ... ){};
+inline void glResetMinmax( GLenum target ){};
+inline void glGetMinmax( GLenum target, ... ){};
+inline void glGetMinmaxParameterfv( GLenum target, ... ){};
+inline void glGetMinmaxParameteriv( GLenum target, ... ){};
+inline void glConvolutionFilter1D( GLenum target, ... ){};
+inline void glConvolutionFilter2D( GLenum target, ... ){};
+inline void glConvolutionParameterf( GLenum target, ... ){};
+inline void glConvolutionParameterfv( GLenum target, ... ){};
+inline void glConvolutionParameteri( GLenum target, ... ){};
+inline void glConvolutionParameteriv( GLenum target, ... ){};
+inline void glCopyConvolutionFilter1D( GLenum target, ... ){};
+inline void glCopyConvolutionFilter2D( GLenum target, ... ){};
+inline void glGetConvolutionFilter( GLenum target, ... ){};
+inline void glGetConvolutionParameterfv( GLenum target, ... ){};
+inline void glGetConvolutionParameteriv( GLenum target, ... ){};
+inline void glSeparableFilter2D( GLenum target, ... ){};
+inline void glGetSeparableFilter( GLenum target, ... ){};
+inline void glActiveTexture( GLenum texture ){};
+inline void glClientActiveTexture( GLenum texture ){};
+inline void glCompressedTexImage1D( GLenum target, ... ){};
+inline void glCompressedTexImage2D( GLenum target, ... ){};
+inline void glCompressedTexImage3D( GLenum target, ... ){};
+inline void glCompressedTexSubImage1D( GLenum target, ... ){};
+inline void glCompressedTexSubImage2D( GLenum target, ... ){};
+inline void glCompressedTexSubImage3D( GLenum target, ... ){};
+inline void glGetCompressedTexImage( GLenum target, ... ){};
+inline void glMultiTexCoord1d( GLenum target, ... ){};
+inline void glMultiTexCoord1dv( GLenum target, ... ){};
+inline void glMultiTexCoord1f( GLenum target, ... ){};
+inline void glMultiTexCoord1fv( GLenum target, ... ){};
+inline void glMultiTexCoord1i( GLenum target, ... ){};
+inline void glMultiTexCoord1iv( GLenum target, ... ){};
+inline void glMultiTexCoord1s( GLenum target, ... ){};
+inline void glMultiTexCoord1sv( GLenum target, ... ){};
+inline void glMultiTexCoord2d( GLenum target, ... ){};
+inline void glMultiTexCoord2dv( GLenum target, ... ){};
+inline void glMultiTexCoord2f( GLenum target, ... ){};
+inline void glMultiTexCoord2fv( GLenum target, ... ){};
+inline void glMultiTexCoord2i( GLenum target, ... ){};
+inline void glMultiTexCoord2iv( GLenum target, ... ){};
+inline void glMultiTexCoord2s( GLenum target, ... ){};
+inline void glMultiTexCoord2sv( GLenum target, ... ){};
+inline void glMultiTexCoord3d( GLenum target, ... ){};
+inline void glMultiTexCoord3dv( GLenum target, ... ){};
+inline void glMultiTexCoord3f( GLenum target, ... ){};
+inline void glMultiTexCoord3fv( GLenum target, ... ){};
+inline void glMultiTexCoord3i( GLenum target, ... ){};
+inline void glMultiTexCoord3iv( GLenum target, ... ){};
+inline void glMultiTexCoord3s( GLenum target, ... ){};
+inline void glMultiTexCoord3sv( GLenum target, ... ){};
+inline void glMultiTexCoord4d( GLenum target, ... ){};
+inline void glMultiTexCoord4dv( GLenum target, ... ){};
+inline void glMultiTexCoord4f( GLenum target, ... ){};
+inline void glMultiTexCoord4fv( GLenum target, ... ){};
+inline void glMultiTexCoord4i( GLenum target, ... ){};
+inline void glMultiTexCoord4iv( GLenum target, ... ){};
+inline void glMultiTexCoord4s( GLenum target, ... ){};
+inline void glMultiTexCoord4sv( GLenum target, ... ){};
+inline void glLoadTransposeMatrixd( const GLdouble m[16] ){};
+inline void glLoadTransposeMatrixf( const GLfloat m[16] ){};
+inline void glMultTransposeMatrixd( const GLdouble m[16] ){};
+inline void glMultTransposeMatrixf( const GLfloat m[16] ){};
+inline void glSampleCoverage( GLclampf value, ... ){};
+inline void glActiveTextureARB(GLenum texture){};
+inline void glClientActiveTextureARB(GLenum texture){};
+inline void glMultiTexCoord1dARB(GLenum target, ... ){};
+inline void glMultiTexCoord1dvARB(GLenum target, ... ){};
+inline void glMultiTexCoord1fARB(GLenum target, ... ){};
+inline void glMultiTexCoord1fvARB(GLenum target, ... ){};
+inline void glMultiTexCoord1iARB(GLenum target, ... ){};
+inline void glMultiTexCoord1ivARB(GLenum target, ... ){};
+inline void glMultiTexCoord1sARB(GLenum target, ... ){};
+inline void glMultiTexCoord1svARB(GLenum target, ... ){};
+inline void glMultiTexCoord2dARB(GLenum target, ... ){};
+inline void glMultiTexCoord2dvARB(GLenum target, ... ){};
+inline void glMultiTexCoord2fARB(GLenum target, ... ){};
+inline void glMultiTexCoord2fvARB(GLenum target, ... ){};
+inline void glMultiTexCoord2iARB(GLenum target, ... ){};
+inline void glMultiTexCoord2ivARB(GLenum target, ... ){};
+inline void glMultiTexCoord2sARB(GLenum target, ... ){};
+inline void glMultiTexCoord2svARB(GLenum target, ... ){};
+inline void glMultiTexCoord3dARB(GLenum target, ... ){};
+inline void glMultiTexCoord3dvARB(GLenum target, ... ){};
+inline void glMultiTexCoord3fARB(GLenum target, ... ){};
+inline void glMultiTexCoord3fvARB(GLenum target, ... ){};
+inline void glMultiTexCoord3iARB(GLenum target, ... ){};
+inline void glMultiTexCoord3ivARB(GLenum target, ... ){};
+inline void glMultiTexCoord3sARB(GLenum target, ... ){};
+inline void glMultiTexCoord3svARB(GLenum target, ... ){};
+inline void glMultiTexCoord4dARB(GLenum target, ... ){};
+inline void glMultiTexCoord4dvARB(GLenum target, ... ){};
+inline void glMultiTexCoord4fARB(GLenum target, ... ){};
+inline void glMultiTexCoord4fvARB(GLenum target, ... ){};
+inline void glMultiTexCoord4iARB(GLenum target, ... ){};
+inline void glMultiTexCoord4ivARB(GLenum target, ... ){};
+inline void glMultiTexCoord4sARB(GLenum target, ... ){};
+inline void glMultiTexCoord4svARB(GLenum target, ... ){};
+/*
+GLhandleARB glCreateDebugObjectMESA (void){};
+void glClearDebugLogMESA (GLhandleARB obj, ... ){};
+void glGetDebugLogMESA (GLhandleARB obj, ... ){};
+GLsizei glGetDebugLogLengthMESA (GLhandleARB obj, ... ){};
+void glProgramCallbackMESA(GLenum target, ... ){};
+void glGetProgramRegisterfvMESA(GLenum target, ... ){};
+void glBlendEquationSeparateATI( GLenum modeRGB, ... ){};
+*/
+#endif // NULLGL_H
--- Overture.v24/include/nullglu.h 1969-12-31 19:00:00.000000000 -0500
+++ overture/include/nullglu.h 2011-07-31 12:16:53.000000000 -0400
@@ -0,0 +1,228 @@
+#ifndef NULLGLU_H
+#define NULLGLU_H
+
+typedef struct GLUnurbs GLUnurbs;
+typedef struct GLUquadric GLUquadric;
+typedef struct GLUtesselator GLUtesselator;
+typedef GLUnurbs GLUnurbsObj;
+typedef GLUquadric GLUquadricObj;
+typedef GLUtesselator GLUtesselatorObj;
+typedef GLUtesselator GLUtriangulatorObj;
+
+#define GLU_EXT_object_space_tess 1
+#define GLU_EXT_nurbs_tessellator 1
+#define GLU_FALSE 0
+#define GLU_TRUE 1
+#define GLU_VERSION_1_1 1
+#define GLU_VERSION_1_2 1
+#define GLU_VERSION_1_3 1
+#define GLU_VERSION 100800
+#define GLU_EXTENSIONS 100801
+#define GLU_INVALID_ENUM 100900
+#define GLU_INVALID_VALUE 100901
+#define GLU_OUT_OF_MEMORY 100902
+#define GLU_INCOMPATIBLE_GL_VERSION 100903
+#define GLU_INVALID_OPERATION 100904
+#define GLU_OUTLINE_POLYGON 100240
+#define GLU_OUTLINE_PATCH 100241
+#define GLU_NURBS_ERROR 100103
+#define GLU_ERROR 100103
+#define GLU_NURBS_BEGIN 100164
+#define GLU_NURBS_BEGIN_EXT 100164
+#define GLU_NURBS_VERTEX 100165
+#define GLU_NURBS_VERTEX_EXT 100165
+#define GLU_NURBS_NORMAL 100166
+#define GLU_NURBS_NORMAL_EXT 100166
+#define GLU_NURBS_COLOR 100167
+#define GLU_NURBS_COLOR_EXT 100167
+#define GLU_NURBS_TEXTURE_COORD 100168
+#define GLU_NURBS_TEX_COORD_EXT 100168
+#define GLU_NURBS_END 100169
+#define GLU_NURBS_END_EXT 100169
+#define GLU_NURBS_BEGIN_DATA 100170
+#define GLU_NURBS_BEGIN_DATA_EXT 100170
+#define GLU_NURBS_VERTEX_DATA 100171
+#define GLU_NURBS_VERTEX_DATA_EXT 100171
+#define GLU_NURBS_NORMAL_DATA 100172
+#define GLU_NURBS_NORMAL_DATA_EXT 100172
+#define GLU_NURBS_COLOR_DATA 100173
+#define GLU_NURBS_COLOR_DATA_EXT 100173
+#define GLU_NURBS_TEXTURE_COORD_DATA 100174
+#define GLU_NURBS_TEX_COORD_DATA_EXT 100174
+#define GLU_NURBS_END_DATA 100175
+#define GLU_NURBS_END_DATA_EXT 100175
+#define GLU_NURBS_ERROR1 100251
+#define GLU_NURBS_ERROR2 100252
+#define GLU_NURBS_ERROR3 100253
+#define GLU_NURBS_ERROR4 100254
+#define GLU_NURBS_ERROR5 100255
+#define GLU_NURBS_ERROR6 100256
+#define GLU_NURBS_ERROR7 100257
+#define GLU_NURBS_ERROR8 100258
+#define GLU_NURBS_ERROR9 100259
+#define GLU_NURBS_ERROR10 100260
+#define GLU_NURBS_ERROR11 100261
+#define GLU_NURBS_ERROR12 100262
+#define GLU_NURBS_ERROR13 100263
+#define GLU_NURBS_ERROR14 100264
+#define GLU_NURBS_ERROR15 100265
+#define GLU_NURBS_ERROR16 100266
+#define GLU_NURBS_ERROR17 100267
+#define GLU_NURBS_ERROR18 100268
+#define GLU_NURBS_ERROR19 100269
+#define GLU_NURBS_ERROR20 100270
+#define GLU_NURBS_ERROR21 100271
+#define GLU_NURBS_ERROR22 100272
+#define GLU_NURBS_ERROR23 100273
+#define GLU_NURBS_ERROR24 100274
+#define GLU_NURBS_ERROR25 100275
+#define GLU_NURBS_ERROR26 100276
+#define GLU_NURBS_ERROR27 100277
+#define GLU_NURBS_ERROR28 100278
+#define GLU_NURBS_ERROR29 100279
+#define GLU_NURBS_ERROR30 100280
+#define GLU_NURBS_ERROR31 100281
+#define GLU_NURBS_ERROR32 100282
+#define GLU_NURBS_ERROR33 100283
+#define GLU_NURBS_ERROR34 100284
+#define GLU_NURBS_ERROR35 100285
+#define GLU_NURBS_ERROR36 100286
+#define GLU_NURBS_ERROR37 100287
+#define GLU_AUTO_LOAD_MATRIX 100200
+#define GLU_CULLING 100201
+#define GLU_SAMPLING_TOLERANCE 100203
+#define GLU_DISPLAY_MODE 100204
+#define GLU_PARAMETRIC_TOLERANCE 100202
+#define GLU_SAMPLING_METHOD 100205
+#define GLU_U_STEP 100206
+#define GLU_V_STEP 100207
+#define GLU_NURBS_MODE 100160
+#define GLU_NURBS_MODE_EXT 100160
+#define GLU_NURBS_TESSELLATOR 100161
+#define GLU_NURBS_TESSELLATOR_EXT 100161
+#define GLU_NURBS_RENDERER 100162
+#define GLU_NURBS_RENDERER_EXT 100162
+#define GLU_OBJECT_PARAMETRIC_ERROR 100208
+#define GLU_OBJECT_PARAMETRIC_ERROR_EXT 100208
+#define GLU_OBJECT_PATH_LENGTH 100209
+#define GLU_OBJECT_PATH_LENGTH_EXT 100209
+#define GLU_PATH_LENGTH 100215
+#define GLU_PARAMETRIC_ERROR 100216
+#define GLU_DOMAIN_DISTANCE 100217
+#define GLU_MAP1_TRIM_2 100210
+#define GLU_MAP1_TRIM_3 100211
+#define GLU_POINT 100010
+#define GLU_LINE 100011
+#define GLU_FILL 100012
+#define GLU_SILHOUETTE 100013
+#define GLU_SMOOTH 100000
+#define GLU_FLAT 100001
+#define GLU_NONE 100002
+#define GLU_OUTSIDE 100020
+#define GLU_INSIDE 100021
+#define GLU_TESS_BEGIN 100100
+#define GLU_BEGIN 100100
+#define GLU_TESS_VERTEX 100101
+#define GLU_VERTEX 100101
+#define GLU_TESS_END 100102
+#define GLU_END 100102
+#define GLU_TESS_ERROR 100103
+#define GLU_TESS_EDGE_FLAG 100104
+#define GLU_EDGE_FLAG 100104
+#define GLU_TESS_COMBINE 100105
+#define GLU_TESS_BEGIN_DATA 100106
+#define GLU_TESS_VERTEX_DATA 100107
+#define GLU_TESS_END_DATA 100108
+#define GLU_TESS_ERROR_DATA 100109
+#define GLU_TESS_EDGE_FLAG_DATA 100110
+#define GLU_TESS_COMBINE_DATA 100111
+#define GLU_CW 100120
+#define GLU_CCW 100121
+#define GLU_INTERIOR 100122
+#define GLU_EXTERIOR 100123
+#define GLU_UNKNOWN 100124
+#define GLU_TESS_WINDING_RULE 100140
+#define GLU_TESS_BOUNDARY_ONLY 100141
+#define GLU_TESS_TOLERANCE 100142
+#define GLU_TESS_ERROR1 100151
+#define GLU_TESS_ERROR2 100152
+#define GLU_TESS_ERROR3 100153
+#define GLU_TESS_ERROR4 100154
+#define GLU_TESS_ERROR5 100155
+#define GLU_TESS_ERROR6 100156
+#define GLU_TESS_ERROR7 100157
+#define GLU_TESS_ERROR8 100158
+#define GLU_TESS_MISSING_BEGIN_POLYGON 100151
+#define GLU_TESS_MISSING_BEGIN_CONTOUR 100152
+#define GLU_TESS_MISSING_END_POLYGON 100153
+#define GLU_TESS_MISSING_END_CONTOUR 100154
+#define GLU_TESS_COORD_TOO_LARGE 100155
+#define GLU_TESS_NEED_COMBINE_CALLBACK 100156
+#define GLU_TESS_WINDING_ODD 100130
+#define GLU_TESS_WINDING_NONZERO 100131
+#define GLU_TESS_WINDING_POSITIVE 100132
+#define GLU_TESS_WINDING_NEGATIVE 100133
+#define GLU_TESS_WINDING_ABS_GEQ_TWO 100134
+#define GLU_TESS_MAX_COORD 1.0e150
+
+inline void gluBeginCurve (GLUnurbs* nurb){};
+inline void gluBeginPolygon (GLUtesselator* tess){};
+inline void gluBeginSurface (GLUnurbs* nurb){};
+inline void gluBeginTrim (GLUnurbs* nurb){};
+inline GLint gluBuild1DMipmapLevels (GLenum target, ... ){};
+inline GLint gluBuild1DMipmaps (GLenum target, ... ){};
+inline GLint gluBuild2DMipmapLevels (GLenum target, ... ){};
+inline GLint gluBuild2DMipmaps (GLenum target, ... ){};
+inline GLint gluBuild3DMipmapLevels (GLenum target, ... ){};
+inline GLint gluBuild3DMipmaps (GLenum target, ... ){};
+inline GLboolean gluCheckExtension (const GLubyte *extName, ... ){};
+inline void gluCylinder (GLUquadric* quad, ... ){};
+inline void gluDeleteNurbsRenderer (GLUnurbs* nurb){};
+inline void gluDeleteQuadric (GLUquadric* quad){};
+inline void gluDeleteTess (GLUtesselator* tess){};
+inline void gluDisk (GLUquadric* quad, ... ){};
+inline void gluEndCurve (GLUnurbs* nurb){};
+inline void gluEndPolygon (GLUtesselator* tess){};
+inline void gluEndSurface (GLUnurbs* nurb){};
+inline void gluEndTrim (GLUnurbs* nurb){};
+inline const GLubyte * gluErrorString (GLenum error){};
+inline void gluGetNurbsProperty (GLUnurbs* nurb, ... ){};
+inline const GLubyte * gluGetString (GLenum name){};
+inline void gluGetTessProperty (GLUtesselator* tess, ... ){};
+inline void gluLoadSamplingMatrices (GLUnurbs* nurb, ... ){};
+inline void gluLookAt (GLdouble eyeX, ... ){};
+inline GLUnurbs* gluNewNurbsRenderer (void){};
+inline GLUquadric* gluNewQuadric (void){};
+inline GLUtesselator* gluNewTess (void){};
+inline void gluNextContour (GLUtesselator* tess, ... ){};
+inline void gluNurbsCallback (GLUnurbs* nurb, ... ){};
+inline void gluNurbsCallbackData (GLUnurbs* nurb, ... ){};
+inline void gluNurbsCallbackDataEXT (GLUnurbs* nurb, ... ){};
+inline void gluNurbsCurve (GLUnurbs* nurb, ... ){};
+inline void gluNurbsProperty (GLUnurbs* nurb, ... ){};
+inline void gluNurbsSurface (GLUnurbs* nurb, ... ){};
+inline void gluOrtho2D (GLdouble left, ... ){};
+inline void gluPartialDisk (GLUquadric* quad, ... ){};
+inline void gluPerspective (GLdouble fovy, ... ){};
+inline void gluPickMatrix (GLdouble x, ... ){};
+inline GLint gluProject (GLdouble objX, ... ){};
+inline void gluPwlCurve (GLUnurbs* nurb, ... ){};
+inline void gluQuadricCallback (GLUquadric* quad, ... ){};
+inline void gluQuadricDrawStyle (GLUquadric* quad, ... ){};
+inline void gluQuadricNormals (GLUquadric* quad, ... ){};
+inline void gluQuadricOrientation (GLUquadric* quad, ... ){};
+inline void gluQuadricTexture (GLUquadric* quad, ... ){};
+inline GLint gluScaleImage (GLenum format, ... ){};
+inline void gluSphere (GLUquadric* quad, ... ){};
+inline void gluTessBeginContour (GLUtesselator* tess){};
+inline void gluTessBeginPolygon (GLUtesselator* tess, ... ){};
+inline void gluTessCallback (GLUtesselator* tess, ... ){};
+inline void gluTessEndContour (GLUtesselator* tess){};
+inline void gluTessEndPolygon (GLUtesselator* tess){};
+inline void gluTessNormal (GLUtesselator* tess, ... ){};
+inline void gluTessProperty (GLUtesselator* tess, ... ){};
+inline void gluTessVertex (GLUtesselator* tess, ... ){};
+inline GLint gluUnProject (GLdouble winX, ... ){};
+inline GLint gluUnProject4 (GLdouble winX, ... ){};
+
+#endif // NULLGLU_H
Other related posts:
