From 3b01df7293101ec1037df2c699b3c892d45fa900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 13 Oct 2014 20:05:23 -0700 Subject: [PATCH] Cleanup. --- src/config.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/config.h b/src/config.h index 8fdaa6e8..998ea1e0 100644 --- a/src/config.h +++ b/src/config.h @@ -107,20 +107,27 @@ # error "Can't define both BGFX_CONFIG_RENDERER_OPENGL and BGFX_CONFIG_RENDERER_OPENGLES" #endif // BGFX_CONFIG_RENDERER_OPENGL && BGFX_CONFIG_RENDERER_OPENGLES -#ifndef BGFX_CONFIG_DEBUG_PERFHUD -# define BGFX_CONFIG_DEBUG_PERFHUD 0 -#endif // BGFX_CONFIG_DEBUG_NVPERFHUD - +/// Enable use of extensions. #ifndef BGFX_CONFIG_RENDERER_USE_EXTENSIONS # define BGFX_CONFIG_RENDERER_USE_EXTENSIONS 1 #endif // BGFX_CONFIG_RENDERER_USE_EXTENSIONS -/// DX9 PIX markers +/// Enable use of tinystl. +#ifndef BGFX_CONFIG_USE_TINYSTL +# define BGFX_CONFIG_USE_TINYSTL 1 +#endif // BGFX_CONFIG_USE_TINYSTL + +/// Enable nVidia PerfHUD integration. +#ifndef BGFX_CONFIG_DEBUG_PERFHUD +# define BGFX_CONFIG_DEBUG_PERFHUD 0 +#endif // BGFX_CONFIG_DEBUG_NVPERFHUD + +/// Enable PIX markers. #ifndef BGFX_CONFIG_DEBUG_PIX # define BGFX_CONFIG_DEBUG_PIX BGFX_CONFIG_DEBUG #endif // BGFX_CONFIG_DEBUG_PIX -/// DX11 object names +/// Enable DX11 object names. #ifndef BGFX_CONFIG_DEBUG_OBJECT_NAME # define BGFX_CONFIG_DEBUG_OBJECT_NAME BGFX_CONFIG_DEBUG #endif // BGFX_CONFIG_DEBUG_OBJECT_NAME @@ -230,10 +237,6 @@ # define BGFX_CONFIG_MAX_CONSTANT_BUFFER_SIZE (512<<10) #endif // BGFX_CONFIG_MAX_CONSTANT_BUFFER_SIZE -#ifndef BGFX_CONFIG_USE_TINYSTL -# define BGFX_CONFIG_USE_TINYSTL 1 -#endif // BGFX_CONFIG_USE_TINYSTL - #ifndef BGFX_CONFIG_MAX_INSTANCE_DATA_COUNT # define BGFX_CONFIG_MAX_INSTANCE_DATA_COUNT 5 #endif // BGFX_CONFIG_MAX_INSTANCE_DATA_COUNT