Skip to content

Commit

Permalink
Don't include Sun Ray code on MacOS
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://svn.code.sf.net/p/virtualgl/code/branches/2.0.x@1323 799e4f7b-5fd2-41f6-823c-2ecc41bc7f0b
  • Loading branch information
dcommander committed Nov 21, 2006
1 parent 227f72f commit 5992116
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions rr/pbwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,12 @@ void pbwin::readback(GLint drawbuf, bool force, bool sync)
#endif

fconfig.sunray=false;
#if defined(sun)||defined(linux)
if(_sunrayhandle)
{
RRSunRayDestroy(_sunrayhandle); _sunrayhandle=NULL;
}
#endif
if(compress==RRCOMP_DEFAULT)
{
const char *dstr=DisplayString(_windpy);
Expand Down Expand Up @@ -414,8 +416,12 @@ void pbwin::readback(GLint drawbuf, bool force, bool sync)
rrfb *b;
if(!_blitter) errifnot(_blitter=new rrblitter());
if(fconfig.spoil && !_blitter->frameready() && !force) return;
#if defined(sun)||defined(linux)
errifnot(b=_blitter->getbitmap(_windpy, _win, pbw, pbh,
_usesunray==RRSUNRAY_NOT));
#else
errifnot(b=_blitter->getbitmap(_windpy, _win, pbw, pbh, true));
#endif
b->_flags|=RRBMP_BOTTOMUP;
int format;
unsigned char *bits=b->_bits;
Expand Down

0 comments on commit 5992116

Please sign in to comment.