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

Committing in .

Browse Source 
Modified Files:
 	Mesa/include/GL/glx.h Mesa/include/GL/xmesa.h
 	Mesa/src/descrip.mms Mesa/src/X/glxheader.h
 	Mesa/src/X/xfonts.c Mesa/src/X/xfonts.h
 	Mesa/src-glu/descrip.mms Mesa/src-glut/capturexfont.c
 	Mesa/src-glut/descrip.mms Mesa/src-glut/glut_cmap.c
 	Mesa/src-glut/glut_event.c Mesa/src-glut/glut_fullscrn.c
 	Mesa/src-glut/glut_gamemode.c Mesa/src-glut/glut_init.c
 	Mesa/src-glut/glut_input.c Mesa/src-glut/glut_menu.c
 	Mesa/src-glut/glut_menu2.c Mesa/src-glut/glut_overlay.c
 	Mesa/src-glut/glut_win.c Mesa/src-glut/glut_winmisc.c
 	Mesa/src-glut/glutint.h Mesa/src-glut/layerutil.h
 	Mesa/vms/analyze_map.com
 Added Files:
 	Mesa/include/GL/vms_x_fix.h

 Patches effective on VMS only. This allows for compiling with
 /name=(as_is,short). This breaks the binary compatibility with previous
 versions for VMS, but is the only way to combine Mesa with GTK for VMS.


                      Jouk
----------------------------------------------------------------------
This commit is contained in:
Jouk Jansen
2000-08-22 13:31:00 +00:00
parent f4f4dab25a
commit b5b5c52034
23 changed files with 123 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/GL/glx.h
View File

@@ -1,4 +1,4 @@
/* $Id: glx.h,v 1.22 2000/06/23 17:39:18 brianp Exp $ */
/* $Id: glx.h,v 1.23 2000/08/22 13:31:00 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -30,6 +30,7 @@
#ifdef __VMS
#include <GL/vms_x_fix.h>
# ifdef __cplusplus
/* VMS Xlib.h gives problems with C++.
* this avoids a bunch of trivial warnings */

43
include/GL/vms_x_fix.h Normal file
View File

@@ -0,0 +1,43 @@
/***************************************************************************
* *
* Repair definitions of Xlib when compileing with /name=(as_is) on VMS *
* You'll need the PORTING_LIBRARY (get it from Compaq) installed *
* *
* Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl) *
* *
* Last revision : 22 August 2000 *
* *
***************************************************************************/
#ifndef VMS_X_FIX
#define VMS_X_FIX
#ifdef __cplusplus
#define VMS_BEGIN_C_PLUS_PLUS extern "C" {
#define VMS_END_C_PLUS_PLUS }
#else
#define VMS_BEGIN_C_PLUS_PLUS
#define VMS_END_C_PLUS_PLUS
#endif
#include <motif_redefines.h>
#define XQueryFont XQUERYFONT
#define XSetPlaneMask XSETPLANEMASK
#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL
#define XDestroySubwindows XDESTROYSUBWINDOWS
#define XFreeDeviceList XFREEDEVICELIST
#define XFreeDeviceState XFREEDEVICESTATE
#define XGetExtensionVersion XGETEXTENSIONVERSION
#define XGetRGBColormaps XGETRGBCOLORMAPS
#define XIconifyWindow XICONIFYWINDOW
#define XInstallColormap XINSTALLCOLORMAP
#define XListInputDevices XLISTINPUTDEVICES
#define XLookupKeysym XLOOKUPKEYSYM
#define XOpenDevice XOPENDEVICE
#define XQueryDeviceState XQUERYDEVICESTATE
#define XSelectExtensionEvent XSELECTEXTENSIONEVENT
#define XWarpPointer XWARPPOINTER
#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
#endif

6
include/GL/xmesa.h
View File

@@ -1,4 +1,4 @@
/* $Id: xmesa.h,v 1.8 2000/05/02 02:30:01 brianp Exp $ */
/* $Id: xmesa.h,v 1.9 2000/08/22 13:31:01 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -67,12 +67,14 @@ See the demos/xdemo.c and xmesa1.c files for examples.
#ifndef XMESA_H
#define XMESA_H
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
#ifdef XFree86Server
#include "xmesa_xf86.h"
#else

2
src/glu/mesa/descrip.mms
View File

@@ -12,7 +12,7 @@ VPATH = RCS
INCDIR = $disk2:[-.include]
LIBDIR = [-.lib]
CFLAGS = /include=$(INCDIR)/define=(FBIND=1)
CFLAGS = /include=$(INCDIR)/define=(FBIND=1)/name=(as_is,short)
SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \
polytest.c project.c quadric.c tess.c tesselat.c

4
src/glut/glx/capturexfont.c
View File

@@ -10,6 +10,10 @@
encoding the font for GLUT's use. Example usage:
capturexfont.c 9x15 glutBitmap9By15 > glut_9x15.c */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

2
src/glut/glx/descrip.mms
View File

@@ -14,7 +14,7 @@ VPATH = RCS
INCDIR = [-.include]
LIBDIR = [-.lib]
CFLAGS = /nowarn/include=$(INCDIR)/prefix=all
CFLAGS = /nowarn/include=$(INCDIR)/prefix=all/name=(as_is,short)
SOURCES = \
glut_8x13.c \

4
src/glut/glx/glut_cmap.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h> /* SunOS multithreaded assert() needs <stdio.h>. Lame. */

4
src/glut/glx/glut_event.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>

4
src/glut/glx/glut_fullscrn.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdio.h> /* SunOS multithreaded assert() needs <stdio.h>. Lame. */
#include <assert.h>

4
src/glut/glx/glut_gamemode.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>

4
src/glut/glx/glut_init.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>

4
src/glut/glx/glut_input.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>

4
src/glut/glx/glut_menu.c
View File

@@ -9,6 +9,10 @@
the menuing functionality implemented. This file is used only by
the X Window System version of GLUT. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>

4
src/glut/glx/glut_menu2.c
View File

@@ -12,6 +12,10 @@
the menuing functionality implemented. This file is used only by
the X Window System version of GLUT. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>

4
src/glut/glx/glut_overlay.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

4
src/glut/glx/glut_win.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

4
src/glut/glx/glut_winmisc.c
View File

@@ -5,6 +5,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

4
src/glut/glx/glutint.h
View File

@@ -7,6 +7,10 @@
and is provided without guarantee or warrantee expressed or
implied. This program is -not- in the public domain. */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#if defined(__CYGWIN32__)
#include <sys/time.h>
#endif

4
src/glut/glx/layerutil.h
View File

@@ -9,6 +9,10 @@
/* Based on XLayerUtil.h: Revision: 1.3 */
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#if !defined(_WIN32)
#include <X11/Xlib.h>
#include <X11/Xutil.h>

5
src/mesa/drivers/x11/glxheader.h
View File

@@ -1,4 +1,4 @@
/* $Id: glxheader.h,v 1.1 1999/11/11 01:29:28 brianp Exp $ */
/* $Id: glxheader.h,v 1.2 2000/08/22 13:31:04 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -28,6 +28,9 @@
#ifndef GLX_HEADER_H
#define GLX_HEADER_H
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#ifdef HAVE_CONFIG_H
#include "conf.h"

5
src/mesa/drivers/x11/xfonts.c
View File

@@ -1,4 +1,4 @@
/* $Id: xfonts.c,v 1.8 2000/08/13 03:57:21 brianp Exp $ */
/* $Id: xfonts.c,v 1.9 2000/08/22 13:31:04 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -29,6 +29,9 @@
* Copyright (C) 1995 Thorsten.Ohl @ Physik.TH-Darmstadt.de
*/
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#ifdef HAVE_CONFIG_H
#include "conf.h"

5
src/mesa/drivers/x11/xfonts.h
View File

@@ -1,4 +1,4 @@
/* $Id: xfonts.h,v 1.1 2000/04/19 01:44:02 brianp Exp $ */
/* $Id: xfonts.h,v 1.2 2000/08/22 13:31:04 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -28,6 +28,9 @@
#ifndef XFONTS_H
#define XFONTS_H
#ifdef __VMS
#include <GL/vms_x_fix.h>
#endif
#include <X11/Xlib.h>

8
src/mesa/main/descrip.mms
View File

@@ -1,6 +1,6 @@
# Makefile for core library for VMS
# contributed by Jouk Jansen joukj@crys.chem.uva.nl
# Last revision : 3 May 1999
# Last revision : 22 August 2000
.first
define gl [-.include.gl]
@@ -13,11 +13,11 @@ VPATH = RCS
INCDIR = [-.include]
LIBDIR = [-.lib]
CFLAGS = /include=($(INCDIR),[])/define=(FBIND=1)
CFLAGS = /include=($(INCDIR),[])/define=(FBIND=1)/name=(as_is,short)
CORE_SOURCES = aatriangle.c accum.c alpha.c alphabuf.c attrib.c \
bitmap.c blend.c buffers.c clip.c colortab.c context.c copypix.c depth.c \
dispatch.c \
dispatch.c convolve.c \
dlist.c drawpix.c enable.c eval.c feedback.c fog.c \
get.c hash.c hint.c image.c imaging.c light.c lines.c logic.c masking.c matrix.c \
mem.c glapi.c glapinoop.c \
@@ -51,7 +51,7 @@ mmath.obj,pb.obj,pixel.obj,points.obj
OBJECTS7=polygon.obj,\
quads.obj,rastpos.obj,readpix.obj,rect.obj,scissor.obj,shade.obj,span.obj,\
pixeltex.obj
pixeltex.obj,convolve.obj
OBJECTS4=stencil.obj,teximage.obj,texobj.obj,texstate.obj,texture.obj,translate.obj,\
triangle.obj,varray.obj,winpos.obj,vb.obj,vbcull.obj,vbfill.obj,vbrender.obj