Mesa (staging/20.1): gallium/docs: fixup formatting of numbered lists
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jul 2 14:36:40 UTC 2020
Module: Mesa
Branch: staging/20.1
Commit: 3ed75390adb0ea36824a114144921456b10553ed
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ed75390adb0ea36824a114144921456b10553ed
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Tue Jun 30 11:09:20 2020 +0200
gallium/docs: fixup formatting of numbered lists
Fixes: 0caf74bbcdf ("gallium: add PIPE_CAP_FRAMEBUFFER_MSAA_CONSTRAINTS")
Fixes: 8632626c81a ("gallium: add pipe_resource::nr_storage_samples, and set it same as nr_samples")
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Acked-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5691>
(cherry picked from commit 686cf8eaada1a6a73a7e9ea6ebde1e573cf91966)
---
.pick_status.json | 2 +-
src/gallium/docs/source/screen.rst | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index d7c21cbfd3a..79892da24c1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -598,7 +598,7 @@
"description": "gallium/docs: fixup formatting of numbered lists",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "0caf74bbcdf38914cecffa8772ee9b122b249b78"
},
diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
index e006ef19568..bf8d8c75d96 100644
--- a/src/gallium/docs/source/screen.rst
+++ b/src/gallium/docs/source/screen.rst
@@ -443,12 +443,14 @@ The integer capabilities:
* ``PIPE_CAP_FRAMEBUFFER_MSAA_CONSTRAINTS``: This determines limitations
on the number of samples that framebuffer attachments can have.
Possible values:
- 0: color.nr_samples == zs.nr_samples == color.nr_storage_samples
+
+ 0. color.nr_samples == zs.nr_samples == color.nr_storage_samples
(standard MSAA quality)
- 1: color.nr_samples >= zs.nr_samples == color.nr_storage_samples
+ 1. color.nr_samples >= zs.nr_samples == color.nr_storage_samples
(enhanced MSAA quality)
- 2: color.nr_samples >= zs.nr_samples >= color.nr_storage_samples
+ 2. color.nr_samples >= zs.nr_samples >= color.nr_storage_samples
(full flexibility in tuning MSAA quality and performance)
+
All color attachments must have the same number of samples and the same
number of storage samples.
* ``PIPE_CAP_SIGNED_VERTEX_BUFFER_OFFSET``:
@@ -928,6 +930,7 @@ If there are not enough slots to store all sample colors, some samples will
have an undefined color (called "undefined samples").
The resolve blit behavior is driver-specific, but can be one of these two:
+
1. Only defined samples will be averaged. Undefined samples will be ignored.
2. Undefined samples will be approximated by looking at surrounding defined
samples (even in different pixels).
More information about the mesa-commit
mailing list