diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-19 10:16:14 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-19 10:16:14 +0200 |
| commit | 014365877282512eb0e0901e22b523b518dcb308 (patch) | |
| tree | fa7302cc2b4313063214a5d9379e061f8d4ee5fd /nx-X11/programs/Xserver | |
| parent | 4f216e7cf7571885f2995433580c9a3ec068eef4 (diff) | |
| parent | 123fb7fe7fe2e651a7f1cd36f02abe3ba74af704 (diff) | |
| download | nx-libs-014365877282512eb0e0901e22b523b518dcb308.tar.gz nx-libs-014365877282512eb0e0901e22b523b518dcb308.tar.bz2 nx-libs-014365877282512eb0e0901e22b523b518dcb308.zip | |
Merge branch 'frantracer-mesa-squash-subtree' into 3.6.x
Attributes GH PR #467: https://github.com/ArcticaProject/nx-libs/pull/467
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/include/GL/xf86glx.h | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h | 27 |
3 files changed, 33 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h new file mode 100644 index 000000000..2f7cff193 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h @@ -0,0 +1,5 @@ +/* no-op file to make current Mesa happy */ + +#ifndef _glx_ansic_h_ +#define _glx_ansic_h_ +#endif diff --git a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h new file mode 100644 index 000000000..5ddc70a15 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h @@ -0,0 +1 @@ +/* no-op file to make current Mesa happy */ diff --git a/nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h b/nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h new file mode 100644 index 000000000..bf6ea040c --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/main/WSDrawBuffer.h @@ -0,0 +1,27 @@ +/**************************************************************************/ +/* */ +/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */ +/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */ +/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/ +/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */ +/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */ +/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */ +/* */ +/* NXAGENT, NX protocol compression and NX extensions to this software */ +/* are copyright of the aforementioned persons and companies. */ +/* */ +/* Redistribution and use of the present software is allowed according */ +/* to terms specified in the file LICENSE which comes in the source */ +/* distribution. */ +/* */ +/* All rights reserved. */ +/* */ +/**************************************************************************/ + +typedef struct _WSDrawBufferRec { + GLframebuffer *DrawBuffer; + struct _WSDrawBufferRec *next; +} WSDrawBufferRec, *WSDrawBufferPtr; + +WSDrawBufferPtr pWSDrawBuffer; + |