Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-18 09:30:13 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'opengl-default-attrs'

Browse Source 
Stop requesting multi-sampling in wxGLCanvas by default.

See #23260.
This commit is contained in:
Vadim Zeitlin
2023-02-20 18:26:52 +01:00
parent 3ed5e42441 be1807f29b
commit 41be6dbdbe
15 changed files with 58 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/changes.txt
+4
View File
@@ -27,6 +27,10 @@ Changes in behaviour not resulting in compilation errors
- wxMSW doesn't support versions of Microsoft Windows before Windows 7. If you
need Windows XP or Vista support, please use wxWidgets 3.2.
- wxGLCanvas doesn't use multi-sampling by default any longer, please use
wxGLAttributes::Samplers(1).SampleBuffers(4) explicitly if you need to keep
using the same attributes that were previously used by default.
- As first mentioned in 3.0 release notes, the value of wxTHREAD_WAIT_DEFAULT,
used by wxThread::Delete() and Wait() by default, has changed from
wxTHREAD_WAIT_YIELD to wxTHREAD_WAIT_BLOCK for safety and consistency.
include/wx/glcanvas.h
+7 -1
View File
@@ -156,11 +156,17 @@ public:
wxGLAttributes& Stencil(int val);
wxGLAttributes& MinAcumRGBA(int mRed, int mGreen, int mBlue, int mAlpha);
wxGLAttributes& PlatformDefaults();
wxGLAttributes& Defaults();
wxGLAttributes& SampleBuffers(int val);
wxGLAttributes& Samplers(int val);
wxGLAttributes& FrameBuffersRGB();
void EndList(); // No more values can be chained
// This function is the same for all ports and so is implemented here
// instead of in port-specific files.
wxGLAttributes& Defaults()
{
return RGBA().Depth(16).DoubleBuffer();
}
};
// ----------------------------------------------------------------------------
include/wx/gtk/glcanvas.h
+2
View File
@@ -29,6 +29,8 @@ class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasImpl
{
typedef wxGLCanvasImpl BaseType;
public:
wxGLCanvas() = default;
wxGLCanvas(wxWindow *parent,
const wxGLAttributes& dispAttrs,
wxWindowID id = wxID_ANY,
include/wx/msw/glcanvas.h
+3 -4
View File
@@ -47,6 +47,8 @@ private:
class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
{
public:
wxGLCanvas() = default;
explicit // avoid implicitly converting a wxWindow* to wxGLCanvas
wxGLCanvas(wxWindow *parent,
const wxGLAttributes& dispAttrs,
@@ -115,9 +117,6 @@ public:
#endif // wxUSE_PALETTE
protected:
// common part of all ctors
void Init();
// the real window creation function, Create() may reuse it twice as we may
// need to create an OpenGL window to query the available extensions and
// then potentially delete and recreate it with another pixel format
@@ -133,7 +132,7 @@ protected:
// HDC for this window, we keep it all the time
HDC m_hDC;
HDC m_hDC = nullptr;
private:
wxDECLARE_EVENT_TABLE();
include/wx/osx/glcanvas.h
+3 -2
View File
@@ -60,6 +60,8 @@ private:
class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
{
public:
wxGLCanvas() = default;
wxGLCanvas(wxWindow *parent,
const wxGLAttributes& dispAttrs,
wxWindowID id = wxID_ANY,
@@ -126,10 +128,9 @@ protected:
long style,
const wxString& name);
WXGLPixelFormat m_glFormat;
WXGLPixelFormat m_glFormat = nullptr;
wxGLAttributes m_GLAttrs;
wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxGLCanvas);
};
include/wx/qt/glcanvas.h
+2 -2
View File
@@ -34,6 +34,8 @@ public:
class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
{
public:
wxGLCanvas() = default;
explicit // avoid implicitly converting a wxWindow* to wxGLCanvas
wxGLCanvas(wxWindow *parent,
const wxGLAttributes& dispAttrs,
@@ -79,8 +81,6 @@ public:
static bool ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format);
private:
// wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxGLCanvas);
};
include/wx/x11/glcanvas.h
+2
View File
@@ -17,6 +17,8 @@
class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11
{
public:
wxGLCanvas() = default;
wxGLCanvas(wxWindow *parent,
const wxGLAttributes& dispAttrs,
wxWindowID id = wxID_ANY,
interface/wx/glcanvas.h
+9
View File
@@ -785,6 +785,15 @@ enum
class wxGLCanvas : public wxWindow
{
public:
/**
Default constructor not creating the window.
Create() must be used to actually create it later.
@since 3.3.0
*/
wxGLCanvas();
/**
Creates a window with the given parameters. Notice that you need to
create and use a wxGLContext to output to this window.
samples/opengl/cube/cube.cpp
+25 -19
View File
@@ -309,29 +309,27 @@ wxBEGIN_EVENT_TABLE(TestGLCanvas, wxGLCanvas)
EVT_TIMER(SpinTimer, TestGLCanvas::OnSpinTimer)
wxEND_EVENT_TABLE()
TestGLCanvas::TestGLCanvas(wxWindow *parent, int *attribList)
TestGLCanvas::TestGLCanvas(wxWindow *parent, bool useStereo)
// With perspective OpenGL graphics, the wxFULL_REPAINT_ON_RESIZE style
// flag should always be set, because even making the canvas smaller should
// be followed by a paint event that updates the entire canvas with new
// viewport settings.
: wxGLCanvas(parent, wxID_ANY, attribList,
wxDefaultPosition, wxDefaultSize,
wxFULL_REPAINT_ON_RESIZE),
m_xangle(30.0),
: m_xangle(30.0),
m_yangle(30.0),
m_spinTimer(this,SpinTimer),
m_useStereo(false),
m_useStereo(useStereo),
m_stereoWarningAlreadyDisplayed(false)
{
if ( attribList )
wxGLAttributes attribs = wxGLAttributes().Defaults();
if ( useStereo )
attribs.Stereo();
attribs.EndList();
if ( !wxGLCanvas::Create(parent, attribs, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
wxFULL_REPAINT_ON_RESIZE) )
{
int i = 0;
while ( attribList[i] != 0 )
{
if ( attribList[i] == WX_GL_STEREO )
m_useStereo = true;
++i;
}
wxLogError("Creating OpenGL window failed.");
}
}
@@ -458,9 +456,7 @@ wxEND_EVENT_TABLE()
MyFrame::MyFrame( bool stereoWindow )
: wxFrame(nullptr, wxID_ANY, "wxWidgets OpenGL Cube Sample")
{
int stereoAttribList[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_STEREO, 0 };
new TestGLCanvas(this, stereoWindow ? stereoAttribList : nullptr);
new TestGLCanvas(this, stereoWindow);
SetIcon(wxICON(sample));
@@ -481,7 +477,8 @@ MyFrame::MyFrame( bool stereoWindow )
Show();
// test IsDisplaySupported() function:
static const int attribs[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0 };
wxGLAttributes attribs;
attribs.RGBA().DoubleBuffer().EndList();
wxLogStatus("Double-buffered display %s supported",
wxGLCanvas::IsDisplaySupported(attribs) ? "is" : "not");
@@ -508,5 +505,14 @@ void MyFrame::OnNewWindow( wxCommandEvent& WXUNUSED(event) )
void MyFrame::OnNewStereoWindow( wxCommandEvent& WXUNUSED(event) )
{
new MyFrame(true);
wxGLAttributes attribs;
attribs.RGBA().DoubleBuffer().Stereo().EndList();
if ( wxGLCanvas::IsDisplaySupported(attribs) )
{
new MyFrame(true);
}
else
{
wxLogError("Stereo not supported by OpenGL on this system, sorry.");
}
}
samples/opengl/cube/cube.h
+1 -1
View File
@@ -65,7 +65,7 @@ private:
class TestGLCanvas : public wxGLCanvas
{
public:
TestGLCanvas(wxWindow *parent, int *attribList = nullptr);
TestGLCanvas(wxWindow *parent, bool useStereo);
private:
void OnPaint(wxPaintEvent& event);
src/msw/glcanvas.cpp
-16
View File
@@ -530,13 +530,6 @@ wxGLAttributes& wxGLAttributes::PlatformDefaults()
return *this;
}
wxGLAttributes& wxGLAttributes::Defaults()
{
RGBA().Depth(16).DoubleBuffer().SampleBuffers(1).Samplers(4);
SetNeedsARB();
return *this;
}
// ----------------------------------------------------------------------------
// wxGLContext
// ----------------------------------------------------------------------------
@@ -648,11 +641,6 @@ wxEND_EVENT_TABLE()
// wxGLCanvas construction
// ----------------------------------------------------------------------------
void wxGLCanvas::Init()
{
m_hDC = nullptr;
}
wxGLCanvas::wxGLCanvas(wxWindow *parent,
const wxGLAttributes& dispAttrs,
wxWindowID id,
@@ -662,8 +650,6 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
const wxString& name,
const wxPalette& palette)
{
Init();
(void)Create(parent, dispAttrs, id, pos, size, style, name, palette);
}
@@ -676,8 +662,6 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
const wxString& name,
const wxPalette& palette)
{
Init();
(void)Create(parent, id, pos, size, style, name, attribList, palette);
}
src/osx/glcanvas_osx.cpp
-11
View File
@@ -350,13 +350,6 @@ wxGLAttributes& wxGLAttributes::PlatformDefaults()
return *this;
}
wxGLAttributes& wxGLAttributes::Defaults()
{
RGBA().Depth(16).DoubleBuffer().SampleBuffers(1).Samplers(4);
return *this;
}
// ----------------------------------------------------------------------------
// wxGLContext
// ----------------------------------------------------------------------------
@@ -417,9 +410,6 @@ wxGLContext::~wxGLContext()
wxIMPLEMENT_CLASS(wxGLCanvas, wxWindow);
wxBEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
wxEND_EVENT_TABLE()
wxGLCanvas::wxGLCanvas(wxWindow *parent,
const wxGLAttributes& dispAttrs,
wxWindowID id,
@@ -472,7 +462,6 @@ bool wxGLCanvas::Create(wxWindow *parent,
const wxString& name,
const wxPalette& WXUNUSED(palette))
{
m_glFormat = nullptr;
// Don't allow an empty list
if ( !dispAttrs.GetGLAttrs() )
{
src/qt/glcanvas.cpp
-10
View File
@@ -317,16 +317,6 @@ wxGLAttributes& wxGLAttributes::PlatformDefaults()
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;
}
//---------------------------------------------------------------------------
// wxGlContext
src/unix/glegl.cpp
-6
View File
@@ -269,12 +269,6 @@ wxGLAttributes& wxGLAttributes::PlatformDefaults()
return *this;
}
wxGLAttributes& wxGLAttributes::Defaults()
{
RGBA().DoubleBuffer().Depth(16).SampleBuffers(1).Samplers(4);
return *this;
}
// ============================================================================
// wxGLContext implementation
src/unix/glx11.cpp
-6
View File
@@ -427,12 +427,6 @@ wxGLAttributes& wxGLAttributes::PlatformDefaults()
return *this;
}
wxGLAttributes& wxGLAttributes::Defaults()
{
RGBA().DoubleBuffer().Depth(16).SampleBuffers(1).Samplers(4);
return *this;
}
// ============================================================================
// wxGLContext implementation