aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/viewer/sk_app/unix
Commit message (Collapse)AuthorAge
* Remove SampleApp and convert HelloWorld to sk_appGravatar Brian Osman2017-11-21
| | | | | | | | | | | | | There is still a large amount of views code that could be trimmed down, but which is used to implement samples (in viewer). Seemed simpler to remove some of this code in pieces. Bug: skia: Change-Id: Ia3415060d03c8de604a154e3dc38379b754daab6 Reviewed-on: https://skia-review.googlesource.com/72801 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
* Revert "Revert "Dynamically load the vulkan library in our test tools""Gravatar Greg Daniel2017-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c8dd283c9a784d1e115019f5b4a1b0e082513203. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Dynamically load the vulkan library in our test tools" > > This reverts commit 77d6feaa69d95c42f4e77195e92de33917995544. > > Reason for revert: breaking google 3 > > Original change's description: > > Dynamically load the vulkan library in our test tools > > > > Bug: skia: > > Change-Id: I7c1f6cbb2b50ca284f40cf4b9ef49a76083b38c6 > > Reviewed-on: https://skia-review.googlesource.com/68643 > > Reviewed-by: Chris Dalton <csmartdalton@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,csmartdalton@google.com > > Change-Id: I6b2588e71f1876868fcf8f2b3c91a96e7c689045 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/69780 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,csmartdalton@google.com Change-Id: I758aec07114305f0add086eecb1deb94d0140dcf No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/69900 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
* Revert "Dynamically load the vulkan library in our test tools"Gravatar Greg Daniel2017-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 77d6feaa69d95c42f4e77195e92de33917995544. Reason for revert: breaking google 3 Original change's description: > Dynamically load the vulkan library in our test tools > > Bug: skia: > Change-Id: I7c1f6cbb2b50ca284f40cf4b9ef49a76083b38c6 > Reviewed-on: https://skia-review.googlesource.com/68643 > Reviewed-by: Chris Dalton <csmartdalton@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,csmartdalton@google.com Change-Id: I6b2588e71f1876868fcf8f2b3c91a96e7c689045 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/69780 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Dynamically load the vulkan library in our test toolsGravatar Greg Daniel2017-11-09
| | | | | | | | Bug: skia: Change-Id: I7c1f6cbb2b50ca284f40cf4b9ef49a76083b38c6 Reviewed-on: https://skia-review.googlesource.com/68643 Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
* Remove trailing whitespace.Gravatar Ben Wagner2017-10-09
| | | | | | | | | | | Also adds a presubmit to prevent adding trailing whitespace to source code in the future. Change-Id: I41a4df81487f6f00aa19b188f0cac6a3377efde6 Reviewed-on: https://skia-review.googlesource.com/57380 Reviewed-by: Ravi Mistry <rmistry@google.com> Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Convert NULL and 0 to nullptr.Gravatar Ben Wagner2017-08-28
| | | | | | | | | | | | | | This was created by looking at warnings produced by clang's -Wzero-as-null-pointer-constant. This updates most issues in Skia code. However, there are places where GL and Vulkan want pointer values which are explicitly 0, external headers which use NULL directly, and possibly more uses in un-compiled sources (for other platforms). Change-Id: Id22fbac04d5c53497a53d734f0896b4f06fe8345 Reviewed-on: https://skia-review.googlesource.com/39521 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
* Add ANGLE support to Viewer on WindowsGravatar Brian Salomon2017-08-17
| | | | | | | Change-Id: I97a844b2f289d2518f60a64f94d60551c4530dd4 Reviewed-on: https://skia-review.googlesource.com/35742 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
* Add wireframe mode to Viewer.Gravatar Jim Van Verth2017-05-02
| | | | | | | Change-Id: I0ff11088465a4702acf9841a791d76f286ddbaf1 Reviewed-on: https://skia-review.googlesource.com/15147 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
* Use glXCreateContextAttribsARB in viewer to make it easier to attach RenderDoc.Gravatar Brian Salomon2017-03-08
| | | | | | | Change-Id: I0cc82fe826b81a082b579f60af3d9ef35d5fe351 Reviewed-on: https://skia-review.googlesource.com/9407 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
* Set window dimensions in raster on UnixGravatar Brian Osman2017-03-01
| | | | | | | | | | | | These values were left uninitialized, leading to problems with the GUI in raster configs. BUG=skia: Change-Id: Ia8c16112e53b74daf66941d2923327c9732cf432 Reviewed-on: https://skia-review.googlesource.com/9114 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Initialize XImage struct fullyGravatar Brian Osman2017-03-01
| | | | | | | | | | | | I was getting sporadic failures from XInitImage (causing the raster backend to not draw anything). BUG=skia: Change-Id: Ied79f2b5354d89c146aca64d70fde8cf9f3ab62e Reviewed-on: https://skia-review.googlesource.com/9102 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Add msaa flag and UI to viewerGravatar csmartdalton2017-02-27
| | | | | | | | | BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
* Add onBackendCreated callback to ViewerGravatar Christopher Dalton2017-02-24
| | | | | | | | | | | | | Also removes fWidth and fHeight from Window and instead calls into WindowContent to get these values. BUG=skia: Change-Id: I72ee506004b7da73db9abb607a3bc82edfcf7d43 Reviewed-on: https://skia-review.googlesource.com/8795 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com>
* Integrate the ImGui library with viewerGravatar Brian Osman2017-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Simplify viewer's handling of backbuffer surface and color spaceGravatar Brian Osman2017-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
* Minor fixes for the Linux viewerGravatar Jim Van Verth2017-01-05
| | | | | | | | BUG=skia:6091 Change-Id: Ia954c16610634e34f10bfe4273efc6677ca9563e Reviewed-on: https://skia-review.googlesource.com/6618 Reviewed-by: Greg Daniel <egdaniel@google.com>
* Clean up Xlib viewerGravatar jvanverth2016-08-11
| | | | | | | | | | * Make event handling closer to GLFW's * Fix Vulkan refreshing BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2226413002 Review-Url: https://codereview.chromium.org/2226413002
* SW backend for viewer on WindowsGravatar bsalomon2016-07-27
| | | | | | GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2182273002 Review-Url: https://codereview.chromium.org/2182273002
* Add sw support to viewer on Linux.Gravatar bsalomon2016-07-26
| | | | | | | | | | This doesn't yet do anything with srgb/colorspace. Replaces the --vulkan flag with --backend which takes 'gl', 'vk', or 'sw'. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165813002 Review-Url: https://codereview.chromium.org/2165813002
* Use Windowing system-specific WindowContext factories.Gravatar bsalomon2016-07-26
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2169543002 Review-Url: https://codereview.chromium.org/2169543002
* Don't unnecessarily resize windows in sk_app on XGravatar bsalomon2016-07-26
| | | | | | GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2182163002 Review-Url: https://codereview.chromium.org/2182163002
* More accurate render time and continuous freshGravatar liyuqian2016-07-06
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2129613002 Review-Url: https://codereview.chromium.org/2129613002
* Enable viewer in non-Vulkan buildsGravatar jvanverth2016-06-17
| | | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b Review-Url: https://codereview.chromium.org/2067023002
* Revert of Enable viewer in non-Vulkan builds (patchset #2 id:20001 of ↵Gravatar egdaniel2016-06-15
| | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/2067023002/ ) Reason for revert: breaking compile bots Original issue's description: > Enable viewer in non-Vulkan builds > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 > > Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b TBR=djsollen@google.com,jvanverth@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2072563002
* Enable viewer in non-Vulkan buildsGravatar jvanverth2016-06-15
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 Review-Url: https://codereview.chromium.org/2067023002
* Add missing files for GL unix viewer.Gravatar jvanverth2016-05-31
| | | | | | GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2023943004 Review-Url: https://codereview.chromium.org/2023943004
* Add OpenGL support to Linux viewerGravatar jvanverth2016-05-27
| | | | | | | | | | Also adds a command line option (--vulkan) to choose between Vulkan and OpenGL. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2011473003 Committed: https://skia.googlesource.com/skia/+/10b3815a11c39b154ec7b74a2af43e019b50d48c Review-Url: https://codereview.chromium.org/2011473003
* Revert of Add OpenGL support to Linux viewer (patchset #5 id:80001 of ↵Gravatar kjlubick2016-05-27
| | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/2011473003/ ) Reason for revert: Build-Ubuntu-GCC-Arm7-Debug-Android_Vulkan is broken and this patch prevents the revert of the culprit Original issue's description: > Add OpenGL support to Linux viewer > > Also adds a command line option (--vulkan) to choose between > Vulkan and OpenGL. > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2011473003 > > Committed: https://skia.googlesource.com/skia/+/10b3815a11c39b154ec7b74a2af43e019b50d48c TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com,jvanverth@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2015213002
* Add OpenGL support to Linux viewerGravatar jvanverth2016-05-27
| | | | | | | | Also adds a command line option (--vulkan) to choose between Vulkan and OpenGL. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2011473003 Review-Url: https://codereview.chromium.org/2011473003
* Add Xlib support to viewerGravatar jvanverth2016-05-23
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=1999213002 Review-Url: https://codereview.chromium.org/1999213002