added software renderer. split common functions prev.
in gleswidget to renderstack (a QStackWidget), which in turn calls an actual renderer. added ability to target GLES directly, but this is maybe uneeded.
This commit is contained in:
@@ -37,7 +37,14 @@
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="GLESWidget" name="glesWidget"/>
|
||||
<widget class="RendererStack" name="stackedWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="SoftwareRenderer" name="sw"/>
|
||||
<widget class="HardwareRenderer" name="ogl"/>
|
||||
<widget class="HardwareRenderer" name="gles"/>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
@@ -77,6 +84,9 @@
|
||||
<string>View</string>
|
||||
</property>
|
||||
<addaction name="actionFullscreen"/>
|
||||
<addaction name="actionSoftware_Renderer"/>
|
||||
<addaction name="actionHardware_Renderer_OpenGL"/>
|
||||
<addaction name="actionHardware_Renderer_OpenGL_ES"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuMedia">
|
||||
<property name="title">
|
||||
@@ -146,12 +156,39 @@
|
||||
<string>Ctrl+Alt+PgUp</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSoftware_Renderer">
|
||||
<property name="text">
|
||||
<string>Software Renderer</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHardware_Renderer_OpenGL">
|
||||
<property name="text">
|
||||
<string>Hardware Renderer (OpenGL)</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionHardware_Renderer_OpenGL_ES">
|
||||
<property name="text">
|
||||
<string>Hardware Renderer (OpenGL ES)</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>GLESWidget</class>
|
||||
<class>HardwareRenderer</class>
|
||||
<extends>QOpenGLWidget</extends>
|
||||
<header>qt_gleswidget.hpp</header>
|
||||
<header>qt_hardwarerenderer.hpp</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>SoftwareRenderer</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>qt_softwarerenderer.hpp</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>RendererStack</class>
|
||||
<extends>QStackedWidget</extends>
|
||||
<header>qt_rendererstack.hpp</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
||||
Reference in New Issue
Block a user