]> git.cworth.org Git - vogl/log
vogl
10 years agoMerge branch 'master' of https://github.com/PeterLValve/vogl
PeterLValve [Tue, 18 Mar 2014 22:30:43 +0000 (15:30 -0700)]
Merge branch 'master' of https://github.com/PeterLValve/vogl

10 years agoUpdate qtcreator.md
Peter Lohrmann [Tue, 18 Mar 2014 16:03:04 +0000 (09:03 -0700)]
Update qtcreator.md

Use buildDir env var instead of hardcoded paths to mkvogl.
Fix a few typos.

10 years agoUI: Fix issue #20: Search in the editor really slow
PeterLValve [Tue, 18 Mar 2014 22:24:24 +0000 (15:24 -0700)]
UI: Fix issue #20: Search in the editor really slow
* Instead of selecting all the rows which match the search string,
  the tree view now highlights those rows which match and are visible.
* If the user presses [enter], the first matching row (if one exists) will
  be scrolled into view and selected.
* Continually pressing enter will cycle through each match, in the same way
  that clicking the "Next" button works.
* If there are no matching items when the user presses [enter], the background to the search textbox will turn red.
  It will restore to its previous color when the user next edits the text.

10 years agoUI: Add 'GL Context' column to API call tree to help with multi-context debugging.
Peter Lohrmann [Thu, 13 Mar 2014 20:06:34 +0000 (13:06 -0700)]
UI: Add 'GL Context' column to API call tree to help with multi-context debugging.

(cherry picked from commit 39e0f793e3588b12e0444241b9b4a2859bc8b18f)

10 years agoUI: Improve processing time of vogleditor_apicalltreeitem by pre-calculating the...
PeterLValve [Tue, 18 Mar 2014 20:31:29 +0000 (13:31 -0700)]
UI: Improve processing time of vogleditor_apicalltreeitem by pre-calculating the local row index
* This value will have to get updated if new rows (API calls) can be added / removed, which may undo this optimization,
but when investigating a slowness during searching, the code was often found in this function.

10 years agoMerge branch 'master' of https://github.com/ValveSoftware/vogl into origin_github
Michael Sartain [Sat, 15 Mar 2014 22:39:09 +0000 (15:39 -0700)]
Merge branch 'master' of https://github.com/ValveSoftware/vogl into origin_github

10 years ago- adding a missing entrypoint check, so traces made with NV extensions don't complete...
Rich Geldreich [Sat, 15 Mar 2014 06:17:55 +0000 (23:17 -0700)]
- adding a missing entrypoint check, so traces made with NV extensions don't completely core dump on AMD (although the odds of them playing back right are kinda slim)
- adding darwinia trace

(cherry picked from commit cd849926f2db37a08a87395792c40916e0c6ee0f)

Conflicts:
bin_richg/regression_test.sh

10 years agoadding link to wiki, and messing with git
Rich Geldreich [Sat, 15 Mar 2014 22:28:42 +0000 (15:28 -0700)]
adding link to wiki, and messing with git

10 years ago- regression test now works on AMD
Rich Geldreich [Sat, 15 Mar 2014 03:29:41 +0000 (20:29 -0700)]
- regression test now works on AMD

(cherry picked from commit 680e3b47a57ac959bea89e55d54925cf24c7e17c)

10 years agoAdd link to qtcreator.md file.
Michael Sartain [Sat, 15 Mar 2014 01:59:46 +0000 (18:59 -0700)]
Add link to qtcreator.md file.

10 years ago- Features for 10ft: PBO's, snapshotting/restoring mapped buffers during replaying
Rich Geldreich [Fri, 14 Mar 2014 21:35:20 +0000 (14:35 -0700)]
- Features for 10ft: PBO's, snapshotting/restoring mapped buffers during replaying
- Display lists snapshot/restoring: genned but still not-valid display lists are now handled properly

(cherry picked from commit fd44f7dcce80103562bd0c49ea15f6f6031fdc83)

Conflicts:
bin_richg/trace.sh
scratch/bdeen/hold/glireplay/gli_replay_tool.cpp
src/voglcommon/vogl_gl_replayer.cpp

10 years agoAdd QtCreator tag file and readme
Michael Sartain [Sat, 15 Mar 2014 01:52:40 +0000 (18:52 -0700)]
Add QtCreator tag file and readme

10 years agoUI: separate capturing of vogl_gl_state_snapshot from allocation of the vogleditor_gl...
Peter Lohrmann [Fri, 14 Mar 2014 21:12:02 +0000 (14:12 -0700)]
UI: separate capturing of vogl_gl_state_snapshot from allocation of the vogleditor_gl_state_snapshot for better error reporting and memory management

(cherry picked from commit 12ec6a58517055d2e460bfc0d06d1847931bf7d0)

10 years agoUI: Fix unnecessary memory overhead when loading traces.
Peter Lohrmann [Fri, 14 Mar 2014 20:43:22 +0000 (13:43 -0700)]
UI: Fix unnecessary memory overhead when loading traces.
* A vogl_trace_packet can have lots of memory associated with it, so they should not be copied or assigned if it can be avoided. In this case, the loading was using a single trace packet instance to load the data from disk, then the packet was being copied into its associated node in the API call tree. This assignment / copy was temporarily (and unnecessarily) doubling the size of the packet, requiring extra memory allocations, and generally just causing excessive overhead. Instead, allocate a separate vogl_trace_packet for each packet that needs to be loaded from disk, and pass that memory off the apiCallItem for management. This greatly improves load times and allows us to load traces that would previously fail due to memory limitations.
* Also move a few allocations over to using vogl_new and vogl_delete so that vogl can track the memory usage.

(cherry picked from commit 1bcaf8bd911c1b1604e59898c752506be1394c38)

10 years agoUI: Fix support for taking snapshots after an edited & outdated snapshot.
Peter Lohrmann [Thu, 13 Mar 2014 21:41:28 +0000 (14:41 -0700)]
UI: Fix support for taking snapshots after an edited & outdated snapshot.
* Also fix algorithm that finds the previous snapshot for diff'ing purposes so that it only returns valid snapshots.

(cherry picked from commit 9734f7d774470c4efe2cc0b9858d873fcc55850d)

10 years agoUI: Remove m_pTraceWriter since it was not being used and was causing an unnecessary...
Peter Lohrmann [Thu, 13 Mar 2014 20:41:08 +0000 (13:41 -0700)]
UI: Remove m_pTraceWriter since it was not being used and was causing an unnecessary file to be created on disk

(cherry picked from commit 50056dbe31ee4c78aac1c073526495166a1d55bd)

10 years agoDefault QTDIR to /usr/local/Trolltech/Qt-4.8.5 if not set.
Michael Sartain [Fri, 14 Mar 2014 21:55:20 +0000 (14:55 -0700)]
Default QTDIR to /usr/local/Trolltech/Qt-4.8.5 if not set.
Fixes github bug #17.

10 years agoMerge pull request #12 from andrewkww/cmake_fixes
Michael Sartain [Fri, 14 Mar 2014 16:30:51 +0000 (09:30 -0700)]
Merge pull request #12 from andrewkww/cmake_fixes

Use cmake to find dl, X11, and pthreads

10 years agocmake: Use find_package to find pthreads
Andrew Wong [Fri, 14 Mar 2014 03:26:11 +0000 (23:26 -0400)]
cmake: Use find_package to find pthreads

10 years agovogleditor: Cleanup cmake libraries
Andrew Wong [Fri, 14 Mar 2014 16:20:38 +0000 (12:20 -0400)]
vogleditor: Cleanup cmake libraries

pthread is not directly used here (used by voglcore), so no need to
specify it here. X11 is duplicated.

10 years agocmake: Use find_package to find X11 libraries
Andrew Wong [Fri, 14 Mar 2014 15:41:50 +0000 (11:41 -0400)]
cmake: Use find_package to find X11 libraries

10 years agocmake: Use CMAKE_DL_LIBS instead of hardcoding "dl"
Andrew Wong [Fri, 14 Mar 2014 15:34:59 +0000 (11:34 -0400)]
cmake: Use CMAKE_DL_LIBS instead of hardcoding "dl"

10 years agoMerge branch 'master' of https://github.com/stativ/vogl into stativ-master
Michael Sartain [Fri, 14 Mar 2014 15:56:39 +0000 (08:56 -0700)]
Merge branch 'master' of https://github.com/stativ/vogl into stativ-master

Conflicts:
src/vogleditor/CMakeLists.txt

10 years agoFix some missing libraries.
Lukáš Jirkovský [Fri, 14 Mar 2014 10:30:54 +0000 (11:30 +0100)]
Fix some missing libraries.

10 years agoFind the include directory for libunwind.h.
Lukáš Jirkovský [Fri, 14 Mar 2014 10:00:35 +0000 (11:00 +0100)]
Find the include directory for libunwind.h.

This allows finding libunwind that has been installed in a non-standard location
just by setting CMAKE_PREFIX_PATH.

10 years agoDo not hardcode qmake executable, it should be found by the CMake itself.
Lukáš Jirkovský [Fri, 14 Mar 2014 09:48:05 +0000 (10:48 +0100)]
Do not hardcode qmake executable, it should be found by the CMake itself.

10 years agoMerge pull request #8 from Daft-Freak/patch-2
Michael Sartain [Fri, 14 Mar 2014 15:52:48 +0000 (08:52 -0700)]
Merge pull request #8 from Daft-Freak/patch-2

Ignore backup files

10 years agoIgnore backup files
Charlie Birks [Fri, 14 Mar 2014 09:32:40 +0000 (09:32 +0000)]
Ignore backup files

10 years agoMerge pull request #5 from andrewkww/fix_vogleditor_link
Michael Sartain [Fri, 14 Mar 2014 15:51:14 +0000 (08:51 -0700)]
Merge pull request #5 from andrewkww/fix_vogleditor_link

Fix linking issue in vogleditor

10 years agovogleditor: Add link libraries that are needed
Andrew Wong [Fri, 14 Mar 2014 03:33:49 +0000 (23:33 -0400)]
vogleditor: Add link libraries that are needed

10 years agovoglcore: Add pthread as link library
Andrew Wong [Fri, 14 Mar 2014 03:26:11 +0000 (23:26 -0400)]
voglcore: Add pthread as link library

This means any targets that use voglcore will automatically get pthread
include during linking. So we don't need to specify pthread in targets
that don't explicitly use them.

10 years agochroot name cleanup
Michael Sartain [Thu, 13 Mar 2014 23:45:57 +0000 (16:45 -0700)]
chroot name cleanup

10 years agoMerge pull request #3 from andrewkww/fix_hardcoded_qt_path
Michael Sartain [Thu, 13 Mar 2014 23:38:06 +0000 (16:38 -0700)]
Merge pull request #3 from andrewkww/fix_hardcoded_qt_path

vogleditor: Replace hardcoded Qt path with variables generated by cmake's Qt module

10 years agovogleditor: Replace hardcoded Qt path with variables generated by cmake's Qt module
Andrew Wong [Thu, 13 Mar 2014 21:04:54 +0000 (17:04 -0400)]
vogleditor: Replace hardcoded Qt path with variables generated by cmake's Qt module

10 years agoUI: Initial support for saving and loading a debug session
Peter Lohrmann [Thu, 13 Mar 2014 18:45:49 +0000 (11:45 -0700)]
UI: Initial support for saving and loading a debug session
* This saves a json document which links the initial trace file to a set of snapshots
* Edited / outdated / valid properties are stored with each snapshot so that the snapshot indicator in the UI can be restored properly.
* All 'rel_path' properties are relative to the location of the session file. This allows the trace file, session file, and session data folder be moved to a new location and still be loaded. Only relative paths are currently supported.

Future goals:
* Ideally, any state of the UI should be included in the session so that active tabs / drop-down selections / texture zoom settings / etc are restored when the session is loaded.
* Indications of which shaders are edited should also be included (after the UI itself supports indicators of these changes)
* The original trace file should NOT be changed when the initial snapshot is edited or if/when we support the insertion and removal of API calls, so any changes to the API calls should be stored in this session file as well.

(cherry picked from commit 8ede72592ca94d754442e3f097ba03b546047ab1)

10 years agoUI: minor fix to ensure the replay exists when needed
Peter Lohrmann [Wed, 12 Mar 2014 20:37:25 +0000 (13:37 -0700)]
UI: minor fix to ensure the replay exists when needed

(cherry picked from commit 6873bd3736e88a2d059fa90a9eb34f818f069bbe)

10 years ago- Fix for replaying display list snapshots (we regressed this late last week while...
Rich Geldreich [Thu, 13 Mar 2014 19:33:11 +0000 (12:33 -0700)]
- Fix for replaying display list snapshots (we regressed this late last week while I was fixing some previous changes for the UI, argh)

(cherry picked from commit a7d27d9f233c577e17178ddf145d84ec462795b8)

10 years agoFix missing space (Thanks Scott.)
Michael Sartain [Wed, 12 Mar 2014 21:45:04 +0000 (14:45 -0700)]
Fix missing space (Thanks Scott.)

10 years agoDrop vogl_applaunchr.cpp and vogl_applauncher.h
Carl Worth [Sat, 22 Mar 2014 00:29:24 +0000 (17:29 -0700)]
Drop vogl_applaunchr.cpp and vogl_applauncher.h

Mike explained that these files are not actually being used at all.
Meanwhile, they are the only files that include anything from the
chromiumlib library which was recently removed (with history
rewriting!) from the git repository.

10 years agoDon't attempt to build gltests nor OGLSuperBible directories.
Carl Worth [Mon, 31 Mar 2014 23:08:00 +0000 (16:08 -0700)]
Don't attempt to build gltests nor OGLSuperBible directories.

These directories were recently removed in a git-filter-branch rewrite
of the Vogl history (as part of an effort to reduce repository size).
Since these directories no longer exist, we cannot build them.

10 years agoInitial vogl checkin
Michael Sartain [Wed, 12 Mar 2014 21:28:27 +0000 (14:28 -0700)]
Initial vogl checkin