From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 22 Oct 2015 00:40:13 +0000 (-0700)
Subject: Merge remote-tracking branch 'mesa-public/master' into vulkan
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fed60e3c73c7be7c1e2194054daf29381d0ddc18;p=mesa.git

Merge remote-tracking branch 'mesa-public/master' into vulkan
---

fed60e3c73c7be7c1e2194054daf29381d0ddc18
diff --cc src/mesa/drivers/dri/i965/brw_shader.h
index 2e47690d403,51b059fcaa1..8899b30c1ae
--- a/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@@@ -233,6 -233,21 +233,18 @@@ bool opt_predicated_break(struct backen
  extern "C" {
  #endif
  
+ /**
+  * Scratch data used when compiling a GLSL geometry shader.
+  */
+ struct brw_gs_compile
+ {
+    struct brw_gs_prog_key key;
+    struct brw_vue_map input_vue_map;
+ 
+    unsigned control_data_bits_per_vertex;
+    unsigned control_data_header_size_bits;
+ };
+ 
 -struct brw_compiler *
 -brw_compiler_create(void *mem_ctx, const struct brw_device_info *devinfo);
 -
  void
  brw_assign_common_binding_table_offsets(gl_shader_stage stage,
                                          const struct brw_device_info *devinfo,