diff options
Diffstat (limited to '3rdparty/bgfx/src/config.h')
-rw-r--r-- | 3rdparty/bgfx/src/config.h | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/3rdparty/bgfx/src/config.h b/3rdparty/bgfx/src/config.h index 6ee68224337..7c038715845 100644 --- a/3rdparty/bgfx/src/config.h +++ b/3rdparty/bgfx/src/config.h @@ -19,13 +19,11 @@ && !defined(BGFX_CONFIG_RENDERER_OPENGL) \ && !defined(BGFX_CONFIG_RENDERER_OPENGLES) \ && !defined(BGFX_CONFIG_RENDERER_VULKAN) \ - && !defined(BGFX_CONFIG_RENDERER_GNM) \ - && !defined(BGFX_CONFIG_RENDERER_NOOP) + && !defined(BGFX_CONFIG_RENDERER_GNM) # ifndef BGFX_CONFIG_RENDERER_DIRECT3D9 # define BGFX_CONFIG_RENDERER_DIRECT3D9 (0 \ || BX_PLATFORM_WINDOWS \ - || BX_PLATFORM_XBOX360 \ ? 1 : 0) # endif // BGFX_CONFIG_RENDERER_DIRECT3D9 @@ -65,10 +63,10 @@ || BX_PLATFORM_ANDROID \ || BX_PLATFORM_EMSCRIPTEN \ || BX_PLATFORM_IOS \ - || BX_PLATFORM_NACL \ || BX_PLATFORM_QNX \ || BX_PLATFORM_RPI \ || BX_PLATFORM_STEAMLINK \ + || BX_PLATFORM_NX \ ? 1 : 0) # endif // BGFX_CONFIG_RENDERER_OPENGLES @@ -77,6 +75,7 @@ || BX_PLATFORM_ANDROID \ || BX_PLATFORM_LINUX \ || BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_NX \ ? 1 : 0) # endif // BGFX_CONFIG_RENDERER_VULKAN @@ -86,18 +85,6 @@ ? 1 : 0) # endif // BGFX_CONFIG_RENDERER_GNM -# ifndef BGFX_CONFIG_RENDERER_NOOP -# define BGFX_CONFIG_RENDERER_NOOP (!(0 \ - || BGFX_CONFIG_RENDERER_DIRECT3D9 \ - || BGFX_CONFIG_RENDERER_DIRECT3D11 \ - || BGFX_CONFIG_RENDERER_DIRECT3D12 \ - || BGFX_CONFIG_RENDERER_METAL \ - || BGFX_CONFIG_RENDERER_OPENGL \ - || BGFX_CONFIG_RENDERER_OPENGLES \ - || BGFX_CONFIG_RENDERER_VULKAN \ - || BGFX_CONFIG_RENDERER_GNM \ - ? 1 : 0) ) -# endif // BGFX_CONFIG_RENDERER_NOOP #else # ifndef BGFX_CONFIG_RENDERER_DIRECT3D9 # define BGFX_CONFIG_RENDERER_DIRECT3D9 0 @@ -130,10 +117,6 @@ # ifndef BGFX_CONFIG_RENDERER_GNM # define BGFX_CONFIG_RENDERER_GNM 0 # endif // BGFX_CONFIG_RENDERER_GNM - -# ifndef BGFX_CONFIG_RENDERER_NOOP -# define BGFX_CONFIG_RENDERER_NOOP 0 -# endif // BGFX_CONFIG_RENDERER_NOOP #endif // !defined... #if BGFX_CONFIG_RENDERER_OPENGL && BGFX_CONFIG_RENDERER_OPENGL < 21 @@ -220,7 +203,7 @@ #endif // BGFX_CONFIG_SORT_KEY_NUM_BITS_DEPTH #ifndef BGFX_CONFIG_SORT_KEY_NUM_BITS_SEQ -# define BGFX_CONFIG_SORT_KEY_NUM_BITS_SEQ 11 +# define BGFX_CONFIG_SORT_KEY_NUM_BITS_SEQ 20 #endif // BGFX_CONFIG_SORT_KEY_NUM_BITS_SEQ #ifndef BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM @@ -254,7 +237,7 @@ #endif // BGFX_CONFIG_MAX_VERTEX_BUFFERS #ifndef BGFX_CONFIG_MAX_VERTEX_STREAMS -# define BGFX_CONFIG_MAX_VERTEX_STREAMS 1 +# define BGFX_CONFIG_MAX_VERTEX_STREAMS 4 #endif // BGFX_CONFIG_MAX_VERTEX_STREAMS #ifndef BGFX_CONFIG_MAX_DYNAMIC_INDEX_BUFFERS @@ -323,17 +306,9 @@ #define BGFX_CONFIG_DRAW_INDIRECT_STRIDE 32 -#ifndef BGFX_CONFIG_PROFILER_MICROPROFILE -# define BGFX_CONFIG_PROFILER_MICROPROFILE 0 -#endif // BGFX_CONFIG_PROFILER_MICROPROFILE - -#ifndef BGFX_CONFIG_PROFILER_REMOTERY -# define BGFX_CONFIG_PROFILER_REMOTERY 0 -#endif // BGFX_CONFIG_PROFILER_REMOTERY - -#ifndef BGFX_CONFIG_PROFILER_REMOTERY_BUILD_LIB -# define BGFX_CONFIG_PROFILER_REMOTERY_BUILD_LIB BGFX_CONFIG_PROFILER_REMOTERY -#endif // BGFX_CONFIG_PROFILER_REMOTERY_BUILD_LIB +#ifndef BGFX_CONFIG_PROFILER +# define BGFX_CONFIG_PROFILER 0 +#endif // BGFX_CONFIG_PROFILER #ifndef BGFX_CONFIG_RENDERDOC_LOG_FILEPATH # define BGFX_CONFIG_RENDERDOC_LOG_FILEPATH "temp/bgfx" @@ -344,7 +319,15 @@ #endif // BGFX_CONFIG_RENDERDOC_CAPTURE_KEYS #ifndef BGFX_CONFIG_API_SEMAPHORE_TIMEOUT -# define BGFX_CONFIG_API_SEMAPHORE_TIMEOUT (-1) +# define BGFX_CONFIG_API_SEMAPHORE_TIMEOUT (5000) #endif // BGFX_CONFIG_API_SEMAPHORE_TIMEOUT +#ifndef BGFX_CONFIG_MIP_LOD_BIAS +# define BGFX_CONFIG_MIP_LOD_BIAS 0 +#endif // BGFX_CONFIG_MIP_LOD_BIAS + +#ifndef BGFX_CONFIG_MAX_ENCODERS +# define BGFX_CONFIG_MAX_ENCODERS ( (0 != BGFX_CONFIG_MULTITHREADED) ? 8 : 1) +#endif // BGFX_CONFIG_MAX_ENCODERS + #endif // BGFX_CONFIG_H_HEADER_GUARD |