summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/src/bgfx_p.h
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/src/bgfx_p.h')
-rw-r--r--3rdparty/bgfx/src/bgfx_p.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/3rdparty/bgfx/src/bgfx_p.h b/3rdparty/bgfx/src/bgfx_p.h
index 4562aaaf91c..e158b6021bd 100644
--- a/3rdparty/bgfx/src/bgfx_p.h
+++ b/3rdparty/bgfx/src/bgfx_p.h
@@ -201,8 +201,8 @@ namespace bgfx
#elif BX_PLATFORM_IOS
extern void* g_bgfxEaglLayer;
#elif BX_PLATFORM_LINUX
- extern ::Display* g_bgfxX11Display;
- extern ::Window g_bgfxX11Window;
+ extern void* g_bgfxX11Display;
+ extern uint32_t g_bgfxX11Window;
#elif BX_PLATFORM_OSX
extern void* g_bgfxNSWindow;
#elif BX_PLATFORM_WINDOWS
@@ -2681,6 +2681,7 @@ namespace bgfx
, (uint16_t)imageContainer.m_width
, (uint16_t)imageContainer.m_height
, (uint16_t)imageContainer.m_depth
+ , imageContainer.m_cubeMap
, imageContainer.m_numMips
, TextureFormat::Enum(imageContainer.m_format)
);
@@ -2689,11 +2690,12 @@ namespace bgfx
{
_info->format = TextureFormat::Unknown;
_info->storageSize = 0;
- _info->width = 0;
- _info->height = 0;
- _info->depth = 0;
+ _info->width = 0;
+ _info->height = 0;
+ _info->depth = 0;
_info->numMips = 0;
_info->bitsPerPixel = 0;
+ _info->cubeMap = false;
}
}