Mesa (master): virgl: Clean up the driconf definition of GLES_SAMPLES_PASSED_VALUE.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e5d2481bfe761816bae173856262b0232a92b07b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5d2481bfe761816bae173856262b0232a92b07b

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Sep 16 13:03:14 2020 -0700

virgl: Clean up the driconf definition of GLES_SAMPLES_PASSED_VALUE.

The right values ended up being passed to DRI_CONF_OPT_BEGIN_V, they were just
named wrong.

Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6753>

---

 src/gallium/drivers/virgl/virgl_driinfo.h.in | 2 +-
 src/util/driconf.h                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/virgl/virgl_driinfo.h.in b/src/gallium/drivers/virgl/virgl_driinfo.h.in
index 2c7be56e92c..81b6b590012 100644
--- a/src/gallium/drivers/virgl/virgl_driinfo.h.in
+++ b/src/gallium/drivers/virgl/virgl_driinfo.h.in
@@ -9,5 +9,5 @@
 DRI_CONF_SECTION_MISCELLANEOUS
     DRI_CONF_GLES_EMULATE_BGRA("false")
     DRI_CONF_GLES_APPLY_BGRA_DEST_SWIZZLE("false")
-    DRI_CONF_GLES_SAMPLES_PASSED_VALUE(int, 1024, "1:400000000")
+    DRI_CONF_GLES_SAMPLES_PASSED_VALUE(1024, 1, 400000000)
 DRI_CONF_SECTION_END
diff --git a/src/util/driconf.h b/src/util/driconf.h
index 6c13578eb0b..0cd94ea235f 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -495,7 +495,7 @@ DRI_CONF_OPT_BEGIN_B(gles_apply_bgra_dest_swizzle, def) \
 DRI_CONF_OPT_END
 
 #define DRI_CONF_GLES_SAMPLES_PASSED_VALUE(def, minimum, maximum) \
-DRI_CONF_OPT_BEGIN_V(gles_samples_passed_value, def, minimum, maximum) \
+   DRI_CONF_OPT_BEGIN_V(gles_samples_passed_value, int, def, #minimum ":" #maximum) \
         DRI_CONF_DESC("GL_SAMPLES_PASSED value when emulated by GL_ANY_SAMPLES_PASSED") \
 DRI_CONF_OPT_END