fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/spirv: move and rename nir_spirv_supported_capabilities

Browse source 
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@jlekstrand.net>
This commit is contained in:
Alejandro Piñeiro 2017-12-07 09:38:41 +01:00
parent b2490a326c
commit 25e56b2eba
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/compiler/shader_info.h
View file

@ -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;

4
src/compiler/spirv/nir_spirv.h
View file

@ -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,

13
src/mesa/main/mtypes.h
View file

@ -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.