From 462f18c7b25fe3e467f837647d07ab0a78aa8d2b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 22 Feb 2015 21:39:56 +0100
Subject: Merged origin/release (checked in because wanted to merge new stuff)

---
 mesalib/src/mesa/state_tracker/st_context.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'mesalib/src/mesa/state_tracker/st_context.h')

diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h
index 15f9df492..b091a8856 100644
--- a/mesalib/src/mesa/state_tracker/st_context.h
+++ b/mesalib/src/mesa/state_tracker/st_context.h
@@ -33,6 +33,12 @@
 #include "state_tracker/st_api.h"
 #include "main/fbobject.h"
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 struct bitmap_cache;
 struct dd_function_table;
 struct draw_context;
@@ -87,6 +93,7 @@ struct st_context
    boolean has_time_elapsed;
    boolean has_shader_model3;
    boolean has_etc1;
+   boolean has_etc2;
    boolean prefer_blit_based_texture_transfer;
 
    boolean needs_texcoord_semantic;
@@ -278,4 +285,8 @@ extern void
 st_destroy_context(struct st_context *st);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
-- 
cgit v1.2.3