3da6b9c14f
This fixes a missing include in qt/nonownedwnd.cpp and a missing method in qt/glcanvas.cpp, allowing the build to complete again. A number of missing wxOVERRIDE statements were added to reduce the important number of compiler warnings about those missing labels.
513 lines
12 KiB
C++
513 lines
12 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/qt/glcanvas.cpp
|
|
// Author: Sean D'Epagnier
|
|
// Copyright: (c) Sean D'Epagnier 2014
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "wx/wxprec.h"
|
|
|
|
#if wxUSE_GLCANVAS
|
|
|
|
#include "wx/qt/private/winevent.h"
|
|
#include "wx/glcanvas.h"
|
|
|
|
#include <QtOpenGL/QGLWidget>
|
|
|
|
class wxQtGLWidget : public wxQtEventSignalHandler< QGLWidget, wxGLCanvas >
|
|
{
|
|
public:
|
|
wxQtGLWidget(wxWindow *parent, wxGLCanvas *handler, QGLFormat format)
|
|
: wxQtEventSignalHandler<QGLWidget,wxGLCanvas>(parent, handler)
|
|
{
|
|
setFormat(format);
|
|
setAutoBufferSwap( false );
|
|
}
|
|
|
|
protected:
|
|
virtual void showEvent ( QShowEvent * event );
|
|
virtual void hideEvent ( QHideEvent * event );
|
|
virtual void resizeEvent ( QResizeEvent * event );
|
|
virtual void paintEvent ( QPaintEvent * event );
|
|
|
|
virtual void resizeGL(int w, int h);
|
|
virtual void paintGL();
|
|
};
|
|
|
|
void wxQtGLWidget::showEvent ( QShowEvent * event )
|
|
{
|
|
QGLWidget::showEvent( event );
|
|
}
|
|
|
|
void wxQtGLWidget::hideEvent ( QHideEvent * event )
|
|
{
|
|
QGLWidget::hideEvent( event );
|
|
}
|
|
|
|
void wxQtGLWidget::resizeEvent ( QResizeEvent * event )
|
|
{
|
|
QGLWidget::resizeEvent(event);
|
|
}
|
|
|
|
void wxQtGLWidget::paintEvent ( QPaintEvent * event )
|
|
{
|
|
QGLWidget::paintEvent(event);
|
|
}
|
|
|
|
void wxQtGLWidget::resizeGL(int w, int h)
|
|
{
|
|
wxSizeEvent event( wxSize(w, h) );
|
|
EmitEvent(event);
|
|
}
|
|
|
|
void wxQtGLWidget::paintGL()
|
|
{
|
|
wxPaintEvent event( GetHandler()->GetId() );
|
|
EmitEvent(event);
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGLContextAttrs: OpenGL rendering context attributes
|
|
// ----------------------------------------------------------------------------
|
|
// GLX specific values
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::CoreProfile()
|
|
{
|
|
// AddAttribBits(GLX_CONTEXT_PROFILE_MASK_ARB,
|
|
// GLX_CONTEXT_CORE_PROFILE_BIT_ARB);
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::MajorVersion(int val)
|
|
{
|
|
if ( val > 0 )
|
|
{
|
|
if ( val >= 3 )
|
|
SetNeedsARB();
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::MinorVersion(int val)
|
|
{
|
|
if ( val >= 0 )
|
|
{
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::CompatibilityProfile()
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::ForwardCompatible()
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::ES2()
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::DebugCtx()
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::Robust()
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::NoResetNotify()
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::LoseOnReset()
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::ResetIsolation()
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::ReleaseFlush(int val)
|
|
{
|
|
SetNeedsARB();
|
|
return *this;
|
|
}
|
|
|
|
wxGLContextAttrs& wxGLContextAttrs::PlatformDefaults()
|
|
{
|
|
renderTypeRGBA = true;
|
|
return *this;
|
|
}
|
|
|
|
void wxGLContextAttrs::EndList()
|
|
{
|
|
// AddAttribute(None);
|
|
}
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGLAttributes: Visual/FBconfig attributes
|
|
// ----------------------------------------------------------------------------
|
|
// GLX specific values
|
|
|
|
// Different versions of GLX API use rather different attributes lists, see
|
|
// the following URLs:
|
|
//
|
|
// - <= 1.2: http://www.opengl.org/sdk/docs/man/xhtml/glXChooseVisual.xml
|
|
// - >= 1.3: http://www.opengl.org/sdk/docs/man/xhtml/glXChooseFBConfig.xml
|
|
//
|
|
// Notice in particular that
|
|
// - GLX_RGBA is boolean attribute in the old version of the API but a
|
|
// value of GLX_RENDER_TYPE in the new one
|
|
// - Boolean attributes such as GLX_DOUBLEBUFFER don't take values in the
|
|
// old version but must be followed by True or False in the new one.
|
|
|
|
wxGLAttributes& wxGLAttributes::RGBA()
|
|
{
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::BufferSize(int val)
|
|
{
|
|
if ( val >= 0 )
|
|
{
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::Level(int val)
|
|
{
|
|
// AddAttribute(GLX_LEVEL);
|
|
AddAttribute(val);
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::DoubleBuffer()
|
|
{
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::Stereo()
|
|
{
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::AuxBuffers(int val)
|
|
{
|
|
if ( val >= 0 )
|
|
{
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::MinRGBA(int mRed, int mGreen, int mBlue, int mAlpha)
|
|
{
|
|
if ( mRed >= 0)
|
|
{
|
|
}
|
|
if ( mGreen >= 0)
|
|
{
|
|
}
|
|
if ( mBlue >= 0)
|
|
{
|
|
}
|
|
if ( mAlpha >= 0)
|
|
{
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::Depth(int val)
|
|
{
|
|
if ( val >= 0 )
|
|
{
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::Stencil(int val)
|
|
{
|
|
if ( val >= 0 )
|
|
{
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::MinAcumRGBA(int mRed, int mGreen, int mBlue, int mAlpha)
|
|
{
|
|
if ( mRed >= 0)
|
|
{
|
|
}
|
|
if ( mGreen >= 0)
|
|
{
|
|
}
|
|
if ( mBlue >= 0)
|
|
{
|
|
}
|
|
if ( mAlpha >= 0)
|
|
{
|
|
}
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::SampleBuffers(int val)
|
|
{
|
|
#ifdef GLX_SAMPLE_BUFFERS_ARB
|
|
if ( val >= 0 && wxGLCanvasX11::IsGLXMultiSampleAvailable() )
|
|
{
|
|
AddAttribute(GLX_SAMPLE_BUFFERS_ARB);
|
|
AddAttribute(val);
|
|
}
|
|
#endif
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::Samplers(int val)
|
|
{
|
|
#ifdef GLX_SAMPLES_ARB
|
|
if ( val >= 0 && wxGLCanvasX11::IsGLXMultiSampleAvailable() )
|
|
{
|
|
AddAttribute(GLX_SAMPLES_ARB);
|
|
AddAttribute(val);
|
|
}
|
|
#endif
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::FrameBuffersRGB()
|
|
{
|
|
// AddAttribute(GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB);
|
|
// AddAttribute(True);
|
|
return *this;
|
|
}
|
|
|
|
void wxGLAttributes::EndList()
|
|
{
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::PlatformDefaults()
|
|
{
|
|
// No GLX specific values
|
|
return *this;
|
|
}
|
|
|
|
wxGLAttributes& wxGLAttributes::Defaults()
|
|
{
|
|
RGBA().DoubleBuffer();
|
|
// if ( wxGLCanvasX11::GetGLXVersion() < 13 )
|
|
// Depth(1).MinRGBA(1, 1, 1, 0);
|
|
// else
|
|
Depth(16).SampleBuffers(1).Samplers(4);
|
|
return *this;
|
|
}
|
|
|
|
void wxGLAttributes::AddDefaultsForWXBefore31()
|
|
{
|
|
Defaults();
|
|
}
|
|
|
|
//---------------------------------------------------------------------------
|
|
// wxGlContext
|
|
//---------------------------------------------------------------------------
|
|
|
|
wxIMPLEMENT_CLASS(wxGLContext, wxWindow);
|
|
|
|
wxGLContext::wxGLContext(wxGLCanvas *WXUNUSED(win), const wxGLContext* WXUNUSED(other))
|
|
{
|
|
// m_glContext = win->GetHandle()->context();
|
|
}
|
|
|
|
bool wxGLContext::SetCurrent(const wxGLCanvas&) const
|
|
{
|
|
// I think I must destroy and recreate the QGLWidget to change the context?
|
|
// win->GetHandle()->makeCurrent();
|
|
return false;
|
|
}
|
|
|
|
//---------------------------------------------------------------------------
|
|
// wxGlCanvas
|
|
//---------------------------------------------------------------------------
|
|
|
|
wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
|
|
|
|
wxGLCanvas::wxGLCanvas(wxWindow *parent,
|
|
wxWindowID id,
|
|
const int *attribList,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
long style,
|
|
const wxString& name,
|
|
const wxPalette& palette)
|
|
{
|
|
Create(parent, id, pos, size, style, name, attribList, palette);
|
|
}
|
|
|
|
bool wxGLCanvas::Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxPoint& pos,
|
|
const wxSize& size,
|
|
long style,
|
|
const wxString& name,
|
|
const int *attribList,
|
|
const wxPalette& palette)
|
|
{
|
|
#if wxUSE_PALETTE
|
|
wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
|
|
#endif // wxUSE_PALETTE
|
|
wxUnusedVar(palette); // Unused when wxDEBUG_LEVEL==0
|
|
|
|
QGLFormat format;
|
|
if (!wxGLCanvas::ConvertWXAttrsToQtGL(attribList, format))
|
|
return false;
|
|
|
|
m_qtWindow = new wxQtGLWidget(parent, this, format);
|
|
|
|
return wxWindow::Create( parent, id, pos, size, style, name );
|
|
}
|
|
|
|
bool wxGLCanvas::SwapBuffers()
|
|
{
|
|
static_cast<QGLWidget *>(m_qtWindow)->swapBuffers();
|
|
return true;
|
|
}
|
|
|
|
/* static */
|
|
bool wxGLCanvas::ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format)
|
|
{
|
|
if (!wxattrs)
|
|
return true;
|
|
return true;
|
|
|
|
// set default parameters to false
|
|
format.setDoubleBuffer(false);
|
|
format.setDepth(false);
|
|
format.setAlpha(false);
|
|
format.setStencil(false);
|
|
|
|
for ( int arg = 0; wxattrs[arg] != 0; arg++ )
|
|
{
|
|
// indicates whether we have a boolean attribute
|
|
bool isBoolAttr = false;
|
|
|
|
int v = wxattrs[arg+1];
|
|
switch ( wxattrs[arg] )
|
|
{
|
|
case WX_GL_BUFFER_SIZE:
|
|
format.setRgba(false);
|
|
// I do not know how to set the buffer size, so fail
|
|
return false;
|
|
|
|
case WX_GL_LEVEL:
|
|
format.setPlane(v);
|
|
break;
|
|
|
|
case WX_GL_RGBA:
|
|
format.setRgba(true);
|
|
isBoolAttr = true;
|
|
break;
|
|
|
|
case WX_GL_DOUBLEBUFFER:
|
|
format.setDoubleBuffer(true);
|
|
isBoolAttr = true;
|
|
break;
|
|
|
|
case WX_GL_STEREO:
|
|
format.setStereo(true);
|
|
isBoolAttr = true;
|
|
break;
|
|
|
|
case WX_GL_AUX_BUFFERS:
|
|
// don't know how to implement
|
|
return false;
|
|
|
|
case WX_GL_MIN_RED:
|
|
format.setRedBufferSize(v*8);
|
|
break;
|
|
|
|
case WX_GL_MIN_GREEN:
|
|
format.setGreenBufferSize(v);
|
|
break;
|
|
|
|
case WX_GL_MIN_BLUE:
|
|
format.setBlueBufferSize(v);
|
|
break;
|
|
|
|
case WX_GL_MIN_ALPHA:
|
|
format.setAlpha(true);
|
|
format.setAlphaBufferSize(v);
|
|
break;
|
|
|
|
case WX_GL_DEPTH_SIZE:
|
|
format.setDepth(true);
|
|
format.setDepthBufferSize(v);
|
|
break;
|
|
|
|
case WX_GL_STENCIL_SIZE:
|
|
format.setStencil(true);
|
|
format.setStencilBufferSize(v);
|
|
break;
|
|
|
|
case WX_GL_MIN_ACCUM_RED:
|
|
case WX_GL_MIN_ACCUM_GREEN:
|
|
case WX_GL_MIN_ACCUM_BLUE:
|
|
case WX_GL_MIN_ACCUM_ALPHA:
|
|
format.setAccumBufferSize(v);
|
|
break;
|
|
|
|
case WX_GL_SAMPLE_BUFFERS:
|
|
format.setSampleBuffers(v);
|
|
// can we somehow indicate if it's not supported?
|
|
break;
|
|
|
|
case WX_GL_SAMPLES:
|
|
format.setSamples(v);
|
|
// can we somehow indicate if it's not supported?
|
|
break;
|
|
|
|
default:
|
|
wxLogDebug(wxT("Unsupported OpenGL attribute %d"),
|
|
wxattrs[arg]);
|
|
continue;
|
|
}
|
|
|
|
if ( !isBoolAttr ) {
|
|
if ( !v )
|
|
return false; // zero parameter
|
|
arg++;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/* static */
|
|
bool
|
|
wxGLCanvasBase::IsDisplaySupported(const int *attribList)
|
|
{
|
|
QGLFormat format;
|
|
|
|
if (!wxGLCanvas::ConvertWXAttrsToQtGL(attribList, format))
|
|
return false;
|
|
|
|
return QGLWidget(format).isValid();
|
|
}
|
|
|
|
#endif // wxUSE_GLCANVAS
|