Skip to content

Commit 087ad47

Browse files
Replaced PLATFORM_EMSCRIPTEN CMake variable and c++ macro with PLATFORM_WEB
1 parent 7a69771 commit 087ad47

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ add_library(DiligentFX STATIC README.md ${SHADERS})
1212

1313
file(RELATIVE_PATH DILIGENT_FX_DIR "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
1414

15-
if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_EMSCRIPTEN)
15+
if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_IOS OR PLATFORM_TVOS OR PLATFORM_WEB)
1616
option(DILIGENT_INSTALL_FX "Install DiligentFX module headers and libraries" ON)
1717
else()
1818
set(DILIGENT_INSTALL_FX OFF)

PBR/src/PBR_Renderer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace Diligent
5050

5151
const SamplerDesc PBR_Renderer::CreateInfo::DefaultSampler = Sam_LinearWrap;
5252

53-
#if PLATFORM_EMSCRIPTEN
53+
#if PLATFORM_WEB
5454
static constexpr char MultiDrawGLSLExtension[] = "#extension GL_ANGLE_multi_draw : enable";
5555
#else
5656
static constexpr char MultiDrawGLSLExtension[] = "#extension GL_ARB_shader_draw_parameters : enable";
@@ -612,7 +612,7 @@ static Uint32 GetDefaultDiffuseSamplesCount(const GraphicsAdapterInfo& AdapterIn
612612
{
613613
return 512;
614614
}
615-
#elif PLATFORM_EMSCRIPTEN
615+
#elif PLATFORM_WEB
616616
{
617617
return 1024;
618618
}
@@ -1211,7 +1211,7 @@ ShaderMacroHelper PBR_Renderer::DefineMacros(const PSOKey& Key) const
12111211
{
12121212
if (m_Device.GetDeviceInfo().IsGLDevice())
12131213
{
1214-
#if PLATFORM_EMSCRIPTEN
1214+
#if PLATFORM_WEB
12151215
PrimitiveID = "gl_DrawID";
12161216
#else
12171217
PrimitiveID = "gl_DrawIDARB";

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DiligentFX is the [Diligent Engine](https://github.com/DiligentGraphics/Diligent
1010
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/macos-logo.png" width=24 valign="middle"> MacOS | [![Build Status](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-apple.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-apple.yml?query=branch%3Amaster) |
1111
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/apple-logo.png" width=24 valign="middle"> iOS | [![Build Status](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-apple.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-apple.yml?query=branch%3Amaster) |
1212
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/tvos-logo.png" width=24 valign="middle"> tvOS | [![Build Status](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-apple.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-apple.yml?query=branch%3Amaster) |
13-
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/emscripten-logo.png" width=24 valign="middle"> Emscripten | [![Build Status](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-emscripten.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-emscripten.yml?query=branch%3Amaster) |
13+
| <img src="https://github.com/DiligentGraphics/DiligentCore/blob/master/media/emscripten-logo.png" width=24 valign="middle"> Web | [![Build Status](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-emscripten.yml/badge.svg?branch=master)](https://github.com/DiligentGraphics/DiligentFX/actions/workflows/build-emscripten.yml?query=branch%3Amaster) |
1414

1515
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](License.txt)
1616
[![Chat on Discord](https://img.shields.io/discord/730091778081947680?logo=discord)](https://discord.gg/t7HGBK7)

0 commit comments

Comments
 (0)