Skip to content

Commit 01450bb

Browse files
authored
Merge branch 'master' into fix-the-mathz
2 parents f11b326 + d7fab63 commit 01450bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+33026
-463
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+88
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: Issue report
2+
description: File an issue report
3+
body:
4+
- type: checkboxes
5+
attributes:
6+
label: Is there an existing issue for this?
7+
description: Please search to see if an issue already exists for the bug you encountered.
8+
options:
9+
- label: I have searched the existing issues
10+
required: true
11+
- type: checkboxes
12+
attributes:
13+
label: Are you using any gamescope patches or a forked version of gamescope?
14+
description: Please confirm any issues occur on upstream gamescope without any patches before filing an issue here.
15+
options:
16+
- label: The issue occurs on upstream gamescope without any modifications
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: Current Behavior
21+
description: A concise description of the issue you're experiencing.
22+
validations:
23+
required: false
24+
- type: textarea
25+
attributes:
26+
label: Steps To Reproduce
27+
description: Steps to reproduce the issue.
28+
placeholder: |
29+
1. Launch Dota 2 from Steam with the gamescope launch command `gamescope -f -r 120 -- %command%`...
30+
2. Enter a bot match
31+
3. Move the cursor around
32+
validations:
33+
required: false
34+
- type: textarea
35+
attributes:
36+
label: Hardware information
37+
description: |
38+
examples:
39+
- **Distro**: SteamOS 3.6.15 (`cat /etc/os-release`)
40+
- **CPU**: 32-core AMD Ryzen Threadripper 7970X (`inxi` or `cat /proc/cpuinfo`)
41+
- **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`
42+
- **Driver Version**: Mesa 24.2.3 or NVIDIA 560.35.03 (`vulkaninfo --summary | grep driverInfo` or `nvidia-smi`)
43+
value: |
44+
- Distro:
45+
- CPU:
46+
- GPU:
47+
- Driver Version:
48+
render: markdown
49+
validations:
50+
required: false
51+
- type: textarea
52+
attributes:
53+
label: Software information
54+
description: |
55+
examples:
56+
- **Desktop environment**: KDE 6.1.5
57+
- **Session type**: wayland (`echo $XDG_SESSION_TYPE`)
58+
- **Gamescope version**: gamescope version 3.15.9-8-gddf0d76 (gcc 14.2.1) (find this with `gamescope --version`)
59+
- **Gamescope launch command(s)**: `gamescope -f -h 2160 -w 7680 -r 120 -- %command%`
60+
value: |
61+
- Desktop environment:
62+
- Session type:
63+
- Gamescope version:
64+
- Gamescope launch command(s):
65+
render: markdown
66+
validations:
67+
required: false
68+
- type: checkboxes
69+
id: backend
70+
attributes:
71+
label: Which gamescope backends have the issue you are reporting?
72+
description: You may select more than one.
73+
options:
74+
- label: Wayland (default for nested gamescope)
75+
- label: DRM (default for embedded gamescope, i.e. gamescope-session)
76+
- label: SDL
77+
- label: OpenVR
78+
validations:
79+
required: true
80+
- type: textarea
81+
attributes:
82+
label: Logging, screenshots, or anything else
83+
description: |
84+
Please include any relevant logging or screenshots that will give us more context about the issue you are reporting.
85+
86+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
87+
validations:
88+
required: false
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Feature request
2+
description: Share ideas for new features
3+
body:
4+
- type: textarea
5+
attributes:
6+
label: Feature request
7+
description: Share your idea for a new feature within gamescope
8+
validations:
9+
required: false

.github/workflows/main.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ jobs:
1818
sdl2 vulkan-headers libx11 libxmu libxcomposite libxrender libxres \
1919
libxtst libxkbcommon libdrm libinput wayland-protocols benchmark \
2020
xorg-xwayland pipewire cmake \
21-
libavif libheif aom rav1e libdecor libxdamage
22-
- uses: actions/checkout@v2
21+
libavif libheif aom rav1e libdecor libxdamage \
22+
luajit
23+
- uses: actions/checkout@v4
2324
with:
2425
submodules: recursive
2526
- name: Build with gcc
@@ -32,8 +33,8 @@ jobs:
3233
export CC=gcc CXX=g++
3334
meson build-gcc-novr/ -Dinput_emulation=disabled -Denable_openvr_support=false --werror --auto-features=enabled
3435
ninja -C build-gcc-novr/
35-
- name: Build with clang
36-
run: |
37-
export CC=clang CXX=clang++
38-
meson build-clang/ -Dinput_emulation=disabled --werror --auto-features=enabled
39-
ninja -C build-clang/
36+
# - name: Build with clang
37+
# run: |
38+
# export CC=clang CXX=clang++
39+
# meson build-clang/ -Dinput_emulation=disabled --werror --auto-features=enabled
40+
# ninja -C build-clang/

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If running RadeonSI clients with older cards (GFX8 and below), currently have to
1919

2020
```
2121
git submodule update --init
22-
meson build/
22+
meson setup build/
2323
ninja -C build/
2424
build/gamescope -- <game>
2525
```
@@ -77,7 +77,7 @@ Gamescope supports a subset of Reshade effects/shaders using the `--reshade-effe
7777

7878
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.
7979

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

8282
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.
8383

default_scripts_install.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env sh
2+
3+
# Remove old Gamescope default configs and add our own.
4+
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope"
5+
rm -rf "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope/scripts" || true
6+
cp -r "${MESON_SOURCE_ROOT}/scripts" "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/gamescope/scripts"

0 commit comments

Comments
 (0)