diff options
author | 2019-10-13 13:50:38 +0200 | |
---|---|---|
committer | 2019-10-13 07:50:38 -0400 | |
commit | 0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch) | |
tree | 626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /3rdparty/bgfx/examples/common/imgui/scintilla.h | |
parent | c913ccb59d713ce0b91135520719ac5385e54358 (diff) |
WIP: sync bgfx, bx and bimg with latest upstream (#5723)
* Sync with bgfx upstream revision b91d0b6
* Sync with bx upstream revision d60912b
* Sync with bimg upstream revision bd81f60
* Add astc-codec decoder
* Rename VertexDecl to VertexLayout
* Rename UniformType enum Int1 to Sampler.
* Add NVN stub
* Fix unused-const-variable error on macOS
* Drop redundant explicit language parameters
buildoptions_cpp are only applied to c++ files and buildoptions_objcpp are only
applied to objective c++ files. As such, hardcoding -x offers no benefit while
preventing overrides (such as one needed by 3rdparty/bgfx/src/renderer_vk.cpp on
macOS) from working.
* Re-introduce -x c++ in places where C code is compiled as C++ to prevent clang from throwing a warning
* Build bgfx as Objective-C++ on macOS
It is needed due to included headers
* Enable Direct3D12 and Vulkan bgfx rendering backends
* Enable building of spirv shaders
* Properly escape /c in cmd call
* Comment out dx12 bgfx renderer
* Honor VERBOSE setting during shaders build
* Only invert hlsl shader XYZ_TO_sRGB matrix for opengl
* Add spirv shaders
* OpenGL ES needs transposed matrix too
* Metal needs transposed matrix as well
Diffstat (limited to '3rdparty/bgfx/examples/common/imgui/scintilla.h')
-rw-r--r-- | 3rdparty/bgfx/examples/common/imgui/scintilla.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/3rdparty/bgfx/examples/common/imgui/scintilla.h b/3rdparty/bgfx/examples/common/imgui/scintilla.h deleted file mode 100644 index c575a5f403b..00000000000 --- a/3rdparty/bgfx/examples/common/imgui/scintilla.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2011-2018 Branimir Karadzic. All rights reserved. - * License: https://github.com/bkaradzic/bgfx/blob/master/LICENSE - */ - -#ifndef SCINTILLA_H_HEADER_GUARD -#define SCINTILLA_H_HEADER_GUARD - -#if defined(SCI_NAMESPACE) - -#include <scintilla/include/Scintilla.h> - -struct ScintillaEditor -{ - static ScintillaEditor* create(int _width, int _height); - static void destroy(ScintillaEditor* _scintilla); - - intptr_t command(unsigned int _message, uintptr_t _p0 = 0, intptr_t _p1 = 0); - void draw(); -}; - -ScintillaEditor* ImGuiScintilla(const char* _name, bool* _opened, const ImVec2& _size); - -#endif // defined(SCI_NAMESPACE) - -#endif // SCINTILLA_H_HEADER_GUARD |