From 1c063fdc67d601fc90aea7b8e9493924880a33f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Sat, 30 May 2020 08:22:08 -0700 Subject: [PATCH] Fixed spelling. --- bindings/cs/bgfx.cs | 4 ++-- bindings/d/funcs.d | 4 ++-- bindings/d/types.d | 2 +- include/bgfx/c99/bgfx.h | 2 +- include/bgfx/defines.h | 2 +- scripts/bgfx.idl | 5 ++--- src/version.h | 4 ++-- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/bindings/cs/bgfx.cs b/bindings/cs/bgfx.cs index 90be4f097..4aa3ae04a 100644 --- a/bindings/cs/bgfx.cs +++ b/bindings/cs/bgfx.cs @@ -967,7 +967,7 @@ public static partial class bgfx FlushAfterRender = 0x00002000, /// - /// This flag specifies where flip occurs. Default behavior is that flip occurs + /// This flag specifies where flip occurs. Default behaviour is that flip occurs /// before rendering new frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. /// FlipAfterRender = 0x00004000, @@ -2436,7 +2436,7 @@ public static partial class bgfx /// /// Back-buffer width. /// Back-buffer height. - /// See: `BGFX_RESET_*` for more info. - `BGFX_RESET_NONE` - No reset flags. - `BGFX_RESET_FULLSCREEN` - Not supported yet. - `BGFX_RESET_MSAA_X[2/4/8/16]` - Enable 2, 4, 8 or 16 x MSAA. - `BGFX_RESET_VSYNC` - Enable V-Sync. - `BGFX_RESET_MAXANISOTROPY` - Turn on/off max anisotropy. - `BGFX_RESET_CAPTURE` - Begin screen capture. - `BGFX_RESET_FLUSH_AFTER_RENDER` - Flush rendering after submitting to GPU. - `BGFX_RESET_FLIP_AFTER_RENDER` - This flag specifies where flip occurs. Default behavior is that flip occurs before rendering new frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. - `BGFX_RESET_SRGB_BACKBUFFER` - Enable sRGB backbuffer. + /// See: `BGFX_RESET_*` for more info. - `BGFX_RESET_NONE` - No reset flags. - `BGFX_RESET_FULLSCREEN` - Not supported yet. - `BGFX_RESET_MSAA_X[2/4/8/16]` - Enable 2, 4, 8 or 16 x MSAA. - `BGFX_RESET_VSYNC` - Enable V-Sync. - `BGFX_RESET_MAXANISOTROPY` - Turn on/off max anisotropy. - `BGFX_RESET_CAPTURE` - Begin screen capture. - `BGFX_RESET_FLUSH_AFTER_RENDER` - Flush rendering after submitting to GPU. - `BGFX_RESET_FLIP_AFTER_RENDER` - This flag specifies where flip occurs. Default behaviour is that flip occurs before rendering new frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. - `BGFX_RESET_SRGB_BACKBUFFER` - Enable sRGB backbuffer. /// Texture format. See: `TextureFormat::Enum`. /// [DllImport(DllName, EntryPoint="bgfx_reset", CallingConvention = CallingConvention.Cdecl)] diff --git a/bindings/d/funcs.d b/bindings/d/funcs.d index b1bdc8f72..dc8201e3f 100644 --- a/bindings/d/funcs.d +++ b/bindings/d/funcs.d @@ -199,7 +199,7 @@ version(BindBgfx_Static) * - `BGFX_RESET_CAPTURE` - Begin screen capture. * - `BGFX_RESET_FLUSH_AFTER_RENDER` - Flush rendering after submitting to GPU. * - `BGFX_RESET_FLIP_AFTER_RENDER` - This flag specifies where flip - * occurs. Default behavior is that flip occurs before rendering new + * occurs. Default behaviour is that flip occurs before rendering new * frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. * - `BGFX_RESET_SRGB_BACKBUFFER` - Enable sRGB backbuffer. * _format = Texture format. See: `TextureFormat::Enum`. @@ -2290,7 +2290,7 @@ else * - `BGFX_RESET_CAPTURE` - Begin screen capture. * - `BGFX_RESET_FLUSH_AFTER_RENDER` - Flush rendering after submitting to GPU. * - `BGFX_RESET_FLIP_AFTER_RENDER` - This flag specifies where flip - * occurs. Default behavior is that flip occurs before rendering new + * occurs. Default behaviour is that flip occurs before rendering new * frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. * - `BGFX_RESET_SRGB_BACKBUFFER` - Enable sRGB backbuffer. * _format = Texture format. See: `TextureFormat::Enum`. diff --git a/bindings/d/types.d b/bindings/d/types.d index c6477a315..65cfd9935 100644 --- a/bindings/d/types.d +++ b/bindings/d/types.d @@ -331,7 +331,7 @@ enum uint BGFX_RESET_MAXANISOTROPY = 0x00000100; /// Turn on/off max anisotropy. enum uint BGFX_RESET_CAPTURE = 0x00000200; /// Begin screen capture. enum uint BGFX_RESET_FLUSH_AFTER_RENDER = 0x00002000; /// Flush rendering after submitting to GPU. /** - * This flag specifies where flip occurs. Default behavior is that flip occurs + * This flag specifies where flip occurs. Default behaviour is that flip occurs * before rendering new frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. */ enum uint BGFX_RESET_FLIP_AFTER_RENDER = 0x00004000; diff --git a/include/bgfx/c99/bgfx.h b/include/bgfx/c99/bgfx.h index 8a7f303cd..5e7457784 100644 --- a/include/bgfx/c99/bgfx.h +++ b/include/bgfx/c99/bgfx.h @@ -1111,7 +1111,7 @@ BGFX_C_API void bgfx_shutdown(void); * - `BGFX_RESET_CAPTURE` - Begin screen capture. * - `BGFX_RESET_FLUSH_AFTER_RENDER` - Flush rendering after submitting to GPU. * - `BGFX_RESET_FLIP_AFTER_RENDER` - This flag specifies where flip - * occurs. Default behavior is that flip occurs before rendering new + * occurs. Default behaviour is that flip occurs before rendering new * frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. * - `BGFX_RESET_SRGB_BACKBUFFER` - Enable sRGB backbuffer. * @param[in] _format Texture format. See: `TextureFormat::Enum`. diff --git a/include/bgfx/defines.h b/include/bgfx/defines.h index 31f061fd4..6f3c1d20f 100644 --- a/include/bgfx/defines.h +++ b/include/bgfx/defines.h @@ -443,7 +443,7 @@ #define BGFX_RESET_MAXANISOTROPY UINT32_C(0x00000100) //!< Turn on/off max anisotropy. #define BGFX_RESET_CAPTURE UINT32_C(0x00000200) //!< Begin screen capture. #define BGFX_RESET_FLUSH_AFTER_RENDER UINT32_C(0x00002000) //!< Flush rendering after submitting to GPU. -/// This flag specifies where flip occurs. Default behavior is that flip occurs +/// This flag specifies where flip occurs. Default behaviour is that flip occurs /// before rendering new frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. #define BGFX_RESET_FLIP_AFTER_RENDER UINT32_C(0x00004000) #define BGFX_RESET_SRGB_BACKBUFFER UINT32_C(0x00008000) //!< Enable sRGB backbuffer. diff --git a/scripts/bgfx.idl b/scripts/bgfx.idl index af2f639b2..2388f0120 100644 --- a/scripts/bgfx.idl +++ b/scripts/bgfx.idl @@ -342,7 +342,6 @@ flag.ResetMsaa { bits = 32, shift = 4, range = 3, base = 1 } .X16 --- Enable 16x MSAA. () - flag.Reset { bits = 32 } .None ( 0) --- No reset flags. .Fullscreen ( 1) --- Not supported yet. @@ -350,7 +349,7 @@ flag.Reset { bits = 32 } .Maxanisotropy ( 9) --- Turn on/off max anisotropy. .Capture (10) --- Begin screen capture. .FlushAfterRender (14) --- Flush rendering after submitting to GPU. - .FlipAfterRender (15) --- This flag specifies where flip occurs. Default behavior is that flip occurs + .FlipAfterRender (15) --- This flag specifies where flip occurs. Default behaviour is that flip occurs --- before rendering new frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. .SrgbBackbuffer (16) --- Enable sRGB backbuffer. .Hdr10 (17) --- Enable HDR10 rendering. @@ -1145,7 +1144,7 @@ func.reset --- - `BGFX_RESET_CAPTURE` - Begin screen capture. --- - `BGFX_RESET_FLUSH_AFTER_RENDER` - Flush rendering after submitting to GPU. --- - `BGFX_RESET_FLIP_AFTER_RENDER` - This flag specifies where flip - --- occurs. Default behavior is that flip occurs before rendering new + --- occurs. Default behaviour is that flip occurs before rendering new --- frame. This flag only has effect when `BGFX_CONFIG_MULTITHREADED=0`. --- - `BGFX_RESET_SRGB_BACKBUFFER` - Enable sRGB backbuffer. .format "TextureFormat::Enum" --- Texture format. See: `TextureFormat::Enum`. diff --git a/src/version.h b/src/version.h index fb42a3af2..67390885c 100644 --- a/src/version.h +++ b/src/version.h @@ -9,5 +9,5 @@ * */ -#define BGFX_REV_NUMBER 7188 -#define BGFX_REV_SHA1 "30bda403f7835075012457e44ea9c85834d8ee30" +#define BGFX_REV_NUMBER 7217 +#define BGFX_REV_SHA1 "805a03914e773d3c6eac7ff98cc2387de6836c6f"