Mesa (master): mesa/spirv: move and rename nir_spirv_supported_capabilities
Alejandro Pinheiro
apinheiro at kemper.freedesktop.org
Thu Dec 7 16:15:47 UTC 2017
Module: Mesa
Branch: master
Commit: 25e56b2ebafe2bcebb23819cc355e1b079a839d6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25e56b2ebafe2bcebb23819cc355e1b079a839d6
Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date: Thu Dec 7 09:38:41 2017 +0100
mesa/spirv: move and rename nir_spirv_supported_capabilities
To avoid any vulkan driver to include the GL mtypes.h. Renamed as
eventually this could be used by drivers not using nir.
v2: remove compiler/spirv/spirv.h from mtypes (Alejandro)
v3: added the definition at compiler/shader_info.h (Jason Ekstrand)
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
---
src/compiler/shader_info.h | 13 +++++++++++++
src/compiler/spirv/nir_spirv.h | 4 ++--
src/mesa/main/mtypes.h | 13 -------------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h
index bcb3f0fffa..c9140ba975 100644
--- a/src/compiler/shader_info.h
+++ b/src/compiler/shader_info.h
@@ -31,6 +31,19 @@
extern "C" {
#endif
+struct spirv_supported_capabilities {
+ bool float64;
+ bool image_ms_array;
+ bool tessellation;
+ bool draw_parameters;
+ bool image_read_without_format;
+ bool image_write_without_format;
+ bool int64;
+ bool multiview;
+ bool variable_pointers;
+ bool storage_16bit;
+};
+
typedef struct shader_info {
const char *name;
diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h
index 113bd710a0..a2c40e57d1 100644
--- a/src/compiler/spirv/nir_spirv.h
+++ b/src/compiler/spirv/nir_spirv.h
@@ -29,7 +29,7 @@
#define _NIR_SPIRV_H_
#include "compiler/nir/nir.h"
-#include "main/mtypes.h"
+#include "compiler/shader_info.h"
#ifdef __cplusplus
extern "C" {
@@ -58,7 +58,7 @@ struct spirv_to_nir_options {
*/
bool lower_workgroup_access_to_offsets;
- struct nir_spirv_supported_capabilities caps;
+ struct spirv_supported_capabilities caps;
struct {
void (*func)(void *private_data,
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 7b7137624c..397b113dfb 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3578,19 +3578,6 @@ struct gl_program_constants
GLuint MaxShaderStorageBlocks;
};
-struct nir_spirv_supported_capabilities {
- bool float64;
- bool image_ms_array;
- bool tessellation;
- bool draw_parameters;
- bool image_read_without_format;
- bool image_write_without_format;
- bool int64;
- bool multiview;
- bool variable_pointers;
- bool storage_16bit;
-};
-
/**
* Constants which may be overridden by device driver during context creation
* but are never changed after that.
More information about the mesa-commit
mailing list