git subrepo clone --force --branch=rebase [email protected]:libretro/GLi…

…deN64.git GLideN64 subrepo: subdir: "GLideN64" merged: "09a1ba72" upstream: origin: "[email protected]:libretro/GLideN64.git" branch: "rebase" commit: "09a1ba72" git-subrepo: version: "0.4.0" origin: "???" commit: "???"
libretro · May 14, 2019 · aecdf5c · aecdf5c
1 parent 72cee5e
commit aecdf5c
Show file tree

Hide file tree

Showing 50 changed files with 10,009 additions and 601 deletions.
diff --git a/GLideN64/.gitignore b/GLideN64/.gitignore
@@ -12,3 +12,4 @@ src/Revision.h
 /projects/msvc/GLideN64.VC.VC.opendb
 /projects/msvc/GLideN64.VC.db
 /projects/msvc/GeneratedFiles
+.vs
diff --git a/GLideN64/.gitrepo b/GLideN64/.gitrepo
@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = [email protected]:libretro/GLideN64.git
-	branch = develop
-	commit = 0f0c9c0627fc1208cf8af3ffd1bf6e70e1df12cb
-	parent = 4b2952e42fbffeebc1e8154d9445d096d1f50112
+	branch = rebase
+	commit = 09a1ba72969f8380ea7eeda7a5168e9bfd8abbbb
+	parent = 206d0f1a6ed0b9cdac8012be296f9a6c0324a061
 	method = rebase
 	cmdver = 0.4.0
diff --git a/GLideN64/.travis.yml b/GLideN64/.travis.yml
@@ -1,6 +1,11 @@
-dist:     trusty
+dist:     xenial
 sudo:     false
 
+addons:
+  apt:
+    packages:
+    - libgl1-mesa-dev
+
 language: cpp
 
 os:

diff --git a/GLideN64/README.md b/GLideN64/README.md
@@ -3,7 +3,7 @@ GLideN64
 
 A new generation, open-source graphics plugin for N64 emulators.
 
-Find WIP builds [here](https://github.com/gonetz/GLideN64/issues/1574). WIP
+Find WIP builds [here](https://github.com/gonetz/GLideN64/issues/2037). WIP
 builds have the latest features and fixes, and are generally stable, but may
 introduce bugs and have incomplete translations.
 

diff --git a/GLideN64/ini/GLideN64.custom.ini b/GLideN64/ini/GLideN64.custom.ini
@@ -88,6 +88,9 @@ frameBufferEmulation\fbInfoDisabled=0
 [J%20WORLD%20SOCCER3]
 frameBufferEmulation\N64DepthCompare=1
 
+[OLYMPIC%20HOCKEY]
+frameBufferEmulation\bufferSwapMode=1
+
 [PERFECT%20STRIKER]
 Good_Name=Jikkyou J.League Perfect Striker (J)
 frameBufferEmulation\N64DepthCompare=1
@@ -149,6 +152,9 @@ Good_Name=Pokemon Stadium Kin Gin (J)
 frameBufferEmulation\copyToRDRAM=0
 frameBufferEmulation\copyDepthToRDRAM=0
 
+[RUSH%202]
+frameBufferEmulation\bufferSwapMode=1
+
 [SAN%20FRANCISCO%20RUSH]
 Good_Name=San Francisco Rush Extreme Racing (U)
 frameBufferEmulation\bufferSwapMode=1
@@ -187,5 +193,17 @@ frameBufferEmulation\N64DepthCompare=1
 Good_Name=Tonic Trouble (E)(U)
 frameBufferEmulation\copyToRDRAM=1
 
+[TG%20RALLY%202]
+frameBufferEmulation\copyToRDRAM=1
+
+[TOP%20GEAR%20RALLY%202]
+frameBufferEmulation\copyToRDRAM=1
+
+[turok_dinosaur_hunte]
+frameBufferEmulation\copyDepthToRDRAM=1
+
+[TUROK_DINOSAUR_HUNTE]
+frameBufferEmulation\copyDepthToRDRAM=1
+
 [W.G.%203DHOCKEY]
 frameBufferEmulation\bufferSwapMode=1
diff --git a/GLideN64/licenses/readerwriterqueue/LICENSE.md b/GLideN64/licenses/readerwriterqueue/LICENSE.md
@@ -0,0 +1,28 @@
+This license applies to all the code in this repository except that written by third
+parties, namely the files in benchmarks/ext, which have their own licenses, and Jeff
+Preshing's semaphore implementation (used in the blocking queue) which has a zlib
+license (embedded in atomicops.h).
+
+Simplified BSD License:
+
+Copyright (c) 2013-2015, Cameron Desrochers  
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/GLideN64/projects/msvc/GLideN64.vcxproj b/GLideN64/projects/msvc/GLideN64.vcxproj
@@ -72,7 +72,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>../../src;../../src/inc;../../src/osal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>UNICODE;_USRDLL;_CRT_SECURE_NO_WARNINGS;TXFILTER_LIB;OS_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>UNICODE;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;TXFILTER_LIB;OS_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
@@ -260,9 +260,17 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
     <ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_UnbufferedDrawer.cpp" />
     <ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_Utils.cpp" />
     <ClCompile Include="..\..\src\Graphics\OpenGLContext\opengl_BufferedDrawer.cpp" />
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_Wrapper.cpp" />
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_WrappedFunctions.cpp" />
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_Command.cpp" />
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_ObjectPool.cpp" />
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\RingBufferPool.cpp" />
     <ClCompile Include="..\..\src\Graphics\OpenGLContext\windows\windows_DisplayWindow.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_mupenplus' Or '$(Configuration)'=='Release_mupenplus'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\windows\WindowsWGL.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_mupenplus' Or '$(Configuration)'=='Release_mupenplus'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\gSP.cpp" />
     <ClCompile Include="..\..\src\iob.cpp">
       <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
@@ -404,6 +412,17 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
     <ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_UnbufferedDrawer.h" />
     <ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_Utils.h" />
     <ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_BufferedDrawer.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\atomicops.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_Wrapper.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_WrappedFunctions.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\BlockingQueue.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_Command.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_ObjectPool.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\readerwriterqueue.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\RingBufferPool.h" />
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\windows\WindowsWGL.h">
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_mupenplus' Or '$(Configuration)'=='Release_mupenplus'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\..\src\Graphics\Parameter.h" />
     <ClInclude Include="..\..\src\Graphics\Parameters.h" />
     <ClInclude Include="..\..\src\Graphics\PixelBuffer.h" />

diff --git a/GLideN64/projects/msvc/GLideN64.vcxproj.filters b/GLideN64/projects/msvc/GLideN64.vcxproj.filters
@@ -69,6 +69,12 @@
     <Filter Include="Source Files\Graphics\OpenGL\mupen64plus">
       <UniqueIdentifier>{77259791-9942-4601-a63f-5a0468e69e49}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\Graphics\OpenGL\ThreadedOpenGL">
+      <UniqueIdentifier>{09919f83-2933-4b48-a4c7-f7bf6e790304}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Graphics\OpenGL\ThreadedOpenGL">
+      <UniqueIdentifier>{32e9be50-cb55-445a-9562-bbe05085bbe1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\Combiner.cpp">
@@ -260,6 +266,9 @@
     <ClCompile Include="..\..\src\Graphics\OpenGLContext\windows\windows_DisplayWindow.cpp">
       <Filter>Source Files\Graphics\OpenGL\windows</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\windows\WindowsWGL.cpp">
+      <Filter>Source Files\Graphics\OpenGL\windows</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\Graphics\OpenGLContext\mupen64plus\mupen64plus_DisplayWindow.cpp">
       <Filter>Source Files\Graphics\OpenGL\mupen64plus</Filter>
     </ClCompile>
@@ -398,6 +407,21 @@
     <ClCompile Include="..\..\src\mupenplus\MemoryStatus_mupenplus.cpp">
       <Filter>Source Files\mupenplus</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_Wrapper.cpp">
+      <Filter>Source Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_WrappedFunctions.cpp">
+      <Filter>Source Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_Command.cpp">
+      <Filter>Source Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_ObjectPool.cpp">
+      <Filter>Source Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\RingBufferPool.cpp">
+      <Filter>Source Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\3DMath.h">
@@ -634,6 +658,9 @@
     <ClInclude Include="..\..\src\Graphics\OpenGLContext\opengl_ColorBufferReaderWithReadPixels.h">
       <Filter>Header Files\Graphics\OpenGL</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\windows\WindowsWGL.h">
+      <Filter>Header Files\Graphics\OpenGL\windows</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\TexrectDrawer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -730,5 +757,29 @@
     <ClInclude Include="..\..\src\MemoryStatus.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_Wrapper.h">
+      <Filter>Header Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_WrappedFunctions.h">
+      <Filter>Header Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\BlockingQueue.h">
+      <Filter>Header Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_Command.h">
+      <Filter>Header Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\opengl_ObjectPool.h">
+      <Filter>Header Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\RingBufferPool.h">
+      <Filter>Header Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\atomicops.h">
+      <Filter>Header Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Graphics\OpenGLContext\ThreadedOpenGl\readerwriterqueue.h">
+      <Filter>Header Files\Graphics\OpenGL\ThreadedOpenGL</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/GLideN64/src/CMakeLists.txt b/GLideN64/src/CMakeLists.txt
@@ -61,6 +61,11 @@ set(GLideN64_SOURCES
   Graphics/CombinerProgram.cpp
   Graphics/ObjectHandle.cpp
   Graphics/OpenGLContext/GLFunctions.cpp
+  Graphics/OpenGLContext/ThreadedOpenGl/opengl_Command.cpp
+  Graphics/OpenGLContext/ThreadedOpenGl/opengl_ObjectPool.cpp
+  Graphics/OpenGLContext/ThreadedOpenGl/opengl_Wrapper.cpp
+  Graphics/OpenGLContext/ThreadedOpenGl/opengl_WrappedFunctions.cpp
+  Graphics/OpenGLContext/ThreadedOpenGl/RingBufferPool.cpp
   Graphics/OpenGLContext/opengl_Attributes.cpp
   Graphics/OpenGLContext/opengl_BufferedDrawer.cpp
   Graphics/OpenGLContext/opengl_BufferManipulationObjectFactory.cpp

diff --git a/GLideN64/src/Config.cpp b/GLideN64/src/Config.cpp
@@ -25,6 +25,7 @@ void Config::resetToDefaults()
 	video.fxaa = 0;
 	video.multisampling = 0;
 	video.verticalSync = 0;
+	video.threadedVideo = 0;
 
 	texture.maxAnisotropy = 0;
 	texture.bilinearMode = BILINEAR_STANDARD;

diff --git a/GLideN64/src/Config.h b/GLideN64/src/Config.h
@@ -28,6 +28,7 @@ struct Config
 		u32 fxaa;
 		u32 multisampling;
 		u32 verticalSync;
+		u32 threadedVideo;
 	} video;
 
 	struct

diff --git a/GLideN64/src/GLideNUI/AboutDialog.ui b/GLideN64/src/GLideNUI/AboutDialog.ui
@@ -225,32 +225,7 @@
            <item>
             <widget class="QLabel" name="label_17">
              <property name="text">
-              <string notr="true">purplemarshmallow
-Francisco Zurita
-Logan McNaughton
-gizmo98
-matthewharvey
-lioncash
-Predator82Germany
-AmbientMalice
-baptiste0602
-Gilles Siberlin
-Daniel Eck
-Víctor &quot;IlDucci&quot;
-orbea
-BenjaminSiskoo
-ptitSeb
-Kimberly J. Ortega
-Maxime Morel
-tony971
-SigmaVirus
-Jools Wills
-Nekokabu
-nicklauslittle
-Nebuleon
-sergiobenrocha2
-Michał Durak
-Mushman</string>
+              <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Logan McNaughton&lt;/p&gt;&lt;p&gt;Francisco Zurita&lt;/p&gt;&lt;p&gt;gizmo98&lt;/p&gt;&lt;p&gt;purplemarshmallow&lt;/p&gt;&lt;p&gt;zilmar&lt;/p&gt;&lt;p&gt;matthewharvey&lt;/p&gt;&lt;p&gt;lioncash&lt;/p&gt;&lt;p&gt;Predator82Germany&lt;/p&gt;&lt;p&gt;AmbientMalice&lt;/p&gt;&lt;p&gt;baptiste0602&lt;/p&gt;&lt;p&gt;Gilles Siberlin&lt;/p&gt;&lt;p&gt;Daniel Eck&lt;/p&gt;&lt;p&gt;Víctor &amp;quot;IlDucci&amp;quot;&lt;/p&gt;&lt;p&gt;orbea&lt;/p&gt;&lt;p&gt;BenjaminSiskoo&lt;/p&gt;&lt;p&gt;ptitSeb&lt;/p&gt;&lt;p&gt;Kimberly J. Ortega&lt;/p&gt;&lt;p&gt;Maxime Morel&lt;/p&gt;&lt;p&gt;tony971&lt;/p&gt;&lt;p&gt;SigmaVirus&lt;/p&gt;&lt;p&gt;Jools Wills&lt;/p&gt;&lt;p&gt;Nekokabu&lt;/p&gt;&lt;p&gt;nicklauslittle&lt;/p&gt;&lt;p&gt;Nebuleon&lt;/p&gt;&lt;p&gt;sergiobenrocha2&lt;/p&gt;&lt;p&gt;Michał Durak&lt;/p&gt;&lt;p&gt;Mushman&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
            </item>
@@ -571,31 +546,6 @@ jeremydmiller</string>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QLabel" name="label_22">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string notr="true">Nathaniel Meyer</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="label_26">
-         <property name="text">
-          <string>Author of the blur shader
-© Nutty Software</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">

diff --git a/GLideN64/src/GLideNUI/ConfigDialog.cpp b/GLideN64/src/GLideNUI/ConfigDialog.cpp
@@ -117,6 +117,7 @@ void ConfigDialog::_init()
 	ui->aliasingLabelVal->setText(QString::number(config.video.multisampling));
 	ui->anisotropicSlider->setValue(config.texture.maxAnisotropy);
 	ui->vSyncCheckBox->setChecked(config.video.verticalSync != 0);
+	ui->vThreadedVideoCheckBox->setChecked(config.video.threadedVideo != 0);
 
 	switch (config.texture.bilinearMode) {
 	case BILINEAR_3POINT:
@@ -426,6 +427,8 @@ void ConfigDialog::accept()
 
 	config.video.verticalSync = ui->vSyncCheckBox->isChecked() ? 1 : 0;
 
+	config.video.threadedVideo = ui->vThreadedVideoCheckBox->isChecked() ? 1 : 0;
+
 	// Emulation settings
 	config.generalEmulation.enableLOD = ui->emulateLodCheckBox->isChecked() ? 1 : 0;
 	config.generalEmulation.enableNoise = ui->emulateNoiseCheckBox->isChecked() ? 1 : 0;

diff --git a/GLideN64/src/GLideNUI/Settings.cpp b/GLideN64/src/GLideNUI/Settings.cpp
@@ -29,6 +29,7 @@ void _loadSettings(QSettings & settings)
 	config.video.multisampling = settings.value("multisampling", config.video.multisampling).toInt();
 	config.video.fxaa= settings.value("fxaa", config.video.fxaa).toInt();
 	config.video.verticalSync = settings.value("verticalSync", config.video.verticalSync).toInt();
+	config.video.threadedVideo = settings.value("threadedVideo", config.video.threadedVideo).toInt();
 	settings.endGroup();
 
 	settings.beginGroup("texture");
@@ -197,6 +198,7 @@ void writeSettings(const QString & _strIniFolder)
 	settings.setValue("multisampling", config.video.multisampling);
 	settings.setValue("fxaa", config.video.fxaa);
 	settings.setValue("verticalSync", config.video.verticalSync);
+	settings.setValue("threadedVideo", config.video.threadedVideo);
 	settings.endGroup();
 
 	settings.beginGroup("texture");