p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replacing PLATFORM_WINDOWS by _WIN32

This commit is contained in:
bernatx 2023-01-14 00:04:55 +01:00 committed by bernat
parent ffbb543974
commit 3c37150cd5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/PixelReader.h
View File

@ -10,7 +10,7 @@
#include "Engine/TextureRenderTarget2D.h"
#include "Runtime/ImageWriteQueue/Public/ImagePixelData.h"
#ifdef PLATFORM_WINDOWS
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <D3d12.h>
#endif
@ -137,7 +137,7 @@ void FPixelReader::SendPixelsInRenderThread(TSensor &Sensor, bool use16BitFormat
uint32 CurrentRowBytes = ExpectedRowBytes;
#ifdef PLATFORM_WINDOWS
#ifdef _WIN32
// DirectX uses additional bytes to align each row to 256 boundry,
// so we need to remove that extra data
if (IsD3DPlatform(GMaxRHIShaderPlatform, false))
@ -159,7 +159,7 @@ void FPixelReader::SendPixelsInRenderThread(TSensor &Sensor, bool use16BitFormat
}
}
}
#endif // PLATFORM_WINDOWS
#endif // _WIN32
if (ExpectedRowBytes == CurrentRowBytes)
{