TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

support multisamples properly

Browse Source
This commit is contained in:
David Rose 2009-03-11 23:26:47 +00:00
parent 4a70282208
commit 64a8ebfb02
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
panda/src/osxdisplay/osxGraphicsStateGuardian.cxx
View File

@ -47,11 +47,6 @@ get_extension_func(const char *prefix, const char *name) {
symbol = NSLookupAndBindSymbol (fullname.c_str());
}
if (osxdisplay_cat.is_debug()) {
osxdisplay_cat.debug()
<< "Looking up symbol " << fullname << "\n" ;
}
return symbol ? NSAddressOfSymbol(symbol) : NULL;
}
@ -68,7 +63,7 @@ osxGraphicsStateGuardian(GraphicsEngine *engine, GraphicsPipe *pipe,
_aglPixFmt(NULL),
_aglcontext(NULL)
{
SharedBuffer = 1011;
_shared_buffer = 1011;
get_gamma_table();
}
@ -215,8 +210,13 @@ build_gl(bool full_screen, bool pbuffer, FrameBufferProperties &fb_props) {
attrib.push_back(fb_props.get_depth_bits());
attrib.push_back(AGL_STENCIL_SIZE);
attrib.push_back(fb_props.get_stencil_bits());
attrib.push_back(AGL_SAMPLES_ARB);
attrib.push_back(fb_props.get_multisamples());
if (fb_props.get_multisamples() != 0) {
attrib.push_back(AGL_MULTISAMPLE);
attrib.push_back(AGL_SAMPLE_BUFFERS_ARB);
attrib.push_back(1);
attrib.push_back(AGL_SAMPLES_ARB);
attrib.push_back(fb_props.get_multisamples());
}
if (fb_props.is_stereo()) {
attrib.push_back(AGL_STEREO);
@ -247,29 +247,29 @@ build_gl(bool full_screen, bool pbuffer, FrameBufferProperties &fb_props) {
// build context
_aglcontext = NULL;
_aglPixFmt = aglChoosePixelFormat(&display, 1, &attrib[0]);
err = report_agl_error ("aglChoosePixelFormat");
err = report_agl_error("aglChoosePixelFormat");
if (_aglPixFmt) {
if(_share_with == NULL) {
_aglcontext = aglCreateContext(_aglPixFmt, NULL);
} else {
_aglcontext = aglCreateContext(_aglPixFmt, ((osxGraphicsStateGuardian *)_share_with)->_aglcontext);
}
err = report_agl_error ("aglCreateContext");
err = report_agl_error("aglCreateContext");
if (_aglcontext == NULL) {
osxdisplay_cat.error()
<< "osxGraphicsStateGuardian::buildG Error Getting Gl Context \n" ;
<< "osxGraphicsStateGuardian::build_gl Error Getting GL Context \n" ;
if(err == noErr) {
err = -1;
}
} else {
aglSetInteger (_aglcontext, AGL_BUFFER_NAME, &SharedBuffer);
aglSetInteger(_aglcontext, AGL_BUFFER_NAME, &_shared_buffer);
err = report_agl_error("aglSetInteger AGL_BUFFER_NAME");
}
} else {
osxdisplay_cat.error()
<< "osxGraphicsStateGuardian::buildG Error Getting Pixel Format\n" ;
<< "osxGraphicsStateGuardian::build_gl Error Getting Pixel Format\n" ;
osxdisplay_cat.error()
<< fb_props << "\n";
if(err == noErr) {

14
panda/src/osxdisplay/osxGraphicsStateGuardian.h
View File

@ -18,7 +18,7 @@
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <AGL/agl.h>
#include "pandabase.h"
#include "glgsg.h"
@ -45,15 +45,15 @@ public:
bool set_gamma(float gamma);
void atexit_function();
void restore_gamma();
protected:
virtual void *get_extension_func(const char *prefix, const char *name);
public:
OSStatus build_gl(bool full_screen, bool pbuffer, FrameBufferProperties &fb_props);
AGLContext get_context(void) { return _aglcontext; };
AGLContext get_context() { return _aglcontext; };
const AGLPixelFormat get_agl_pixel_format() const { return _aglPixFmt; };
const AGLPixelFormat get_agl_pixel_format() const { return _aglPixFmt; };
private:
void describe_pixel_format(FrameBufferProperties &fb_props);
@ -62,8 +62,8 @@ private:
// context with, since we don't create our own context in the
// constructor.
PT(osxGraphicsStateGuardian) _share_with;
AGLPixelFormat _aglPixFmt;
AGLContext _aglcontext;
AGLPixelFormat _aglPixFmt;
AGLContext _aglcontext;
CGGammaValue _gOriginalRedTable[ 256 ];
CGGammaValue _gOriginalGreenTable[ 256 ];
CGGammaValue _gOriginalBlueTable[ 256 ];
@ -71,7 +71,7 @@ private:
CGDisplayErr _cgErr;
public:
GLint SharedBuffer;
GLint _shared_buffer;
public:
static TypeHandle get_class_type() {

18
panda/src/osxdisplay/osxGraphicsWindow.mm
View File

@ -568,14 +568,14 @@ release_system_resources() {
}
if (_osx_window != NULL) {
SetWRefCon (_osx_window, (long int) NULL);
HideWindow (_osx_window);
SetWRefCon(_osx_window, (long int) NULL);
HideWindow(_osx_window);
DisposeWindow(_osx_window);
_osx_window = NULL;
}
if (_holder_aglcontext) {
aglDestroyContext (_holder_aglcontext);
aglDestroyContext(_holder_aglcontext);
_holder_aglcontext = NULL;
}
@ -714,7 +714,7 @@ build_gl(bool full_screen) {
OSStatus err = noErr;
if (osxgsg->get_agl_pixel_format()) {
_holder_aglcontext = aglCreateContext(osxgsg->get_agl_pixel_format(),NULL);
_holder_aglcontext = aglCreateContext(osxgsg->get_agl_pixel_format(), NULL);
err = report_agl_error("aglCreateContext");
if (_holder_aglcontext == NULL) {
@ -724,7 +724,7 @@ build_gl(bool full_screen) {
err = -1;
}
} else {
aglSetInteger(_holder_aglcontext, AGL_BUFFER_NAME, &osxgsg->SharedBuffer);
aglSetInteger(_holder_aglcontext, AGL_BUFFER_NAME, &osxgsg->_shared_buffer);
err = report_agl_error ("aglSetInteger AGL_BUFFER_NAME");
}
} else {
@ -1216,8 +1216,8 @@ os_open_window(WindowProperties &req_properties) {
osxdisplay_cat.error()
<< "Error in build_gl\n";
HideWindow (_osx_window);
SetWRefCon (_osx_window, (long int) NULL);
HideWindow(_osx_window);
SetWRefCon(_osx_window, (long int) NULL);
DisposeWindow(_osx_window);
_osx_window = NULL;
return false;
@ -1227,10 +1227,10 @@ os_open_window(WindowProperties &req_properties) {
<< "build_gl complete, set properties\n";
//
// atach the holder context to the window..
// attach the holder context to the window..
//
if (!aglSetDrawable(_holder_aglcontext, GetWindowPort (_osx_window))) {
if (!aglSetDrawable(_holder_aglcontext, GetWindowPort(_osx_window))) {
err = report_agl_error("aglSetDrawable");
}