Deploy GH

OGRECave · Oct 1, 2024 · c731376 · c731376
1 parent dd5e633
commit c731376
Show file tree

Hide file tree

Showing 44 changed files with 122 additions and 150 deletions.
diff --git a/api/latest/_ogre22_changes.html b/api/latest/_ogre22_changes.html
@@ -333,7 +333,7 @@ <h3><a class="anchor" id="autotoc_md30"></a>
 <div class="line">texture-&gt;<a class="code" href="class_ogre_1_1_texture_gpu.html#aeadb4961ae1af0313cbd253bd32285dd">setTextureType</a>( <a class="code" href="namespace_ogre_1_1_texture_types.html#aa364e348564060700791c9940d5ced82aaccb80fce163e32091af35b9de1c1001">Ogre::TextureTypes::Type2D</a> );</div>
 <div class="line">texture-&gt;<a class="code" href="class_ogre_1_1_texture_gpu.html#a6ae40391d39c8feae00acaf25839c6f9">setNumMipmaps</a>( 1u );</div>
 <div class="line">texture-&gt;<a class="code" href="class_ogre_1_1_texture_gpu.html#af79e22c90559d13385d75dc19970806d">setResolution</a>(width, height);</div>
-<div class="ttc" id="aclass_ogre_1_1_render_system_html_a687a8e7e19a73828a762461bc0419f1d"><div class="ttname"><a href="class_ogre_1_1_render_system.html#a687a8e7e19a73828a762461bc0419f1d">Ogre::RenderSystem::getTextureGpuManager</a></div><div class="ttdeci">TextureGpuManager * getTextureGpuManager() const</div><div class="ttdef"><b>Definition:</b> OgreRenderSystem.h:1194</div></div>
+<div class="ttc" id="aclass_ogre_1_1_render_system_html_a687a8e7e19a73828a762461bc0419f1d"><div class="ttname"><a href="class_ogre_1_1_render_system.html#a687a8e7e19a73828a762461bc0419f1d">Ogre::RenderSystem::getTextureGpuManager</a></div><div class="ttdeci">TextureGpuManager * getTextureGpuManager() const</div><div class="ttdef"><b>Definition:</b> OgreRenderSystem.h:1193</div></div>
 <div class="ttc" id="aclass_ogre_1_1_root_html"><div class="ttname"><a href="class_ogre_1_1_root.html">Ogre::Root</a></div><div class="ttdoc">The root class of the Ogre system.</div><div class="ttdef"><b>Definition:</b> OgreRoot.h:71</div></div>
 <div class="ttc" id="aclass_ogre_1_1_root_html_a302ae050078b8a845a6059201cf9469b"><div class="ttname"><a href="class_ogre_1_1_root.html#a302ae050078b8a845a6059201cf9469b">Ogre::Root::getRenderSystem</a></div><div class="ttdeci">RenderSystem * getRenderSystem()</div><div class="ttdoc">Retrieve a pointer to the currently selected render system.</div></div>
 <div class="ttc" id="aclass_ogre_1_1_texture_gpu_html"><div class="ttname"><a href="class_ogre_1_1_texture_gpu.html">Ogre::TextureGpu</a></div><div class="ttdef"><b>Definition:</b> OgreTextureGpu.h:291</div></div>

diff --git a/api/latest/class_ogre_1_1_d3_d11_render_system-members.html b/api/latest/class_ogre_1_1_d3_d11_render_system-members.html
@@ -312,7 +312,7 @@
   <tr class="even"><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html#a6219a2d1f92be5548983a03de9522365">useCustomRenderSystemCapabilities</a>(RenderSystemCapabilities *capabilities)</td><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html">Ogre::RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html#a3d7e0738522b0144613a690f5ff118f8">validateConfigOptions</a>() override</td><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html">Ogre::D3D11RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html#aef0108b035ba4efa9a5ba004966c4a91">validateDevice</a>(bool forceDeviceElection=false) override</td><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html">Ogre::D3D11RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
-  <tr><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html#a246bf3d6c9610a8db3cd6645806ba34f">validateSampleDescription</a>(const SampleDescription &amp;sampleDesc, PixelFormatGpu format, uint32 textureFlags, uint32 depthTextureFlags) override</td><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html">Ogre::D3D11RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html#a6fc36c28010a8d304b968f06ad72c7e3">validateSampleDescription</a>(const SampleDescription &amp;sampleDesc, PixelFormatGpu format, uint32 textureFlags) override</td><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html">Ogre::D3D11RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html#aad4e30395ccb5bcb6588f09c44e9b22e">~D3D11RenderSystem</a>()</td><td class="entry"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html">Ogre::D3D11RenderSystem</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html#a785f83ff8a4ee8fb21a11c9d6fe5c928">~RenderSystem</a>()</td><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html">Ogre::RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->

diff --git a/api/latest/class_ogre_1_1_d3_d11_render_system.html b/api/latest/class_ogre_1_1_d3_d11_render_system.html
@@ -413,9 +413,9 @@
 <tr class="memitem:aef0108b035ba4efa9a5ba004966c4a91"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html#aef0108b035ba4efa9a5ba004966c4a91">validateDevice</a> (bool forceDeviceElection=false) override</td></tr>
 <tr class="memdesc:aef0108b035ba4efa9a5ba004966c4a91"><td class="mdescLeft">&#160;</td><td class="mdescRight">Some render systems have moments when GPU device is temporarily unavailable, for example when D3D11 device is lost, or when iOS app is in background, etc.  <a href="class_ogre_1_1_d3_d11_render_system.html#aef0108b035ba4efa9a5ba004966c4a91">More...</a><br /></td></tr>
 <tr class="separator:aef0108b035ba4efa9a5ba004966c4a91"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a246bf3d6c9610a8db3cd6645806ba34f"><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct_ogre_1_1_sample_description.html">SampleDescription</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html#a246bf3d6c9610a8db3cd6645806ba34f">validateSampleDescription</a> (const <a class="el" href="struct_ogre_1_1_sample_description.html">SampleDescription</a> &amp;sampleDesc, <a class="el" href="group___image.html#ga71f09fe41a1db41186262f1aa5814a18">PixelFormatGpu</a> format, <a class="el" href="namespace_ogre.html#a5a7c15d68e8c7d585c410bc5a93682f4">uint32</a> textureFlags, <a class="el" href="namespace_ogre.html#a5a7c15d68e8c7d585c410bc5a93682f4">uint32</a> depthTextureFlags) override</td></tr>
-<tr class="memdesc:a246bf3d6c9610a8db3cd6645806ba34f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns supported sample description for requested FSAA mode, with graceful downgrading.  <a href="class_ogre_1_1_d3_d11_render_system.html#a246bf3d6c9610a8db3cd6645806ba34f">More...</a><br /></td></tr>
-<tr class="separator:a246bf3d6c9610a8db3cd6645806ba34f"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a6fc36c28010a8d304b968f06ad72c7e3"><td class="memItemLeft" align="right" valign="top"><a class="el" href="struct_ogre_1_1_sample_description.html">SampleDescription</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_ogre_1_1_d3_d11_render_system.html#a6fc36c28010a8d304b968f06ad72c7e3">validateSampleDescription</a> (const <a class="el" href="struct_ogre_1_1_sample_description.html">SampleDescription</a> &amp;sampleDesc, <a class="el" href="group___image.html#ga71f09fe41a1db41186262f1aa5814a18">PixelFormatGpu</a> format, <a class="el" href="namespace_ogre.html#a5a7c15d68e8c7d585c410bc5a93682f4">uint32</a> textureFlags) override</td></tr>
+<tr class="memdesc:a6fc36c28010a8d304b968f06ad72c7e3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns supported sample description for requested FSAA mode, with graceful downgrading.  <a href="class_ogre_1_1_d3_d11_render_system.html#a6fc36c28010a8d304b968f06ad72c7e3">More...</a><br /></td></tr>
+<tr class="separator:a6fc36c28010a8d304b968f06ad72c7e3"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="inherit_header pub_methods_class_ogre_1_1_render_system"><td colspan="2" onclick="javascript:toggleInherit('pub_methods_class_ogre_1_1_render_system')"><img src="closed.png" alt="-"/>&#160;Public Member Functions inherited from <a class="el" href="class_ogre_1_1_render_system.html">Ogre::RenderSystem</a></td></tr>
 <tr class="memitem:a3391b683d588628272d8d9de633e472e inherit pub_methods_class_ogre_1_1_render_system"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_ogre_1_1_render_system.html#a3391b683d588628272d8d9de633e472e">RenderSystem</a> ()</td></tr>
 <tr class="memdesc:a3391b683d588628272d8d9de633e472e inherit pub_methods_class_ogre_1_1_render_system"><td class="mdescLeft">&#160;</td><td class="mdescRight">Default Constructor.  <a href="class_ogre_1_1_render_system.html#a3391b683d588628272d8d9de633e472e">More...</a><br /></td></tr>
@@ -4840,8 +4840,8 @@ <h2 class="memtitle"><span class="permalink"><a href="#aef0108b035ba4efa9a5ba004
 
 </div>
 </div>
-<a id="a246bf3d6c9610a8db3cd6645806ba34f"></a>
-<h2 class="memtitle"><span class="permalink"><a href="#a246bf3d6c9610a8db3cd6645806ba34f">&#9670;&nbsp;</a></span>validateSampleDescription()</h2>
+<a id="a6fc36c28010a8d304b968f06ad72c7e3"></a>
+<h2 class="memtitle"><span class="permalink"><a href="#a6fc36c28010a8d304b968f06ad72c7e3">&#9670;&nbsp;</a></span>validateSampleDescription()</h2>
 
 <div class="memitem">
 <div class="memproto">
@@ -4865,13 +4865,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a246bf3d6c9610a8db3cd6645
           <td class="paramkey"></td>
           <td></td>
           <td class="paramtype"><a class="el" href="namespace_ogre.html#a5a7c15d68e8c7d585c410bc5a93682f4">uint32</a>&#160;</td>
-          <td class="paramname"><em>textureFlags</em>, </td>
-        </tr>
-        <tr>
-          <td class="paramkey"></td>
-          <td></td>
-          <td class="paramtype"><a class="el" href="namespace_ogre.html#a5a7c15d68e8c7d585c410bc5a93682f4">uint32</a>&#160;</td>
-          <td class="paramname"><em>depthTextureFlags</em>&#160;</td>
+          <td class="paramname"><em>textureFlags</em>&#160;</td>
         </tr>
         <tr>
           <td></td>
@@ -4892,14 +4886,13 @@ <h2 class="memtitle"><span class="permalink"><a href="#a246bf3d6c9610a8db3cd6645
   <table class="params">
     <tr><td class="paramname">sampleDesc</td><td>Reqiested sample description. </td></tr>
     <tr><td class="paramname">format</td><td>Use PF_NULL returns to query support for framebuffer-less rendering. </td></tr>
-    <tr><td class="paramname">textureFlags</td><td>See <a class="el" href="namespace_ogre_1_1_texture_flags.html#a59b71e36a14465bd82595d6d467e1434">TextureFlags::TextureFlags</a>. Relevant flags are: NotTexture Uav </td></tr>
-    <tr><td class="paramname">depthTextureFlags</td><td>Only used if format is a colour pixel format. Same as textureFlags, but for associated depth buffer if format. </td></tr>
+    <tr><td class="paramname">textureFlags</td><td>See <a class="el" href="namespace_ogre_1_1_texture_flags.html#a59b71e36a14465bd82595d6d467e1434">TextureFlags::TextureFlags</a>. Relevant flags are: NotTexture RenderToTexture Uav RenderWindowSpecific </td></tr>
   </table>
   </dd>
 </dl>
 <dl class="section return"><dt>Returns</dt><dd>Supported sample description for requested FSAA mode, with graceful downgrading. </dd></dl>
 
-<p>Reimplemented from <a class="el" href="class_ogre_1_1_render_system.html#aaaf78da347235d1fb0893b5aad4fc51f">Ogre::RenderSystem</a>.</p>
+<p>Reimplemented from <a class="el" href="class_ogre_1_1_render_system.html#ac4dab5e3913f88477b272ba842a07a4c">Ogre::RenderSystem</a>.</p>
 
 </div>
 </div>

diff --git a/api/latest/class_ogre_1_1_d3_d11_render_system.js b/api/latest/class_ogre_1_1_d3_d11_render_system.js
diff --git a/api/latest/class_ogre_1_1_g_l3_plus_render_system-members.html b/api/latest/class_ogre_1_1_g_l3_plus_render_system-members.html
@@ -311,7 +311,7 @@
   <tr><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html#a6219a2d1f92be5548983a03de9522365">useCustomRenderSystemCapabilities</a>(RenderSystemCapabilities *capabilities)</td><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html">Ogre::RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="class_ogre_1_1_g_l3_plus_render_system.html#a1a848d04085834e18d8f71dca7692ecf">validateConfigOptions</a>() override</td><td class="entry"><a class="el" href="class_ogre_1_1_g_l3_plus_render_system.html">Ogre::GL3PlusRenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html#a913bd8f0e2e19cf356ccaa3bed31543e">validateDevice</a>(bool forceDeviceElection=false)</td><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html">Ogre::RenderSystem</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
-  <tr class="even"><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html#aaaf78da347235d1fb0893b5aad4fc51f">validateSampleDescription</a>(const SampleDescription &amp;sampleDesc, PixelFormatGpu format, uint32 textureFlags, uint32 depthTextureFlags)</td><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html">Ogre::RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html#ac4dab5e3913f88477b272ba842a07a4c">validateSampleDescription</a>(const SampleDescription &amp;sampleDesc, PixelFormatGpu format, uint32 textureFlags)</td><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html">Ogre::RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
   <tr><td class="entry"><a class="el" href="class_ogre_1_1_g_l3_plus_render_system.html#a9429ac55a6dfa905f6ca767055a3ce42">~GL3PlusRenderSystem</a>() override</td><td class="entry"><a class="el" href="class_ogre_1_1_g_l3_plus_render_system.html">Ogre::GL3PlusRenderSystem</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html#a785f83ff8a4ee8fb21a11c9d6fe5c928">~RenderSystem</a>()</td><td class="entry"><a class="el" href="class_ogre_1_1_render_system.html">Ogre::RenderSystem</a></td><td class="entry"><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->

diff --git a/api/latest/class_ogre_1_1_g_l3_plus_render_system.html b/api/latest/class_ogre_1_1_g_l3_plus_render_system.html
@@ -677,9 +677,9 @@
 <tr class="memitem:a913bd8f0e2e19cf356ccaa3bed31543e inherit pub_methods_class_ogre_1_1_render_system"><td class="memItemLeft" align="right" valign="top">virtual bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_ogre_1_1_render_system.html#a913bd8f0e2e19cf356ccaa3bed31543e">validateDevice</a> (bool forceDeviceElection=false)</td></tr>
 <tr class="memdesc:a913bd8f0e2e19cf356ccaa3bed31543e inherit pub_methods_class_ogre_1_1_render_system"><td class="mdescLeft">&#160;</td><td class="mdescRight">Some render systems have moments when GPU device is temporarily unavailable, for example when D3D11 device is lost, or when iOS app is in background, etc.  <a href="class_ogre_1_1_render_system.html#a913bd8f0e2e19cf356ccaa3bed31543e">More...</a><br /></td></tr>
 <tr class="separator:a913bd8f0e2e19cf356ccaa3bed31543e inherit pub_methods_class_ogre_1_1_render_system"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aaaf78da347235d1fb0893b5aad4fc51f inherit pub_methods_class_ogre_1_1_render_system"><td class="memItemLeft" align="right" valign="top">virtual <a class="el" href="struct_ogre_1_1_sample_description.html">SampleDescription</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_ogre_1_1_render_system.html#aaaf78da347235d1fb0893b5aad4fc51f">validateSampleDescription</a> (const <a class="el" href="struct_ogre_1_1_sample_description.html">SampleDescription</a> &amp;sampleDesc, <a class="el" href="group___image.html#ga71f09fe41a1db41186262f1aa5814a18">PixelFormatGpu</a> format, <a class="el" href="namespace_ogre.html#a5a7c15d68e8c7d585c410bc5a93682f4">uint32</a> textureFlags, <a class="el" href="namespace_ogre.html#a5a7c15d68e8c7d585c410bc5a93682f4">uint32</a> depthTextureFlags)</td></tr>
-<tr class="memdesc:aaaf78da347235d1fb0893b5aad4fc51f inherit pub_methods_class_ogre_1_1_render_system"><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns supported sample description for requested FSAA mode, with graceful downgrading.  <a href="class_ogre_1_1_render_system.html#aaaf78da347235d1fb0893b5aad4fc51f">More...</a><br /></td></tr>
-<tr class="separator:aaaf78da347235d1fb0893b5aad4fc51f inherit pub_methods_class_ogre_1_1_render_system"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ac4dab5e3913f88477b272ba842a07a4c inherit pub_methods_class_ogre_1_1_render_system"><td class="memItemLeft" align="right" valign="top">virtual <a class="el" href="struct_ogre_1_1_sample_description.html">SampleDescription</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_ogre_1_1_render_system.html#ac4dab5e3913f88477b272ba842a07a4c">validateSampleDescription</a> (const <a class="el" href="struct_ogre_1_1_sample_description.html">SampleDescription</a> &amp;sampleDesc, <a class="el" href="group___image.html#ga71f09fe41a1db41186262f1aa5814a18">PixelFormatGpu</a> format, <a class="el" href="namespace_ogre.html#a5a7c15d68e8c7d585c410bc5a93682f4">uint32</a> textureFlags)</td></tr>
+<tr class="memdesc:ac4dab5e3913f88477b272ba842a07a4c inherit pub_methods_class_ogre_1_1_render_system"><td class="mdescLeft">&#160;</td><td class="mdescRight">Returns supported sample description for requested FSAA mode, with graceful downgrading.  <a href="class_ogre_1_1_render_system.html#ac4dab5e3913f88477b272ba842a07a4c">More...</a><br /></td></tr>
+<tr class="separator:ac4dab5e3913f88477b272ba842a07a4c inherit pub_methods_class_ogre_1_1_render_system"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="inherited"></a>
 Additional Inherited Members</h2></td></tr>