Skip to content

Commit 723b90e

Browse files
Fixed few iOS issues with file system & number of texture units
1 parent 24ec0a6 commit 723b90e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Graphics/GraphicsEngineOpenGL/src/GLContextState.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace Diligent
4545
m_Caps.m_iMaxCombinedTexUnits = 0;
4646
glGetIntegerv( GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &m_Caps.m_iMaxCombinedTexUnits );
4747
CHECK_GL_ERROR( "Failed to get max combined tex image units count" );
48-
m_Caps.m_iMaxCombinedTexUnits = std::max( m_Caps.m_iMaxCombinedTexUnits, 80 ); // Must be at least 80 in GL4.2
48+
VERIFY_EXPR(m_Caps.m_iMaxCombinedTexUnits > 0);
4949
}
5050

5151
m_BoundTextures.reserve( m_Caps.m_iMaxCombinedTexUnits );

Platforms/Basic/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set(INTERFACE
1616
interface/Errors.h
1717
)
1818

19-
if(PLATFORM_LINUX OR PLATFORM_WIN32 OR PLATFORM_MACOS)
19+
if(PLATFORM_LINUX OR PLATFORM_WIN32 OR PLATFORM_MACOS OR PLATFORM_IOS)
2020
list(APPEND SOURCE src/StandardFile.cpp)
2121
list(APPEND INTERFACE interface/StandardFile.h)
2222
endif()
@@ -40,4 +40,4 @@ source_group("interface" FILES ${INTERFACE})
4040

4141
set_target_properties(BasicPlatform PROPERTIES
4242
FOLDER Core/Platforms
43-
)
43+
)

Platforms/Basic/src/StandardFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ StandardFile::StandardFile(const FileOpenAttribs &OpenAttribs, Diligent::Char Sl
2929
BasicFile(OpenAttribs, SlashSymbol),
3030
m_pFile(nullptr)
3131
{
32-
#if defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS)
32+
#if defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(PLATFORM_IOS)
3333
auto OpenModeStr = GetOpenModeStr();
3434
m_pFile = fopen(m_OpenAttribs.strFilePath, OpenModeStr.c_str());
3535
if (m_pFile == nullptr)

0 commit comments

Comments
 (0)