Mesa (master): i965/cs: drop explicit initialisers in C++ file

Dave Airlie airlied at kemper.freedesktop.org
Wed May 13 00:10:02 UTC 2015


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed May 13 09:59:59 2015 +1000

i965/cs: drop explicit initialisers in C++ file

gcc 4.4.7 really doesn't like them, and they aren't standard
C++, they seem to be a gcc extension.

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/drivers/dri/i965/brw_cs.cpp |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_cs.cpp b/src/mesa/drivers/dri/i965/brw_cs.cpp
index 70731e4..fc2d857 100644
--- a/src/mesa/drivers/dri/i965/brw_cs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_cs.cpp
@@ -368,9 +368,11 @@ brw_upload_cs_state(struct brw_context *brw)
 
 extern "C"
 const struct brw_tracked_state brw_cs_state = {
-   .dirty = {
-      .mesa  = 0,
-      .brw   = BRW_NEW_CS_PROG_DATA,
+   /* explicit initialisers aren't valid C++, comment
+    * them for documentation purposes */
+   /* .dirty = */{
+      /* .mesa = */ 0,
+      /* .brw = */  BRW_NEW_CS_PROG_DATA,
    },
-   .emit = brw_upload_cs_state
+   /* .emit = */ brw_upload_cs_state
 };




More information about the mesa-commit mailing list