Mesa (master): util: add missing DRI_CONF_OPT_END

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jun 20 12:11:51 UTC 2019


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

Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date:   Thu Jun 20 13:13:06 2019 +0200

util: add missing DRI_CONF_OPT_END

When DRI_CONF_GLES_EMULATE_BGRA was added for the virgl driver, it
missed a DRI_CONF_OPT_END.

This make some drivers, like v4c/v3d to crash with the following
error:
Fatal error in __driConfigOptions line 99, column 2: mismatched tag.

Not sure why it doesn't fail with virgl.

Fixes: b79366344929c6e477c64a63f246c6db0766a71c
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 src/util/xmlpool/t_options.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h
index 43f397b30f6..e1bfba6240d 100644
--- a/src/util/xmlpool/t_options.h
+++ b/src/util/xmlpool/t_options.h
@@ -361,6 +361,7 @@ DRI_CONF_OPT_END
 #define DRI_CONF_V3D_NONMSAA_TEXTURE_SIZE_LIMIT(def) \
 DRI_CONF_OPT_BEGIN_B(v3d_nonmsaa_texture_size_limit, def) \
         DRI_CONF_DESC(en,"Report the non-MSAA-only texture size limit") \
+DRI_CONF_OPT_END
 /**
  * \brief virgl specific configuration options
  */




More information about the mesa-commit mailing list