Skip to content

Commit

Permalink
Merge branch 'master' into fix-the-mathz
Browse files Browse the repository at this point in the history
  • Loading branch information
sharkautarch authored Dec 3, 2024
2 parents a1e7992 + d317492 commit 15fa3d9
Show file tree
Hide file tree
Showing 53 changed files with 33,162 additions and 481 deletions.
88 changes: 88 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: Issue report
description: File an issue report
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: checkboxes
attributes:
label: Are you using any gamescope patches or a forked version of gamescope?
description: Please confirm any issues occur on upstream gamescope without any patches before filing an issue here.
options:
- label: The issue occurs on upstream gamescope without any modifications
required: true
- type: textarea
attributes:
label: Current Behavior
description: A concise description of the issue you're experiencing.
validations:
required: false
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the issue.
placeholder: |
1. Launch Dota 2 from Steam with the gamescope launch command `gamescope -f -r 120 -- %command%`...
2. Enter a bot match
3. Move the cursor around
validations:
required: false
- type: textarea
attributes:
label: Hardware information
description: |
examples:
- **Distro**: SteamOS 3.6.15 (`cat /etc/os-release`)
- **CPU**: 32-core AMD Ryzen Threadripper 7970X (`inxi` or `cat /proc/cpuinfo`)
- **GPU**: Advanced Micro Devices [AMD/ATI] Navi 31 [Radeon RX 7900 XT/7900 XTX/7900M] (`lspci -nn | grep VGA` or `lshw -C display -numeric` or `vulkaninfo --summary | grep deviceName`
- **Driver Version**: Mesa 24.2.3 or NVIDIA 560.35.03 (`vulkaninfo --summary | grep driverInfo` or `nvidia-smi`)
value: |
- Distro:
- CPU:
- GPU:
- Driver Version:
render: markdown
validations:
required: false
- type: textarea
attributes:
label: Software information
description: |
examples:
- **Desktop environment**: KDE 6.1.5
- **Session type**: wayland (`echo $XDG_SESSION_TYPE`)
- **Gamescope version**: gamescope version 3.15.9-8-gddf0d76 (gcc 14.2.1) (find this with `gamescope --version`)
- **Gamescope launch command(s)**: `gamescope -f -h 2160 -w 7680 -r 120 -- %command%`
value: |
- Desktop environment:
- Session type:
- Gamescope version:
- Gamescope launch command(s):
render: markdown
validations:
required: false
- type: checkboxes
id: backend
attributes:
label: Which gamescope backends have the issue you are reporting?
description: You may select more than one.
options:
- label: Wayland (default for nested gamescope)
- label: DRM (default for embedded gamescope, i.e. gamescope-session)
- label: SDL
- label: OpenVR
validations:
required: true
- type: textarea
attributes:
label: Logging, screenshots, or anything else
description: |
Please include any relevant logging or screenshots that will give us more context about the issue you are reporting.
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Feature request
description: Share ideas for new features
body:
- type: textarea
attributes:
label: Feature request
description: Share your idea for a new feature within gamescope
validations:
required: false
15 changes: 8 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:
sdl2 vulkan-headers libx11 libxmu libxcomposite libxrender libxres \
libxtst libxkbcommon libdrm libinput wayland-protocols benchmark \
xorg-xwayland pipewire cmake \
libavif libheif aom rav1e libdecor libxdamage
- uses: actions/checkout@v2
libavif libheif aom rav1e libdecor libxdamage \
luajit
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Build with gcc
Expand All @@ -32,8 +33,8 @@ jobs:
export CC=gcc CXX=g++
meson build-gcc-novr/ -Dinput_emulation=disabled -Denable_openvr_support=false --werror --auto-features=enabled
ninja -C build-gcc-novr/
- name: Build with clang
run: |
export CC=clang CXX=clang++
meson build-clang/ -Dinput_emulation=disabled --werror --auto-features=enabled
ninja -C build-clang/
# - name: Build with clang
# run: |
# export CC=clang CXX=clang++
# meson build-clang/ -Dinput_emulation=disabled --werror --auto-features=enabled
# ninja -C build-clang/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ If running RadeonSI clients with older cards (GFX8 and below), currently have to

```
git submodule update --init
meson build/
meson setup build/
ninja -C build/
build/gamescope -- <game>
```
Expand Down Expand Up @@ -77,7 +77,7 @@ Gamescope supports a subset of Reshade effects/shaders using the `--reshade-effe

This provides an easy way to do shader effects (ie. CRT shader, film grain, debugging HDR with histograms, etc) on top of whatever is being displayed in Gamescope without having to hook into the underlying process.

There is currently no way to set the value of uniforms/options, they will just be their initializer values currently.
Uniform/shader options can be modified programmatically via the `gamescope-reshade` wayland interface. Otherwise, they will just use their initializer values.

Using Reshade effects will increase latency as there will be work performed on the general gfx + compute queue as opposed to only using the realtime async compute queue which can run in tandem with the game's gfx work.

Expand Down
6 changes: 6 additions & 0 deletions default_scripts_install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env sh

# Remove old Gamescope default configs and add our own.
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope"
rm -rf "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope/scripts" || true
cp -r "${MESON_SOURCE_ROOT}/scripts" "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope/scripts"
Loading

0 comments on commit 15fa3d9

Please sign in to comment.