Fixed 'VERTEX_CONSTANT_BUFFER': 'struct' type redefinition when enabling Unity Builds #5387
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t and included in relevant dx files
|
Hello, Thanks for the PR. However I don't think it is adequate to introduce a new file only for that, especially considering the majority of backends are made of 2 files. Could you rework the PR to simply give them unique names e.g. |
|
Yup certainly can! |
fangshun2004
added a commit
to fangshun2004/imgui
that referenced
this pull request
Jun 15, 2022
commit 2ed9e21 Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 17:15:27 2022 +0200 Nav, Internals: wrap changes to g.NavWindow into a helper function to help track/log changes. Amend 076d8fc. Eventually we should REALLY clean up the SetNavWindow SetNavID SetFocusID FocusWindow fiasco. commit 1d6e34f Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 14:46:55 2022 +0200 Debug: Added ShowDebugLogWindow(). Internal: renamed old IMGUI_DEBUG_LOG() to IMGUI_DEBUG_PRINT(). Amended once. commit ec2c805 Author: Jack Knobel <jackknobel@users.noreply.github.com> Date: Sat Jun 11 20:52:27 2022 +1000 Backends: support for unity builds for dx10/dx11/dx12 backends (ocornut#5387) # Conflicts: # imgui.cpp # Conflicts: # imgui.cpp Signed-off-by: fangshun <fangshun2004@msn.com>
fangshun2004
added a commit
to fangshun2004/imgui
that referenced
this pull request
Jun 17, 2022
commit 07efd7c Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 15:58:26 2022 +0200 Renamed IMGUI_DISABLE_METRICS_WINDOW to IMGUI_DISABLE_DEBUG_TOOLS. commit 0857218 Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:58:44 2022 +0200 MovingWindow auto-cancelled if active id is stolen (instead of ill-defined bahavior + assert in docking). Followup to 27343ef commit 27343ef Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:55:45 2022 +0200 Nav, Focus: Changed SetKeyboardFocusHere() to not behave if a drag or window moving is in progress + move KeepAliveID() call from Scrollbar() to ScrollbarEx() commit ddcff10 Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:30:20 2022 +0200 Settings: Fixed some SetNextWindowPos/SetNextWindowSize API calls not marking settings as dirty. commit 6cac48d Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 11:51:19 2022 +0200 Drag, Slider: rework slightly or CTRL+Click or SetKeyboardFocusHere() will show 1 change of active id in the log (rather than a set,clear,set sequence) commit dd28500 Author: ocornut <omarcornut@gmail.com> Date: Tue Jun 14 19:06:44 2022 +0200 Debug: Add more log. Reworked IMGUI_DEBUG_PRINT IMGUI_DEBUG_PRINTF. Added internal IsDragDropActive() helper. DebugLog() output to TTY by default. Amend 1d6e34f. commit 2ed9e21 Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 17:15:27 2022 +0200 Nav, Internals: wrap changes to g.NavWindow into a helper function to help track/log changes. Amend 076d8fc. Eventually we should REALLY clean up the SetNavWindow SetNavID SetFocusID FocusWindow fiasco. commit 1d6e34f Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 14:46:55 2022 +0200 Debug: Added ShowDebugLogWindow(). Internal: renamed old IMGUI_DEBUG_LOG() to IMGUI_DEBUG_PRINT(). Amended once. commit ec2c805 Author: Jack Knobel <jackknobel@users.noreply.github.com> Date: Sat Jun 11 20:52:27 2022 +1000 Backends: support for unity builds for dx10/dx11/dx12 backends (ocornut#5387) # Conflicts: # imconfig.h # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h
fangshun2004
added a commit
to fangshun2004/imgui
that referenced
this pull request
Jun 18, 2022
commit 37a0785 Author: Rokas Kupstys <rokups@zoho.com> Date: Fri Jun 17 11:14:16 2022 +0300 Nav: Fixed inability to cancel nav in modal popups. (ocornut#5400) commit 07efd7c Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 15:58:26 2022 +0200 Renamed IMGUI_DISABLE_METRICS_WINDOW to IMGUI_DISABLE_DEBUG_TOOLS. commit 0857218 Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:58:44 2022 +0200 MovingWindow auto-cancelled if active id is stolen (instead of ill-defined bahavior + assert in docking). Followup to 27343ef commit 27343ef Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:55:45 2022 +0200 Nav, Focus: Changed SetKeyboardFocusHere() to not behave if a drag or window moving is in progress + move KeepAliveID() call from Scrollbar() to ScrollbarEx() commit ddcff10 Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:30:20 2022 +0200 Settings: Fixed some SetNextWindowPos/SetNextWindowSize API calls not marking settings as dirty. commit 6cac48d Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 11:51:19 2022 +0200 Drag, Slider: rework slightly or CTRL+Click or SetKeyboardFocusHere() will show 1 change of active id in the log (rather than a set,clear,set sequence) commit dd28500 Author: ocornut <omarcornut@gmail.com> Date: Tue Jun 14 19:06:44 2022 +0200 Debug: Add more log. Reworked IMGUI_DEBUG_PRINT IMGUI_DEBUG_PRINTF. Added internal IsDragDropActive() helper. DebugLog() output to TTY by default. Amend 1d6e34f. commit 2ed9e21 Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 17:15:27 2022 +0200 Nav, Internals: wrap changes to g.NavWindow into a helper function to help track/log changes. Amend 076d8fc. Eventually we should REALLY clean up the SetNavWindow SetNavID SetFocusID FocusWindow fiasco. commit 1d6e34f Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 14:46:55 2022 +0200 Debug: Added ShowDebugLogWindow(). Internal: renamed old IMGUI_DEBUG_LOG() to IMGUI_DEBUG_PRINT(). Amended once. commit ec2c805 Author: Jack Knobel <jackknobel@users.noreply.github.com> Date: Sat Jun 11 20:52:27 2022 +1000 Backends: support for unity builds for dx10/dx11/dx12 backends (ocornut#5387) # Conflicts: # docs/CHANGELOG.txt # imgui.h
fangshun2004
added a commit
to fangshun2004/imgui
that referenced
this pull request
Jun 22, 2022
commit d3fd263 Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 20 18:06:34 2022 +0200 Sliders: An initial click within the knob/grab doesn't shift its position. (ocornut#1946, ocornut#5328) + Adjust default GrabMinSize. commit f27af1b Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 20 16:44:49 2022 +0200 Internals: SliderBehaviorT: Minor refactor, clearer 0.0/1.0 early out. Should be no-op from user's point of view. ScaleValueFromRatioT() had early 0.0/1.0 ratio tests, shifting most of function by one indent. commit 90e8404 Author: omar <ocornut@users.noreply.github.com> Date: Mon Jun 20 15:35:48 2022 +0200 Update README.md commit 37a0785 Author: Rokas Kupstys <rokups@zoho.com> Date: Fri Jun 17 11:14:16 2022 +0300 Nav: Fixed inability to cancel nav in modal popups. (ocornut#5400) commit 07efd7c Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 15:58:26 2022 +0200 Renamed IMGUI_DISABLE_METRICS_WINDOW to IMGUI_DISABLE_DEBUG_TOOLS. commit 0857218 Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:58:44 2022 +0200 MovingWindow auto-cancelled if active id is stolen (instead of ill-defined bahavior + assert in docking). Followup to 27343ef commit 27343ef Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:55:45 2022 +0200 Nav, Focus: Changed SetKeyboardFocusHere() to not behave if a drag or window moving is in progress + move KeepAliveID() call from Scrollbar() to ScrollbarEx() commit ddcff10 Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:30:20 2022 +0200 Settings: Fixed some SetNextWindowPos/SetNextWindowSize API calls not marking settings as dirty. commit 6cac48d Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 11:51:19 2022 +0200 Drag, Slider: rework slightly or CTRL+Click or SetKeyboardFocusHere() will show 1 change of active id in the log (rather than a set,clear,set sequence) commit dd28500 Author: ocornut <omarcornut@gmail.com> Date: Tue Jun 14 19:06:44 2022 +0200 Debug: Add more log. Reworked IMGUI_DEBUG_PRINT IMGUI_DEBUG_PRINTF. Added internal IsDragDropActive() helper. DebugLog() output to TTY by default. Amend 1d6e34f. commit 2ed9e21 Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 17:15:27 2022 +0200 Nav, Internals: wrap changes to g.NavWindow into a helper function to help track/log changes. Amend 076d8fc. Eventually we should REALLY clean up the SetNavWindow SetNavID SetFocusID FocusWindow fiasco. commit 1d6e34f Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 14:46:55 2022 +0200 Debug: Added ShowDebugLogWindow(). Internal: renamed old IMGUI_DEBUG_LOG() to IMGUI_DEBUG_PRINT(). Amended once. commit ec2c805 Author: Jack Knobel <jackknobel@users.noreply.github.com> Date: Sat Jun 11 20:52:27 2022 +1000 Backends: support for unity builds for dx10/dx11/dx12 backends (ocornut#5387) # Conflicts: # imgui.h
fangshun2004
added a commit
to fangshun2004/imgui
that referenced
this pull request
Jun 22, 2022
commit 9aae45e Author: ocornut <omarcornut@gmail.com> Date: Tue Jun 21 17:38:27 2022 +0200 Version 1.88 (fix "Show Debug Log" checkbox in Metrics window) commit d51e5d2 Author: ocornut <omarcornut@gmail.com> Date: Tue Jun 21 17:20:06 2022 +0200 TabItem: revert support for SetNextItemOpen(true) at it creates too much ambiguity with p_open/close button vs Selected state. (ocornut#5262) Revert a small part of 4b97296. commit c4b9101 Author: ocornut <omarcornut@gmail.com> Date: Tue Jun 21 17:11:51 2022 +0200 TabBar: Tweak shrinking policy so that while resizing tabs that don't need shrinking keep their initial width more precisely. Has been the case before but adding support for SetNextItemWidth() ocornut#5262 made this more noticeable. commit 4b97296 Author: ocornut <omarcornut@gmail.com> Date: Tue Jun 21 16:20:01 2022 +0200 TabBar: TabItem() now reacts to SetNextItemWidth() and SetNextItemOpen(true). (ocornut#5262) commit d3fd263 Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 20 18:06:34 2022 +0200 Sliders: An initial click within the knob/grab doesn't shift its position. (ocornut#1946, ocornut#5328) + Adjust default GrabMinSize. commit f27af1b Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 20 16:44:49 2022 +0200 Internals: SliderBehaviorT: Minor refactor, clearer 0.0/1.0 early out. Should be no-op from user's point of view. ScaleValueFromRatioT() had early 0.0/1.0 ratio tests, shifting most of function by one indent. commit 90e8404 Author: omar <ocornut@users.noreply.github.com> Date: Mon Jun 20 15:35:48 2022 +0200 Update README.md commit 37a0785 Author: Rokas Kupstys <rokups@zoho.com> Date: Fri Jun 17 11:14:16 2022 +0300 Nav: Fixed inability to cancel nav in modal popups. (ocornut#5400) commit 07efd7c Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 15:58:26 2022 +0200 Renamed IMGUI_DISABLE_METRICS_WINDOW to IMGUI_DISABLE_DEBUG_TOOLS. commit 0857218 Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:58:44 2022 +0200 MovingWindow auto-cancelled if active id is stolen (instead of ill-defined bahavior + assert in docking). Followup to 27343ef commit 27343ef Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:55:45 2022 +0200 Nav, Focus: Changed SetKeyboardFocusHere() to not behave if a drag or window moving is in progress + move KeepAliveID() call from Scrollbar() to ScrollbarEx() commit ddcff10 Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 14:30:20 2022 +0200 Settings: Fixed some SetNextWindowPos/SetNextWindowSize API calls not marking settings as dirty. commit 6cac48d Author: ocornut <omarcornut@gmail.com> Date: Wed Jun 15 11:51:19 2022 +0200 Drag, Slider: rework slightly or CTRL+Click or SetKeyboardFocusHere() will show 1 change of active id in the log (rather than a set,clear,set sequence) commit dd28500 Author: ocornut <omarcornut@gmail.com> Date: Tue Jun 14 19:06:44 2022 +0200 Debug: Add more log. Reworked IMGUI_DEBUG_PRINT IMGUI_DEBUG_PRINTF. Added internal IsDragDropActive() helper. DebugLog() output to TTY by default. Amend 1d6e34f. commit 2ed9e21 Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 17:15:27 2022 +0200 Nav, Internals: wrap changes to g.NavWindow into a helper function to help track/log changes. Amend 076d8fc. Eventually we should REALLY clean up the SetNavWindow SetNavID SetFocusID FocusWindow fiasco. commit 1d6e34f Author: ocornut <omarcornut@gmail.com> Date: Mon Jun 13 14:46:55 2022 +0200 Debug: Added ShowDebugLogWindow(). Internal: renamed old IMGUI_DEBUG_LOG() to IMGUI_DEBUG_PRINT(). Amended once. commit ec2c805 Author: Jack Knobel <jackknobel@users.noreply.github.com> Date: Sat Jun 11 20:52:27 2022 +1000 Backends: support for unity builds for dx10/dx11/dx12 backends (ocornut#5387) # Conflicts: # imgui.h # imgui_draw.cpp # imgui_tables.cpp # imgui_widgets.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Platform: Windows
Compiler: MSBuild 17.2.1+52cd2da31
Small fix for in certain unity build globs I'll sometimes be presented with
error C2011: 'VERTEX_CONSTANT_BUFFER': 'struct' type redefinition.Unity Build Enabled via Directory.Build.props
EnableUnitySupport>true</EnableUnitySupport.I could change the name of
VERTEX_CONSTANT_BUFFERin each implementation (DX10, 11 and 12) but figured there may be some use long term in a shared implementation header for types. Kept shared includes however to each impl.cpp.