Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devel #3232

Merged
merged 5 commits into from
Sep 21, 2024
Merged

Devel #3232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb29c70
Volume: hide MCTables
paroj Sep 21, 2024
4ae8d34
GL: hide GLSLProgramFactory forward declaration
paroj Sep 21, 2024
9b1db08
Docs: only include main RenderSystem headers
paroj Sep 21, 2024
a6e9cb6
D3D9: drop unused mLights
paroj Sep 21, 2024
f904b1c
Vulkan: move USE_VALIDATION_LAYERS define to header
paroj Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...me/include/OgreVolumeIsoSurfaceTablesMC.h → ...Volume/src/OgreVolumeIsoSurfaceTablesMC.h
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion Docs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ if(DOXYGEN_FOUND)
file(GLOB BASIC_TUTORIALS ${PROJECT_SOURCE_DIR}/Docs/src/tutorials/basictutorials/*.md)
file(GLOB COMPONENTS ${PROJECT_SOURCE_DIR}/Components/*/include)
file(GLOB PLUGINS ${PROJECT_SOURCE_DIR}/PlugIns/*/include)
file(GLOB RENDERSYSTEMS ${PROJECT_SOURCE_DIR}/RenderSystems/*/include/Ogre*RenderSystem.h)

set(CMAKE_DOXYGEN_INPUT_LIST
${PROJECT_SOURCE_DIR}/OgreMain/include
Expand All @@ -44,7 +45,8 @@ if(DOXYGEN_FOUND)
${PLUGINS}
${PROJECT_SOURCE_DIR}/PlugIns/PCZSceneManager/docs/readme.md
${PROJECT_SOURCE_DIR}/PlugIns/DotScene/README.md
${PROJECT_SOURCE_DIR}/RenderSystems
${RENDERSYSTEMS}
${PROJECT_SOURCE_DIR}/RenderSystems/Direct3D9/include/OgreD3D9ResourceManager.h
${BASIC_TUTORIALS}
${PROJECT_SOURCE_DIR}/Docs/src/apimainpage.md
${PROJECT_SOURCE_DIR}/Docs/src/manual.md
Expand Down
4 changes: 0 additions & 4 deletions RenderSystems/Direct3D9/include/OgreD3D9RenderSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ namespace Ogre
* Implementation of DirectX9 as a rendering system.
* @{
*/
#define MAX_LIGHTS 8

class D3D9DriverList;
class D3D9Driver;
Expand Down Expand Up @@ -112,9 +111,6 @@ namespace Ogre
/// Saved manual colour blends
ColourValue mManualBlendColours[OGRE_MAX_TEXTURE_LAYERS][2];

// Array of up to 8 lights, indexed as per API
// Note that a null value indicates a free slot
Light* mLights[MAX_LIGHTS];
D3D9DriverList* getDirect3DDrivers();
void refreshD3DSettings();
void refreshFSAAOptions();
Expand Down
5 changes: 0 additions & 5 deletions RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@ namespace Ogre
// Create the resource manager.
mResourceManager = OGRE_NEW D3D9ResourceManager();


// init lights
for(int i = 0; i < MAX_LIGHTS; i++ )
mLights[i] = 0;

// Create our Direct3D object
if( NULL == (mD3D = Direct3DCreate9(D3D_SDK_VERSION)) )
OGRE_EXCEPT( Exception::ERR_INTERNAL_ERROR, "Failed to create Direct3D9 object", "D3D9RenderSystem::D3D9RenderSystem" );
Expand Down
6 changes: 1 addition & 5 deletions RenderSystems/GL/include/OgreGLRenderSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ namespace Ogre {
* @{
*/

namespace GLSL {
class GLSLProgramFactory;
}

/**
Implementation of GL as a rendering system.
*/
Expand Down Expand Up @@ -101,7 +97,7 @@ namespace Ogre {

HardwareBufferManager* mHardwareBufferManager;
GLGpuProgramManager* mGpuProgramManager;
GLSL::GLSLProgramFactory* mGLSLProgramFactory;
GpuProgramFactory* mGLSLProgramFactory;

unsigned short mCurrentLights;

Expand Down
3 changes: 3 additions & 0 deletions RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ namespace Ogre
* Implementation of Vulkan as a rendering system.
* @{
*/

#define USE_VALIDATION_LAYERS 0

class _OgreVulkanExport VulkanRenderSystem : public RenderSystem
{
friend class VulkanSampler;
Expand Down
2 changes: 0 additions & 2 deletions RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ THE SOFTWARE.
#include "OgreVulkanWindow.h"
#include "OgrePixelFormat.h"

#define USE_VALIDATION_LAYERS 0

namespace Ogre
{
static const uint32 VERTEX_ATTRIBUTE_INDEX[VES_COUNT] =
Expand Down
Loading