<div dir="ltr"><div>Thanks!<br></div><div><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 7, 2017 at 8:12 AM, Alejandro Piñeiro <span dir="ltr"><<a href="mailto:apinheiro@igalia.com" target="_blank">apinheiro@igalia.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">To avoid any vulkan driver to include the GL mtypes.h. Renamed as<br>
eventually this could be used by drivers not using nir.<br>
<br>
v2: remove compiler/spirv/spirv.h from mtypes (Alejandro)<br>
</span>v3: added the definition at compiler/shader_info.h (Jason Ekstrand)<br>
---<br>
<br>
Sorry for not realizing that spirv.h was a generated file. I also<br>
preferred to add it to shader_info.h. Both options 2 and 3 seemed<br>
somewhat an overkill<br>
<br>
src/compiler/shader_info.h | 13 +++++++++++++<br>
src/compiler/spirv/nir_spirv.h | 4 ++--<br>
src/mesa/main/mtypes.h | 13 -------------<br>
3 files changed, 15 insertions(+), 15 deletions(-)<br>
<br>
diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h<br>
index bcb3f0fffac..c9140ba9752 100644<br>
--- a/src/compiler/shader_info.h<br>
+++ b/src/compiler/shader_info.h<br>
@@ -31,6 +31,19 @@<br>
extern "C" {<br>
#endif<br>
<span class=""><br>
+struct spirv_supported_capabilities {<br>
+ bool float64;<br>
+ bool image_ms_array;<br>
+ bool tessellation;<br>
+ bool draw_parameters;<br>
+ bool image_read_without_format;<br>
+ bool image_write_without_format;<br>
+ bool int64;<br>
+ bool multiview;<br>
+ bool variable_pointers;<br>
+ bool storage_16bit;<br>
+};<br>
+<br>
</span> typedef struct shader_info {<br>
const char *name;<br>
<br>
diff --git a/src/compiler/spirv/nir_<wbr>spirv.h b/src/compiler/spirv/nir_<wbr>spirv.h<br>
index 113bd710a00..a2c40e57d18 100644<br>
<span class="">--- a/src/compiler/spirv/nir_<wbr>spirv.h<br>
+++ b/src/compiler/spirv/nir_<wbr>spirv.h<br>
@@ -29,7 +29,7 @@<br>
#define _NIR_SPIRV_H_<br>
<br>
#include "compiler/nir/nir.h"<br>
-#include "main/mtypes.h"<br>
</span>+#include "compiler/shader_info.h"<br>
<span class="im HOEnZb"><br>
#ifdef __cplusplus<br>
extern "C" {<br>
@@ -58,7 +58,7 @@ struct spirv_to_nir_options {<br>
*/<br>
bool lower_workgroup_access_to_<wbr>offsets;<br>
<br>
- struct nir_spirv_supported_<wbr>capabilities caps;<br>
+ struct spirv_supported_capabilities caps;<br>
<br>
struct {<br>
void (*func)(void *private_data,<br>
</span><div class="HOEnZb"><div class="h5">diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h<br>
index 7b7137624c7..397b113dfbc 100644<br>
--- a/src/mesa/main/mtypes.h<br>
+++ b/src/mesa/main/mtypes.h<br>
@@ -3578,19 +3578,6 @@ struct gl_program_constants<br>
GLuint MaxShaderStorageBlocks;<br>
};<br>
<br>
-struct nir_spirv_supported_<wbr>capabilities {<br>
- bool float64;<br>
- bool image_ms_array;<br>
- bool tessellation;<br>
- bool draw_parameters;<br>
- bool image_read_without_format;<br>
- bool image_write_without_format;<br>
- bool int64;<br>
- bool multiview;<br>
- bool variable_pointers;<br>
- bool storage_16bit;<br>
-};<br>
-<br>
/**<br>
* Constants which may be overridden by device driver during context creation<br>
* but are never changed after that.<br>
--<br>
2.11.0<br>
<br>
</div></div></blockquote></div><br></div>