mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,155 Commits 30 Branches 53 Tags 339 MiB
bdcd5927d6
Commit Graph

69 Commits

Author SHA1 Message Date
Mikkel Krautz
f0ff84f6c0 Unify overlay code for Unix and OS X. 
This commit removes macx/overlay and merges
the OS X overlay into the Unix overlay in
overlay_gl.

Most of the overlay logic is exactly the same,
with most of the differences being in the
initialization code and the addition of few new
messages for the interactive client-in-overlay
feature that the OS X overlay suports.

The initialization code is factored out into
init_unix.c for Unix-likes and init_mac.c
for OS X.

These init files are #included by overlay.c.
That is, they're not separate translation
units. Doing it this way cuts down on the
total LOC count and overall complexity of the
code.

The interactive overlay support is ported
directly from the OS X overlay. It's mostly
a matter of supporting a few new message types:
OVERLAY_MSGTYPE_PID and OVERLAY_MSGTYPE_INTERACTIVE.

The overlay_gl.pro file in this commit is mostly
just a combination of the .pro files of the two
overlays, with a minor difference in the CFLAGS
for the OS X overlay. In old OS X overlay, the
overlay had an ".m" file extension, signalling
that it is an Objective-C source file to the
C compiler. Since the combined overlay has a
".c" extension, "-x objective-c" is added to
CFLAGS on OS X to tell the compiler to compile
the overlay as Objective-C code.
 2015-02-07 23:24:47 +01:00
Kissaki
a7d103f6b2 Fix indentation. Add curly braces according to coding style. 
* In one case, also split a long if statement into multiple lines
 2015-01-10 16:35:21 +01:00
scapula
6e9a7e7cb1 Disable vertex attrib arrays in overlay_gl (fixes #1298) 
This is a fix for the OpenGL overlay which disables
and enables the vertex attrib arrays inside drawContext.
The problem it fixes is that some games leave some of
the arrays enabled between frames, which I think
(not an OpenGL expert) causes the input to the vertex
shader to essentially be arbitrary.
 2014-10-15 22:33:54 +02:00
Mikkel Krautz
689f4c1847 Bump version to 1.3.0 2014-04-05 10:26:25 +02:00
Kissaki
07c78b1481 Refac: Use constant to check return value 
* mmap supposedly returns MAP_FAILED on errors, which is supposedly
defined in <sys/mman.h>, which is already being included in this file.
 2013-06-11 23:03:32 +02:00
Kissaki
f09e943b6c * Commenting, varnaming, fix indent 
* commenting and adjusting debug output
* more descriptive varnaming
 2013-06-11 23:03:31 +02:00
Mikkel Krautz
8632246f98 Bump version to 1.2.5 2013-06-08 23:41:51 +02:00
Thorvald Natvig
1ada87d5f2 Fix warnings in overlay_gl 2011-05-15 16:19:07 -07:00
Thorvald Natvig
f3437a6ba7 Update copyright year ranges of dev team. 2011-03-18 05:52:51 +01:00
Thorvald Natvig
064a5a3672 Bump version to 1.2.4 2011-02-20 05:12:02 +01:00
Mikkel Krautz
0f355bdade Only disable GL_TEXTURE_GEN_* if they're already enabled. Fixes black screen issue with EVE on OSX (via Cider) 2010-09-06 23:26:15 +02:00
Mikkel Krautz
1ac9afacab Unix/MacOSX overlay library: Tell OverlayClient when we've mapped SharedMemory so it can safely be released. 2010-08-31 20:09:31 +02:00
Stefan Hacker
11fda9bfcd Fix *nix OpenGL overlay and add FPS counter code to OSX overlay.m 2010-04-29 22:45:25 +02:00
Stefan Hacker
6380a88687 Transmit fps more often and represent them as float 2010-04-29 15:53:43 +02:00
Stefan Hacker
d8f1ac1115 Add an optional FPS counter to the overlay 2010-04-28 20:22:28 +02:00
Anton Romanov
ec7e78d175 in case GL_ARRAY_BUFFER is bound, store and reset it before rendering overlay and restore after 2010-04-18 02:04:16 +02:00
Thorvald Natvig
9fa00c3c1c Use premultiplied alpha textures 2010-03-01 03:14:31 +01:00
Thorvald Natvig
e31b2659de Bump version to 1.2.3 2010-02-10 13:28:16 +01:00
Mikkel Krautz
37430b152a Make sure to pop the whole GL error stack when cleaning up. 2010-02-04 01:06:56 +01:00
Thorvald Natvig
e0c6b91663 Only switch unpack buffer if we have to 2010-02-03 20:49:09 +01:00
Mikkel Krautz
6f2802032c Unbind PBO buffer before we draw our GL overlay. 2010-02-01 20:33:29 +01:00
Thorvald Natvig
c00b9bfe9e Socket-based linux overlay 2010-01-25 16:46:23 +01:00
Thorvald Natvig
3a2280f9d3 Bump version to 1.2.2 2010-01-10 18:12:18 +01:00
Thorvald Natvig
16339bfc91 Update license to 2010 2010-01-05 08:49:22 +01:00
Thorvald Natvig
f0298e366e Bump version to 1.2.1 2009-12-11 12:33:23 +01:00
Thorvald Natvig
ff4057b6a1 Try to promote libGL.so to global scope if we can't resolve it directly 2009-12-01 12:45:41 +01:00
Ludwig Nussel
7dae3ed25a silence integer/pointer cast warning 
lm->l_addr is an unsigned integer of the correct size so false
positive in this case
 2009-11-10 16:46:42 +01:00
Thorvald Natvig
b831cfc8f9 Bump version to 1.2.0 2009-03-23 00:38:10 +01:00
Thorvald Natvig
6ef0a0cae1 Indent 2009-03-01 22:01:30 +01:00
Thorvald Natvig
9ea9089cb1 Handle lost textures 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1578 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-02-24 14:57:31 +00:00
Thorvald Natvig
ada905642a Update vertex shader 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1577 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-02-24 00:33:12 +00:00
Thorvald Natvig
db3c781766 Update Linux overlay to guess window size on GLX<1.2 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1576 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-02-23 23:27:25 +00:00
Thorvald Natvig
5de1027072 Shader-based OpenGL same-context linux overlay, with ELF linkmap iteration 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1568 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-02-22 01:42:13 +00:00
Thorvald Natvig
b0aea9f90e Fix LFLAGS_ADD 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1528 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-02-13 15:19:53 +00:00
Thorvald Natvig
dd82270982 Add support for building 32-bit library on amd64 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1527 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-02-13 14:29:25 +00:00
Thorvald Natvig
6fc929eb5f Fix typo; the overlay isn't speex 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1526 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-02-13 13:49:55 +00:00
Thorvald Natvig
a3a362d040 Version bump 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1485 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-01-29 23:17:04 +00:00
Thorvald Natvig
695074fbff Multiapp overlay for *nix 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1444 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-01-17 03:04:13 +00:00
Thorvald Natvig
ad2b8e2149 Update copyright for 2009 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1380 05730e5d-ab1b-0410-a4ac-84af385074fa
 2009-01-05 15:12:48 +00:00
Thorvald Natvig
e94da5fc96 Version bump 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1310 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-09-13 19:32:57 +00:00
Thorvald Natvig
2bceafaf50 Version bump 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1299 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-09-08 14:13:05 +00:00
Thorvald Natvig
f4064dfe8d Statically compiled and linked ICE for static server. 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1233 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-08-21 13:01:53 +00:00
Thorvald Natvig
5da1ea3ea4 Version bump 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1159 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-05-11 00:22:13 +00:00
Thorvald Natvig
7d873031e9 Indenting 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1109 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-04-25 16:48:54 +00:00
Thorvald Natvig
625825dfa9 Add UID to shared memory and semaphore names on *nix, to allow multiple users at the same time. 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1101 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-04-22 14:44:46 +00:00
Thorvald Natvig
71146842cc Bump version to 1.1.4 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1031 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-03-22 00:28:37 +00:00
Thorvald Natvig
e93c194397 Indenting run 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1019 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-03-20 14:26:20 +00:00
Thorvald Natvig
b5a49637d3 Add version checking to overlay 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@976 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-03-11 17:53:06 +00:00
Thorvald Natvig
401dc37fe3 Major packaging cleanups. Getting ready for 1.1.3 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@942 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-02-21 16:33:51 +00:00
Thorvald Natvig
5235be7f6a Work around bug in newer debian 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@915 05730e5d-ab1b-0410-a4ac-84af385074fa
 2008-01-12 14:25:59 +00:00