Merge pull request #75769 from lyuma/msvc_node_debug_fix
Fix libwebp Node struct shadowing Godot's Node class in MSVC debugger
This commit is contained in:
commit
b4584c08f9
|
@ -364,6 +364,8 @@ Files extracted from upstream source:
|
||||||
- `src/` and `sharpyuv/` except from: `.am`, `.rc` and `.in` files
|
- `src/` and `sharpyuv/` except from: `.am`, `.rc` and `.in` files
|
||||||
- `AUTHORS`, `COPYING`, `PATENTS`
|
- `AUTHORS`, `COPYING`, `PATENTS`
|
||||||
|
|
||||||
|
Patch `godot-node-debug-fix.patch` workarounds shadowing of godot's Node class in the MSVC debugger.
|
||||||
|
|
||||||
|
|
||||||
## mbedtls
|
## mbedtls
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
diff --git a/thirdparty/libwebp/src/enc/quant_enc.c b/thirdparty/libwebp/src/enc/quant_enc.c
|
||||||
|
index 6d8202d277..8f9a3c8668 100644
|
||||||
|
--- a/src/enc/quant_enc.c
|
||||||
|
+++ b/src/enc/quant_enc.c
|
||||||
|
@@ -556,6 +556,11 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst,
|
||||||
|
//------------------------------------------------------------------------------
|
||||||
|
// Performs trellis-optimized quantization.
|
||||||
|
|
||||||
|
+// -- GODOT start --
|
||||||
|
+// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class.
|
||||||
|
+#define Node Node_libwebp_quant
|
||||||
|
+// -- GODOT end --
|
||||||
|
+
|
||||||
|
// Trellis node
|
||||||
|
typedef struct {
|
||||||
|
int8_t prev; // best previous node
|
|
@ -556,6 +556,11 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst,
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// Performs trellis-optimized quantization.
|
// Performs trellis-optimized quantization.
|
||||||
|
|
||||||
|
// -- GODOT start --
|
||||||
|
// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class.
|
||||||
|
#define Node Node_libwebp_quant
|
||||||
|
// -- GODOT end --
|
||||||
|
|
||||||
// Trellis node
|
// Trellis node
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int8_t prev; // best previous node
|
int8_t prev; // best previous node
|
||||||
|
|
Loading…
Reference in New Issue