Mesa (master): st/nir: fix illegal designated initializer in st_glsl_to_nir.cpp

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Sep 11 15:56:23 UTC 2019


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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Sep 10 23:51:23 2019 -0600

st/nir: fix illegal designated initializer in st_glsl_to_nir.cpp

IIRC, designated initializers are not legal C++.
Fixes the MSVC build.

Fixes: 83fd1e58 ("glsl/nir: Add and use a gl_nir_link() function")

Reviewed-by: Neha Bhende <bhenden at vmware.com>

---

 src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 280a7782170..d6a02642447 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -688,7 +688,7 @@ st_link_nir(struct gl_context *ctx,
     */
    if (shader_program->data->spirv) {
       static const gl_nir_linker_options opts = {
-         .fill_parameters = true,
+         true /*fill_parameters */
       };
       if (!gl_nir_link(ctx, shader_program, &opts))
          return GL_FALSE;




More information about the mesa-commit mailing list