diff --git a/qrenderdoc/Widgets/BufferFormatSpecifier.ui b/qrenderdoc/Widgets/BufferFormatSpecifier.ui index 5df1e84f8..4690b46e2 100644 --- a/qrenderdoc/Widgets/BufferFormatSpecifier.ui +++ b/qrenderdoc/Widgets/BufferFormatSpecifier.ui @@ -29,49 +29,6 @@ 0 - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Toggle Help - - - - - - - - 0 - 0 - - - - Apply - - - - - @@ -178,6 +135,49 @@ Vectors (e.g. float4), matrices ([row_major] half3x4) and single-dimension array + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Toggle Help + + + + + + + + 0 + 0 + + + + Apply + + + + + diff --git a/qrenderdoc/Widgets/FindReplace.ui b/qrenderdoc/Widgets/FindReplace.ui index 62710ad53..d58565e3c 100644 --- a/qrenderdoc/Widgets/FindReplace.ui +++ b/qrenderdoc/Widgets/FindReplace.ui @@ -11,167 +11,6 @@ - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 0 - 0 - - - - - - - - Context - - - - - - Search in: - - - - - - - Match case - - - - - - - QComboBox::NoInsert - - - QComboBox::AdjustToContents - - - - Current File - - - - - All Files - - - - - - - - Use Regular Expressions - - - - - - - Match whole word - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Replace All - - - - - - - Find Next - - - - - - - Find All - - - - - - - Find Previous - - - - - - - Replace - - - - - - @@ -257,13 +96,6 @@ - - - - Replace with - - - @@ -280,6 +112,13 @@ + + + + Replace with + + + @@ -299,6 +138,167 @@ + + + + Context + + + + + + Match case + + + + + + + Search in: + + + + + + + Match whole word + + + + + + + QComboBox::NoInsert + + + QComboBox::AdjustToContents + + + + Current File + + + + + All Files + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Use Regular Expressions + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Find Previous + + + + + + + Find Next + + + + + + + Find All + + + + + + + Replace + + + + + + + Replace All + + + + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 0 + 0 + + + + diff --git a/qrenderdoc/Widgets/ReplayOptionsSelector.ui b/qrenderdoc/Widgets/ReplayOptionsSelector.ui index 4f50d6a8d..dc9a5b9b7 100644 --- a/qrenderdoc/Widgets/ReplayOptionsSelector.ui +++ b/qrenderdoc/Widgets/ReplayOptionsSelector.ui @@ -26,58 +26,6 @@ Form - - - - - 0 - 0 - - - - Use API Validation on replay: - - - - - - - - - - - - - - - 0 - 0 - - - - GPU Selection Override: - - - - - - - - - - - 0 - 0 - - - - Replay optimisation level: - - - - - - @@ -132,6 +80,58 @@ + + + + + 0 + 0 + + + + Use API Validation on replay: + + + + + + + + + + + + + + + 0 + 0 + + + + GPU Selection Override: + + + + + + + + + + + 0 + 0 + + + + Replay optimisation level: + + + + + + diff --git a/qrenderdoc/Windows/BufferViewer.ui b/qrenderdoc/Windows/BufferViewer.ui index 5721d5b1b..68f168e48 100644 --- a/qrenderdoc/Windows/BufferViewer.ui +++ b/qrenderdoc/Windows/BufferViewer.ui @@ -433,54 +433,6 @@ - - - - Far Plane: - - - - - - - Manually configure projection used by vertex pipeline. -Enter 0.0 to use automatic/guessed value derived from data. - - - - - - - 0.000000000000000 - - - 10.000000000000000 - - - 0.010000000000000 - - - - - - - 1.000000000000000 - - - 180.000000000000000 - - - 90.000000000000000 - - - - - - - Near Plane: - - - @@ -488,37 +440,6 @@ Enter 0.0 to use automatic/guessed value derived from data. - - - - Persp. FOV: - - - - - - - Qt::Horizontal - - - - - - - Aspect Ratio: - - - - - - - 1000000.000000000000000 - - - 10.000000000000000 - - - @@ -544,6 +465,21 @@ Enter 0.0 to use automatic/guessed value derived from data. + + + + Manually configure projection used by vertex pipeline. +Enter 0.0 to use automatic/guessed value derived from data. + + + + + + + Matrix Type: + + + @@ -560,17 +496,50 @@ Enter 0.0 to use automatic/guessed value derived from data. - - + + - + Persp. FOV: - - + + + + 1.000000000000000 + + + 180.000000000000000 + + + 90.000000000000000 + + + + + - Matrix Type: + Aspect Ratio: + + + + + + + 0.000000000000000 + + + 10.000000000000000 + + + 0.010000000000000 + + + + + + + Near Plane: @@ -584,6 +553,71 @@ Enter 0.0 to use automatic/guessed value derived from data. + + + + Far Plane: + + + + + + + 1000000.000000000000000 + + + 10.000000000000000 + + + + + + + Axis Mapping: + + + + + + + + + + false + + + Edit Custom Mapping + + + + + + + Qt::Horizontal + + + + + + + Bounding Box: + + + + + + + + + + + + + + + + + @@ -597,40 +631,6 @@ Enter 0.0 to use automatic/guessed value derived from data. - - - - - - - - - - - Bounding Box: - - - - - - - Axis Mapping: - - - - - - - false - - - Edit Custom Mapping - - - - - - diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui index d12cc184c..c2d991487 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.ui +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.ui @@ -50,6 +50,16 @@ 4 + + + + Browse for an executable file + + + Executable Path + + + @@ -83,6 +93,19 @@ + + + + + 0 + 20 + + + + Browse for a working directory + + + @@ -103,49 +126,6 @@ - - - - The environment variables for the executable - - - Environment Variables - - - - - - - The environment variables for the executable - - - ... - - - - - - - Browse for an executable file - - - Executable Path - - - - - - - - 0 - 20 - - - - Browse for a working directory - - - @@ -159,6 +139,16 @@ + + + + The environment variables for the executable + + + Environment Variables + + + @@ -169,6 +159,16 @@ + + + + The environment variables for the executable + + + ... + + + @@ -190,13 +190,6 @@ Process - - - - Refresh - - - @@ -249,13 +242,6 @@ - - - - Filter process list by PID or name - - - @@ -287,6 +273,20 @@ + + + + Filter process list by PID or name + + + + + + + Refresh + + + diff --git a/qrenderdoc/Windows/Dialogs/CrashDialog.ui b/qrenderdoc/Windows/Dialogs/CrashDialog.ui index 69ebdb4df..e88995e8a 100644 --- a/qrenderdoc/Windows/Dialogs/CrashDialog.ui +++ b/qrenderdoc/Windows/Dialogs/CrashDialog.ui @@ -229,6 +229,71 @@ Bug Report + + + + Filled out at runtime + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + Email Address + + + + + + + Enter your contact info to help fix this bug + + + + + + + Remember email address for next time + + + + + + + Last Capture + + + + + + + Upload this capture with bug report + + + + + + + filename_of_capture.rdc + + + @@ -278,6 +343,38 @@ + + + + Description of Problem + + + true + + + + + + + + 0 + 0 + + + + + 0 + 100 + + + + + 16777215 + 100 + + + + @@ -323,103 +420,6 @@ - - - - Remember email address for next time - - - - - - - filename_of_capture.rdc - - - - - - - - 0 - 0 - - - - - 0 - 100 - - - - - 16777215 - 100 - - - - - - - - Filled out at runtime - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - true - - - - - - - Email Address - - - - - - - Last Capture - - - - - - - Upload this capture with bug report - - - - - - - Enter your contact info to help fix this bug - - - - - - - Description of Problem - - - true - - - - - - - Qt::Horizontal - - - diff --git a/qrenderdoc/Windows/Dialogs/ExtensionManager.ui b/qrenderdoc/Windows/Dialogs/ExtensionManager.ui index a2d7f42a7..f72c9e1b3 100644 --- a/qrenderdoc/Windows/Dialogs/ExtensionManager.ui +++ b/qrenderdoc/Windows/Dialogs/ExtensionManager.ui @@ -57,16 +57,6 @@ Details - - - - URL: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - @@ -77,26 +67,6 @@ - - - - Author: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - - - - - Version: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - @@ -104,6 +74,39 @@ + + + + Version: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + + + + + + 0 + 0 + + + + + + + + + + + Author: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + @@ -114,6 +117,16 @@ + + + + URL: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + @@ -124,6 +137,32 @@ + + + + Description: + + + Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing + + + + + + + QFrame::Panel + + + QFrame::Plain + + + true + + + Qt::NoTextInteraction + + + @@ -181,45 +220,6 @@ - - - - Description: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - - - - - - 0 - 0 - - - - - - - - - - - QFrame::Panel - - - QFrame::Plain - - - true - - - Qt::NoTextInteraction - - - diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.ui b/qrenderdoc/Windows/Dialogs/LiveCapture.ui index 58d10eb9c..cc3396a77 100644 --- a/qrenderdoc/Windows/Dialogs/LiveCapture.ui +++ b/qrenderdoc/Windows/Dialogs/LiveCapture.ui @@ -63,23 +63,6 @@ - - - - None - - - Qt::RichText - - - - - - - Connecting - - - @@ -87,16 +70,6 @@ - - - - Capture in Progress: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -107,16 +80,6 @@ - - - - API: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -133,6 +96,23 @@ + + + + Connecting + + + + + + + API: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -158,6 +138,26 @@ + + + + None + + + Qt::RichText + + + + + + + Capture in Progress: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -190,62 +190,6 @@ Tools - - - - Capture Frame(s) Immediately - - - - - - - - 0 - 0 - - - - secs - - - 0 - - - 120.000000000000000 - - - 0.000000000000000 - - - - - - - Frame - - - 0 - - - 10000.000000000000000 - - - - - - - Capture After Delay: - - - - - - - Capture Specific Frame(s): - - - @@ -274,6 +218,62 @@ + + + + Capture Frame(s) Immediately + + + + + + + Capture After Delay: + + + + + + + + 0 + 0 + + + + secs + + + 0 + + + 120.000000000000000 + + + 0.000000000000000 + + + + + + + Capture Specific Frame(s): + + + + + + + Frame + + + 0 + + + 10000.000000000000000 + + + diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.ui b/qrenderdoc/Windows/Dialogs/SettingsDialog.ui index 6f86139f6..3c305f647 100644 --- a/qrenderdoc/Windows/Dialogs/SettingsDialog.ui +++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.ui @@ -26,13 +26,6 @@ 2 - - - - QDialogButtonBox::Ok - - - @@ -101,15 +94,10 @@ General - - - - Changes the default directory for the save dialog when saving capture files. - -Defaults to blank, which follows system default behaviour. - + + - Default save directory for captures + Visual theme of the UI @@ -126,6 +114,53 @@ Defaults to blank, which follows system default behaviour. + + + + A global scale for all fonts in the program. This will only scale text, icons and other UI elements will be scaled according to DPI settings as normal. + + + Global font scale (restart required) + + + + + + + A global scale for all fonts in the program. This will only scale text, icons and other UI elements will be scaled according to DPI settings as normal. + + + true + + + + + + + Wherever possible a monospaced font will be used instead of the default font + + + Prefer monospaced fonts in UI (restart required) + + + + + + + Wherever possible a monospaced font will be used instead of the default font + + + + + + + + + + Qt::Horizontal + + + @@ -137,6 +172,39 @@ e.g. a value of 2 means 0 will display as 0.00, 0.5 as 0.50. A value of 5 would + + + + Decimals will display at least this many digits. +e.g. a value of 2 means 0 will display as 0.00, 0.5 as 0.50 + + + 2 + + + + + + + No more decimal places than this will be displayed on floats. +e.g. a value of 5 means 0.123456789 will display as 0.12345 + + + Maximum decimal places on float values + + + + + + + No more decimal places than this will be displayed on floats. +e.g. a value of 5 means 0.123456789 will display as 0.12345 and 123.123456789 will display as 123.12345 + + + 5 + + + @@ -148,10 +216,25 @@ E.g. a value of 3 means 0.005 / 10 = 5E-4 - - + + + + Any numbers smaller than this exponent will be displayed in scientific notation. +E.g. a value of 3 means 0.005 / 10 = 5E-4 + + + 5 + + + + + + + Any numbers larger than this exponent will be displayed in scientific notation. +e.g. 1000 * 10 = 1e4 + - Visual theme of the UI + Positive exponential cutoff value @@ -169,46 +252,6 @@ e.g. 1000 * 10 = 1e4 - - - - Enables functionality on the capture application window that will insert RenderDoc automatically -into all new processes created - then inject into the target (matching) executable. - -Useful for capturing programs indirectly that can't easily be launched directly by RenderDoc - -Since this is a global system hook it must be used carefully and only when necessary! - - - Allow global process hooking - be careful! - - - - - - - If a capture is marked as being created on a significantly different system (different OS or platform) -as is currently running, then by default the UI will prompt to ask if you want to replay on a remote context. - -This option overrides that and will always replay locally if the local context is selected. - - - Always replay captures locally, never prompt about it - - - - - - - Changes the default directory for the save dialog when saving capture files. - -Defaults to blank, which follows system default behaviour. - - - Browse - - - @@ -230,58 +273,6 @@ Defaults to %TEMP%. - - - - No more decimal places than this will be displayed on floats. -e.g. a value of 5 means 0.123456789 will display as 0.12345 and 123.123456789 will display as 123.12345 - - - 5 - - - - - - - Decimals will display at least this many digits. -e.g. a value of 2 means 0 will display as 0.00, 0.5 as 0.50 - - - 2 - - - - - - - Allows RenderDoc to phone home to https://renderdoc.org to anonymously check for new versions. - - - - - - - - - - Changes the default directory for the save dialog when saving capture files. - -Defaults to blank, which follows system default behaviour. - - - - - - - No more decimal places than this will be displayed on floats. -e.g. a value of 5 means 0.123456789 will display as 0.12345 - - - Maximum decimal places on float values - - - @@ -294,57 +285,51 @@ Defaults to %TEMP%. - - + + - If a capture is marked as being created on a significantly different system (different OS or platform) -as is currently running, then by default the UI will prompt to ask if you want to replay on a remote context. + Changes the default directory for the save dialog when saving capture files. -This option overrides that and will always replay locally if the local context is selected. +Defaults to blank, which follows system default behaviour. - + Default save directory for captures - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - - + + - Any numbers smaller than this exponent will be displayed in scientific notation. -E.g. a value of 3 means 0.005 / 10 = 5E-4 - - - 5 + Changes the default directory for the save dialog when saving capture files. + +Defaults to blank, which follows system default behaviour. - - + + - Allows RenderDoc to phone home to https://renderdoc.org to anonymously check for new versions. + Changes the default directory for the save dialog when saving capture files. + +Defaults to blank, which follows system default behaviour. - Allow periodic anonymous update checks + Browse + + + + + + + Enables functionality on the capture application window that will insert RenderDoc automatically +into all new processes created - then inject into the target (matching) executable. + +Useful for capturing programs indirectly that can't easily be launched directly by RenderDoc + +Since this is a global system hook it must be used carefully and only when necessary! + + + Allow global process hooking - be careful! @@ -391,56 +376,64 @@ program should be launched through RenderDoc via the Launch Process panel. - - + + - Any numbers larger than this exponent will be displayed in scientific notation. -e.g. 1000 * 10 = 1e4 + Allows RenderDoc to phone home to https://renderdoc.org to anonymously check for new versions. - Positive exponential cutoff value + Allow periodic anonymous update checks - - + + - Wherever possible a monospaced font will be used instead of the default font + Allows RenderDoc to phone home to https://renderdoc.org to anonymously check for new versions. - - + + - Wherever possible a monospaced font will be used instead of the default font + If a capture is marked as being created on a significantly different system (different OS or platform) +as is currently running, then by default the UI will prompt to ask if you want to replay on a remote context. + +This option overrides that and will always replay locally if the local context is selected. - Prefer monospaced fonts in UI (restart required) + Always replay captures locally, never prompt about it - - + + - A global scale for all fonts in the program. This will only scale text, icons and other UI elements will be scaled according to DPI settings as normal. + If a capture is marked as being created on a significantly different system (different OS or platform) +as is currently running, then by default the UI will prompt to ask if you want to replay on a remote context. + +This option overrides that and will always replay locally if the local context is selected. - Global font scale (restart required) + - - - - A global scale for all fonts in the program. This will only scale text, icons and other UI elements will be scaled according to DPI settings as normal. + + + + Qt::Vertical - - true + + + 0 + 0 + - + @@ -510,55 +503,17 @@ e.g. 1000 * 10 = 1e4 Core - - - - Locates the RadeonGPUProfiler.exe which will be used to interop with when generating and opening RGP profiles. - + + - Path to Radeon GPU Profiler executable + Open Advanced Config Editor - - - - Locates the RadeonGPUProfiler.exe which will be used to interop with when generating and opening RGP profiles. - - - - - - - Qt::Vertical - - - - 20 - 387 - - - - - - - - Locates the RadeonGPUProfiler.exe which will be used to interop with when generating and opening RGP profiles. - + + - Browse - - - - - - - RenderDoc can optionally have integration with AMD's Radeon GPU Profiler, to allow capturing RGP from RenderDoc and allowing interop between the two. - -After interop is enabled you will need to reload any capture. - - - Enable Radeon GPU Profiler integration (requires capture reload) + Config Editor @@ -582,6 +537,18 @@ After interop is enabled you will need to reload any capture. + + + + RenderDoc can optionally have integration with AMD's Radeon GPU Profiler, to allow capturing RGP from RenderDoc and allowing interop between the two. + +After interop is enabled you will need to reload any capture. + + + Enable Radeon GPU Profiler integration (requires capture reload) + + + @@ -594,20 +561,46 @@ After interop is enabled you will need to reload any capture. - - + + + + Locates the RadeonGPUProfiler.exe which will be used to interop with when generating and opening RGP profiles. + - Config Editor + Path to Radeon GPU Profiler executable - - - - Open Advanced Config Editor + + + + Locates the RadeonGPUProfiler.exe which will be used to interop with when generating and opening RGP profiles. + + + + Locates the RadeonGPUProfiler.exe which will be used to interop with when generating and opening RGP profiles. + + + Browse + + + + + + + Qt::Vertical + + + + 20 + 387 + + + + @@ -677,13 +670,19 @@ After interop is enabled you will need to reload any capture. Texture Viewer - - + + + + + 0 + 0 + + - List of the directories with custom shaders + Reset visible range when changing event or texture - Custom shader directories + Reset Range on changing selection @@ -703,6 +702,22 @@ After interop is enabled you will need to reload any capture. + + + + + 0 + 0 + + + + The visible channels (RGBA) and selected mip/slice are remembered and restored per-texture. + + + Visible channels & mip/slice saved per-texture + + + @@ -719,18 +734,8 @@ After interop is enabled you will need to reload any capture. - - - - Choose custom shader search directories. - - - Choose directories - - - - - + + 0 @@ -738,10 +743,10 @@ After interop is enabled you will need to reload any capture. - The visible channels (RGBA) and selected mip/slice are remembered and restored per-texture. + Y-flipping state is remembered and restored per-texture, rather than treated as a global toggle. - Visible channels & mip/slice saved per-texture + Y-flipping state saved per-texture @@ -761,19 +766,23 @@ After interop is enabled you will need to reload any capture. - - - - - 0 - 0 - - + + - Reset visible range when changing event or texture + List of the directories with custom shaders - Reset Range on changing selection + Custom shader directories + + + + + + + Choose custom shader search directories. + + + Choose directories @@ -790,22 +799,6 @@ After interop is enabled you will need to reload any capture. - - - - - 0 - 0 - - - - Y-flipping state is remembered and restored per-texture, rather than treated as a global toggle. - - - Y-flipping state saved per-texture - - - @@ -887,18 +880,15 @@ After interop is enabled you will need to reload any capture. Shader Processing Tools - - - - Qt::Vertical + + + + <html><head/><body><p>Available Shader processing tools. These tools can be configured to translate from one form to another. Typically to e.g. disassemble from SPIR-V to GLSL or canonical assembly, or to compile from HLSL back to SPIR-V or DXBC.</p><p>Double click items to edit, drag row header to change relative priority.</p></body></html> - - - 20 - 40 - + + true - + @@ -966,15 +956,18 @@ After interop is enabled you will need to reload any capture. - - - - <html><head/><body><p>Available Shader processing tools. These tools can be configured to translate from one form to another. Typically to e.g. disassemble from SPIR-V to GLSL or canonical assembly, or to compile from HLSL back to SPIR-V or DXBC.</p><p>Double click items to edit, drag row header to change relative priority.</p></body></html> + + + + Qt::Vertical - - true + + + 20 + 40 + - + @@ -1004,26 +997,6 @@ After interop is enabled you will need to reload any capture. Event Browser - - - - The time unit to use when displaying the duration column in the event browser - - - - - - - Qt::Vertical - - - - 20 - 297 - - - - @@ -1040,45 +1013,10 @@ After interop is enabled you will need to reload any capture. - - + + - When coloring marker sections in the Event Browser, the whole row of a marker region will be colored, not just a bar to the left of its children. - - - - Colorise whole row for marker regions - - - - - - - In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color. - - - - Apply marker colors - - - - - - - When coloring marker sections in the Event Browser, the whole row of a marker region will be colored, not just a bar to the left of its children. - - - - - - - - - - In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color. - - - - + The time unit to use when displaying the duration column in the event browser @@ -1102,6 +1040,61 @@ After interop is enabled you will need to reload any capture. + + + + In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color. + + + + Apply marker colors + + + + + + + In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color. + + + + + + + + + + + When coloring marker sections in the Event Browser, the whole row of a marker region will be colored, not just a bar to the left of its children. + + + - Colorise whole row for marker regions + + + + + + + When coloring marker sections in the Event Browser, the whole row of a marker region will be colored, not just a bar to the left of its children. + + + + + + + + + + Qt::Vertical + + + + 20 + 297 + + + + @@ -1201,13 +1194,6 @@ Only happens if the capture is not in the recent files list. Android - - - - Java JDK path - - - @@ -1218,18 +1204,39 @@ Only happens if the capture is not in the recent files list. - - - - Qt::Vertical + + + + The location of adb.exe, used to control Android devices. - - - 20 - 325 - + + + + + + The location of adb.exe, used to control Android devices. - + + Browse + + + + + + + Java JDK path + + + + + + + + + + Browse + + @@ -1254,32 +1261,18 @@ Only happens if the capture is not in the recent files list. - - - - The location of adb.exe, used to control Android devices. + + + + Qt::Vertical - - - - - - The location of adb.exe, used to control Android devices. + + + 20 + 325 + - - Browse - - - - - - - - - - Browse - - + @@ -1288,6 +1281,13 @@ Only happens if the capture is not in the recent files list. + + + + QDialogButtonBox::Ok + + + diff --git a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.ui b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.ui index 0e2a34395..feab946c2 100644 --- a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.ui +++ b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.ui @@ -197,6 +197,13 @@ 5 + + + + Export All Mips + + + @@ -207,13 +214,6 @@ - - - - Export All Mips - - - diff --git a/qrenderdoc/Windows/Dialogs/UpdateDialog.ui b/qrenderdoc/Windows/Dialogs/UpdateDialog.ui index c6ea33e45..9717ea3c3 100644 --- a/qrenderdoc/Windows/Dialogs/UpdateDialog.ui +++ b/qrenderdoc/Windows/Dialogs/UpdateDialog.ui @@ -281,20 +281,10 @@ 10 - - + + - New Version: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Download Size: + Current Version: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -321,6 +311,16 @@ + + + + New Version: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -328,6 +328,16 @@ + + + + Download Size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -335,16 +345,6 @@ - - - - Current Version: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui index 0635f0af4..74e56055d 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui @@ -297,104 +297,6 @@ - - - - - 0 - 0 - - - - Mesh View - - - - - - - 0 - 0 - - - - - 75 - 75 - - - - PointingHandCursor - - - View the mesh input data - - - :/wireframe_mesh.png - - - true - - - - - - - - - - - 0 - 0 - - - - Primitive Topology - - - - - - - 14 - - - - Triangle List - - - Qt::AlignHCenter|Qt::AlignTop - - - - - - - - 0 - 0 - - - - - 256 - 0 - - - - - - - :/topologies/topo_trilist.svg - - - Qt::AlignCenter - - - - - - @@ -576,6 +478,104 @@ + + + + + 0 + 0 + + + + Mesh View + + + + + + + 0 + 0 + + + + + 75 + 75 + + + + PointingHandCursor + + + View the mesh input data + + + :/wireframe_mesh.png + + + true + + + + + + + + + + + 0 + 0 + + + + Primitive Topology + + + + + + + 14 + + + + Triangle List + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + + 0 + 0 + + + + + 256 + 0 + + + + + + + :/topologies/topo_trilist.svg + + + Qt::AlignCenter + + + + + + @@ -2226,6 +2226,16 @@ 3 + + + + QFrame::Box + + + 4 + + + @@ -2243,41 +2253,10 @@ 0 - - - - - 12 - - + + - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - Line AA: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Depth Clip: + Fill Mode: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2305,23 +2284,10 @@ - - + + - Conservative Raster: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Depth Bias Clamp: + Cull Mode: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2349,10 +2315,10 @@ - - + + - Slope-Scaled Bias: + Front CCW: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2362,72 +2328,6 @@ - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - 0 - - - Qt::AlignCenter - - - 4 - - - @@ -2444,10 +2344,10 @@ - - + + - Front CCW: + Conservative Raster: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2457,96 +2357,8 @@ - - - - Forced Sample Count: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Multisample: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - Cull Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Fill Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - + + @@ -2574,8 +2386,132 @@ - - + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Depth Bias Clamp: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Slope-Scaled Bias: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Forced Sample Count: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0 + + + Qt::AlignCenter + + + 4 + + + + + + + Depth Clip: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + @@ -2603,6 +2539,80 @@ + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Multisample: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Line AA: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + @@ -2618,8 +2628,17 @@ - - + + + + + + + Predication + + + + QFrame::Box @@ -2628,6 +2647,48 @@ + + + + Value: + + + + + + + + 12 + + + + FALSE + + + + + + + Passing: + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -2741,67 +2802,6 @@ - - - - Predication - - - - - - QFrame::Box - - - 4 - - - - - - - Value: - - - - - - - - 12 - - - - FALSE - - - - - - - Passing: - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - @@ -3378,6 +3378,22 @@ 4 + + + + + 0 + 0 + + + + QFrame::Box + + + 4 + + + @@ -3408,13 +3424,15 @@ - - - - + + + + + 12 + - - :/cross.png + + 0.00, 0.00, 0.00, 0.00 Qt::AlignCenter @@ -3437,15 +3455,13 @@ - - - - - 12 - - + + - 0.00, 0.00, 0.00, 0.00 + + + + :/cross.png Qt::AlignCenter @@ -3468,19 +3484,6 @@ - - - - Alpha to Coverage: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - @@ -3499,6 +3502,19 @@ + + + + Alpha to Coverage: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + @@ -3517,22 +3533,6 @@ - - - - - 0 - 0 - - - - QFrame::Box - - - 4 - - - @@ -3563,6 +3563,22 @@ 4 + + + + + 0 + 0 + + + + QFrame::Box + + + 4 + + + @@ -3580,27 +3596,6 @@ 0 - - - - - 12 - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - @@ -3637,6 +3632,27 @@ + + + + + 12 + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + @@ -3667,22 +3683,6 @@ - - - - - 0 - 0 - - - - QFrame::Box - - - 4 - - - @@ -3716,58 +3716,6 @@ 4 - - - - - 0 - 0 - - - - QFrame::Box - - - QFrame::Plain - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAsNeeded - - - QAbstractScrollArea::AdjustToContents - - - QAbstractItemView::NoEditTriggers - - - false - - - QAbstractItemView::NoSelection - - - 0 - - - false - - - false - - - true - - - false - - - false - - - @@ -3943,6 +3891,58 @@ + + + + + 0 + 0 + + + + QFrame::Box + + + QFrame::Plain + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAsNeeded + + + QAbstractScrollArea::AdjustToContents + + + QAbstractItemView::NoEditTriggers + + + false + + + QAbstractItemView::NoSelection + + + 0 + + + false + + + false + + + true + + + false + + + false + + + diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui index 835f19763..622a05a7f 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.ui @@ -2173,61 +2173,6 @@ 0 - - - - - 0 - 0 - - - - Scissor Regions - - - - 2 - - - 2 - - - 2 - - - 2 - - - - - QFrame::Box - - - QFrame::Plain - - - QAbstractItemView::NoEditTriggers - - - false - - - 0 - - - false - - - true - - - 50 - - - - - - @@ -2249,6 +2194,19 @@ 0 + + + + Fill Mode: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + @@ -2267,15 +2225,28 @@ - - + + + + Cull Mode: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + 12 - 0.00 + None Qt::AlignCenter @@ -2285,26 +2256,10 @@ - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 0 - 0 - - - - - - + + - Fill Mode: + Front CCW: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2314,29 +2269,19 @@ - - + + - Depth Bias: + + + + :/cross.png - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignCenter - - true - - - - - - - Line AA: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true + + 4 @@ -2353,19 +2298,6 @@ - - - - Forced Sample Count: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - @@ -2382,13 +2314,63 @@ - - + + - + Base Shading Rate: - - :/cross.png + + + + + + + 12 + + + + 1x1 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 0 + 0 + + + + + + + + Depth Bias: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 Qt::AlignCenter @@ -2398,13 +2380,28 @@ - - + + - + Depth Bias Clamp: - - :/cross.png + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 Qt::AlignCenter @@ -2414,19 +2411,16 @@ - - + + - - - - :/cross.png + Slope-Scaled Bias: - Qt::AlignCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - 4 + + true @@ -2448,6 +2442,85 @@ + + + + Forced Sample Count: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0 + + + Qt::AlignCenter + + + 4 + + + + + + + Shading Rate Combiners: + + + + + + + + 12 + + + + Keep, Keep + + + + + + + Depth Clip: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + @@ -2461,26 +2534,26 @@ - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 0 - 0 - - - - - - + + - Depth Clip: + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Line AA: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2490,23 +2563,26 @@ - - + + - Front CCW: + + + + :/cross.png - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignCenter - - true + + 4 - - + + - Slope-Scaled Bias: + Sample Mask: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2534,134 +2610,6 @@ - - - - - 12 - - - - None - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - Cull Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Depth Bias Clamp: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Sample Mask: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Base Shading Rate: - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - 0 - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - 1x1 - - - @@ -2672,24 +2620,21 @@ - - - - Shading Rate Combiners: + + + + Qt::Vertical - - - - - - - 12 - + + QSizePolicy::Preferred - - Keep, Keep + + + 0 + 0 + - + @@ -2749,6 +2694,61 @@ + + + + + 0 + 0 + + + + Scissor Regions + + + + 2 + + + 2 + + + 2 + + + 2 + + + + + QFrame::Box + + + QFrame::Plain + + + QAbstractItemView::NoEditTriggers + + + false + + + 0 + + + false + + + true + + + 50 + + + + + + @@ -3356,19 +3356,6 @@ 0 - - - - Blend Factor: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - @@ -3427,6 +3414,19 @@ + + + + Blend Factor: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + @@ -3475,51 +3475,10 @@ 0 - - + + - Bounds: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 12 - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - Write: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Func: + Enabled: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -3542,10 +3501,38 @@ - - + + - Enabled: + Func: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 12 + + + + GREATER_EQUAL + + + Qt::AlignCenter + + + 4 + + + + + + + Write: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -3573,15 +3560,28 @@ - - + + + + Bounds: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + 12 - GREATER_EQUAL + + + + :/cross.png Qt::AlignCenter diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui index 5cea6de78..0d991427b 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.ui @@ -236,6 +236,120 @@ 0 + + + + + 0 + 0 + + + + Vertex Attribute Formats + + + + 2 + + + 2 + + + 2 + + + 2 + + + + + QFrame::Box + + + QFrame::Plain + + + QAbstractItemView::NoEditTriggers + + + false + + + 0 + + + false + + + false + + + true + + + false + + + false + + + + + + + + + + Vertex Array Object + + + + 0 + + + 9 + + + 0 + + + 9 + + + 4 + + + + + + 250 + 20 + + + + QFrame::Box + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + @@ -300,62 +414,44 @@ - - + + - + 0 0 - Vertex Attribute Formats + Mesh View - - - 2 - - - 2 - - - 2 - - - 2 - + - - - QFrame::Box + + + + 0 + 0 + - - QFrame::Plain + + + 75 + 75 + - - QAbstractItemView::NoEditTriggers + + PointingHandCursor - - false + + View the mesh input data - - 0 + + :/wireframe_mesh.png - - false - - - false - - + true - - false - - - false - @@ -431,102 +527,6 @@ - - - - - 0 - 0 - - - - Mesh View - - - - - - - 0 - 0 - - - - - 75 - 75 - - - - PointingHandCursor - - - View the mesh input data - - - :/wireframe_mesh.png - - - true - - - - - - - - - - Vertex Array Object - - - - 0 - - - 9 - - - 0 - - - 9 - - - 4 - - - - - - 250 - 20 - - - - QFrame::Box - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - @@ -2468,6 +2468,488 @@ 0 + + + + Rasterizer State + + + + 2 + + + 2 + + + 2 + + + 2 + + + 0 + + + + + Fill Mode: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + Solid + + + Qt::AlignCenter + + + 4 + + + + + + + Cull Mode: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + None + + + Qt::AlignCenter + + + 4 + + + + + + + Front CCW: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Rasterizer Discard: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Depth Bias: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Slope-Scaled Bias: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Offset Clamp: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Clip Setup: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0,0 Lower Left, Z = -1 to 1 + + + Qt::AlignCenter + + + 4 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 0 + 0 + + + + + + + + Depth Clamp: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Scissor: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Provoking Vertex: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + Last + + + Qt::AlignCenter + + + 4 + + + + + + + Clip Distances: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0,1,2 + + + Qt::AlignCenter + + + 4 + + + + + + + Point Size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Line Width: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 0 + 0 + + + + + + + @@ -2489,26 +2971,10 @@ 0 - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 0 - 0 - - - - - - + + - Alpha to Coverage: + Multisample: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2518,35 +2984,6 @@ - - - - Sample Coverage: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 0 - 0 - - - - @@ -2563,6 +3000,35 @@ + + + + Sample Shading: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + @@ -2576,82 +3042,6 @@ - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - FFFFFFFF - - - Qt::AlignCenter - - - 4 - - - - - - - Sample Shading: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Multisample: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - @@ -2670,10 +3060,10 @@ - - + + - Sample Mask: + Alpha to Coverage: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2683,24 +3073,6 @@ - - - - - 12 - - - - 0.0 - - - Qt::AlignCenter - - - 4 - - - @@ -2730,6 +3102,116 @@ + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Sample Coverage: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.0 + + + Qt::AlignCenter + + + 4 + + + + + + + Sample Mask: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + FFFFFFFF + + + Qt::AlignCenter + + + 4 + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 0 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 0 + 0 + + + + @@ -2788,488 +3270,6 @@ - - - - Rasterizer State - - - - 2 - - - 2 - - - 2 - - - 2 - - - 0 - - - - - Depth Bias: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Cull Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Front CCW: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - None - - - Qt::AlignCenter - - - 4 - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - Fill Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - Solid - - - Qt::AlignCenter - - - 4 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 0 - 0 - - - - - - - - Rasterizer Discard: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - Offset Clamp: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - Slope-Scaled Bias: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0,0 Lower Left, Z = -1 to 1 - - - Qt::AlignCenter - - - 4 - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 0 - 0 - - - - - - - - Clip Setup: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - Last - - - Qt::AlignCenter - - - 4 - - - - - - - Provoking Vertex: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Clip Distances: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0,1,2 - - - Qt::AlignCenter - - - 4 - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - Scissor: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Line Width: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - Depth Clamp: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Point Size: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - @@ -4114,28 +4114,25 @@ - - + + - Bounds: + Func: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + 12 - - - - :/cross.png + GREATER_EQUAL Qt::AlignCenter @@ -4176,25 +4173,28 @@ - - + + - Func: + Bounds: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + 12 - GREATER_EQUAL + + + + :/cross.png Qt::AlignCenter diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui index 2c2cc818c..bd3b078b9 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.ui @@ -1803,81 +1803,6 @@ 0 - - - - Conditional Rendering - - - - - - Passing: - - - - - - - - - - Inverted: - - - - - - - - - - QFrame::Box - - - 4 - - - - - - - PointingHandCursor - - - Open Predicate Buffer - - - View - - - - :/action.png:/action.png - - - Qt::ToolButtonTextBesideIcon - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - @@ -1901,6 +1826,110 @@ 0 + + + + Fill Mode: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + Solid + + + Qt::AlignCenter + + + 4 + + + + + + + Cull Mode: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + None + + + Qt::AlignCenter + + + 4 + + + + + + + Front CCW: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Conservative Raster: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + @@ -1919,6 +1948,99 @@ + + + + Depth Bias: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Depth Bias Clamp: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + + + + + Slope-Scaled Bias: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + @@ -1950,6 +2072,108 @@ + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 0 + 0 + + + + + + + + Depth Clamp: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Depth Clip: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Line Width: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 12 + + + + 0.00 + + + Qt::AlignCenter + + + 4 + + + @@ -1981,324 +2205,6 @@ - - - - Conservative Raster: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Depth Bias Clamp: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Fill Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - Slope-Scaled Bias: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - Solid - - - Qt::AlignCenter - - - 4 - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - Front CCW: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Cull Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Depth Bias: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - Line Width: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - None - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - Depth Clamp: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - - 12 - - - - 0.00 - - - Qt::AlignCenter - - - 4 - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 0 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 0 - 0 - - - - - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - - - - - Rasterizer Discard: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - @@ -2361,10 +2267,10 @@ - - + + - Depth Clip: + Rasterizer Discard: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2374,8 +2280,11 @@ - - + + + + + :/cross.png @@ -2387,6 +2296,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 0 + 0 + + + + @@ -2411,10 +2336,10 @@ 0 - - + + - Min Sample Shading: + Sample Count: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2442,10 +2367,10 @@ - - + + - Sample Mask: + Sample Shading: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2455,10 +2380,26 @@ - - + + - Sample Shading: + + + + :/cross.png + + + Qt::AlignCenter + + + 4 + + + + + + + Min Sample Shading: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2486,10 +2427,10 @@ - - + + - Sample Count: + Sample Mask: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -2517,22 +2458,6 @@ - - - - - - - :/cross.png - - - Qt::AlignCenter - - - 4 - - - @@ -2606,6 +2531,136 @@ + + + + Conditional Rendering + + + + + + Passing: + + + + + + + + + + Inverted: + + + + + + + + + + QFrame::Box + + + 4 + + + + + + + PointingHandCursor + + + Open Predicate Buffer + + + View + + + + :/action.png:/action.png + + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + 0 + 0 + + + + Viewports + + + + 2 + + + 2 + + + 2 + + + 2 + + + + + QFrame::Box + + + QFrame::Plain + + + QAbstractItemView::NoEditTriggers + + + false + + + 0 + + + false + + + true + + + 50 + + + + + + @@ -2735,61 +2790,6 @@ - - - - - 0 - 0 - - - - Viewports - - - - 2 - - - 2 - - - 2 - - - 2 - - - - - QFrame::Box - - - QFrame::Plain - - - QAbstractItemView::NoEditTriggers - - - false - - - 0 - - - false - - - true - - - 50 - - - - - - @@ -3458,28 +3458,25 @@ - - + + - Bounds: + Func: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + 12 - - - - :/cross.png + GREATER_EQUAL Qt::AlignCenter @@ -3520,25 +3517,28 @@ - - + + - Func: + Bounds: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + 12 - GREATER_EQUAL + + + + :/cross.png Qt::AlignCenter diff --git a/qrenderdoc/Windows/ShaderViewer.ui b/qrenderdoc/Windows/ShaderViewer.ui index 7f74ae0a8..fe58616c8 100644 --- a/qrenderdoc/Windows/ShaderViewer.ui +++ b/qrenderdoc/Windows/ShaderViewer.ui @@ -648,10 +648,10 @@ - - + + - Compiler: + Entry Point: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -674,19 +674,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -697,6 +684,45 @@ + + + + + 0 + 20 + + + + QComboBox::NoInsert + + + QComboBox::AdjustToContents + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Compiler: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -719,45 +745,6 @@ - - - - - 0 - 20 - - - - QComboBox::NoInsert - - - QComboBox::AdjustToContents - - - - - - - Entry Point: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -771,6 +758,19 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/qrenderdoc/sort_qt_ui.py b/qrenderdoc/sort_qt_ui.py new file mode 100644 index 000000000..024374c6c --- /dev/null +++ b/qrenderdoc/sort_qt_ui.py @@ -0,0 +1,85 @@ +#!/usr/bin/env python3 + +import sys +import os +import functools +from xml.sax.saxutils import escape +import xml.etree.ElementTree as ET + +# on msys, use crlf output +nl = None +if sys.platform == 'msys': + nl = "\r\n" + +if len(sys.argv) <= 1: + print('Usage: python3 {} filename.ui [filename2.ui ...]'.format(sys.argv[0])) + sys.exit(0) + +def sort_prop_key(a): + # declare all non- to be equal, and also greater than to all + # because sorted() is stable this means we only rearrange properties relative to each other + # and put them at the front, the rest are kept in-order as-is + if a.tag != "property": + return "z" + + return "a" + a.get('name') + +def sort_grid_key(a): + # same with non-items in a grid layout, but at the front (these are e.g. properties) + if a.tag != "item": + return "a" + + return "z{:08}{:08}".format(int(a.get('row')), int(a.get('column'))) + +def canonicalise_ui(elem): + + # sort properties in alphabetical order. Unclear if Qt creator + # has a fixed order for these, but it seems like it might? + #elem[:] = sorted(elem, key=sort_prop_key) + + if elem.tag == "layout" and elem.get('class') == 'QGridLayout': + elem[:] = sorted(elem, key=sort_grid_key) + + for e in elem: + canonicalise_ui(e) + +def write_ui_xml(f, elem, indent): + f.write(' ' * indent) + f.write('<{}'.format(elem.tag)) + for k,v in elem.items(): + f.write(' {}="{}"'.format(k,v)) + if elem.text or len(elem) > 0: + f.write('>') + if elem.text and len(elem.text.strip()) > 0: + f.write(escape(elem.text).replace('"', '"')) + if len(elem) > 0: + f.write('\n') + for e in elem: + iconset_tail = write_ui_xml(f, e, indent+1) + if not iconset_tail: + f.write(' ' * indent) + f.write(''.format(elem.tag)) + # hack for weird iconset formatting + if elem.tail is None or len(elem.tail.strip()) == 0: + f.write('\n') + else: + f.write(elem.tail.strip()) + return True + else: + f.write('/>\n'.format(elem.tag)) + + return False + +for filename in sys.argv[1:]: + print("Formatting {}...".format(filename)) + uifile = os.path.abspath(filename) + + ui = ET.parse(uifile) + + canonicalise_ui(ui.getroot()) + + with open(uifile, mode='w', newline=nl, encoding='utf-8') as f: + f.write('\n') + + write_ui_xml(f, ui.getroot(), 0) +