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

nir/spirv: update to SPIR-V revision 31

Browse source 
This means that now the internal version of glslangValidator is
required. This includes some changes due to the sampler/texture rework,
but doesn't actually enable anything more yet. We also don't yet handle
UBO's correctly, and don't handle matrix stride and row major/column
major yet.
This commit is contained in:
Connor Abbott 2015-07-13 10:19:32 -07:00
parent 45f8723f44
commit ffb51fd112
2 changed files with 599 additions and 1092 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1462
src/glsl/nir/spirv.h
View file

File diff suppressed because it is too large Load diff

217
src/glsl/nir/spirv_to_nir.c
View file

@ -334,10 +334,8 @@ struct_member_decoration_cb(struct vtn_builder *b,
return; return;
switch (dec->decoration) { switch (dec->decoration) {
case SpvDecorationPrecisionLow: case SpvDecorationRelaxedPrecision:
case SpvDecorationPrecisionMedium: break; /* FIXME: Do nothing with this for now. */
case SpvDecorationPrecisionHigh:
break; /* FIXME: Do nothing with these for now. */
case SpvDecorationSmooth: case SpvDecorationSmooth:
ctx->fields[member].interpolation = INTERP_QUALIFIER_SMOOTH; ctx->fields[member].interpolation = INTERP_QUALIFIER_SMOOTH;
break; break;
@ -362,11 +360,32 @@ struct_member_decoration_cb(struct vtn_builder *b,
ctx->type->members[member]->is_builtin = true; ctx->type->members[member]->is_builtin = true;
ctx->type->members[member]->builtin = dec->literals[0]; ctx->type->members[member]->builtin = dec->literals[0];
break; break;
case SpvDecorationOffset:
ctx->type->offsets[member] = dec->literals[0];
break;
default: default:
unreachable("Unhandled member decoration"); unreachable("Unhandled member decoration");
} }
} }
static void
array_decoration_cb(struct vtn_builder *b,
struct vtn_value *val, int member,
const struct vtn_decoration *dec, void *ctx)
{
struct vtn_type *type = val->type;
assert(member == -1);
switch (dec->decoration) {
case SpvDecorationArrayStride:
type->stride = dec->literals[0];
break;
default:
unreachable("Unhandled array type decoration");
}
}
static void static void
vtn_handle_type(struct vtn_builder *b, SpvOp opcode, vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
const uint32_t *w, unsigned count) const uint32_t *w, unsigned count)
@ -421,12 +440,14 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
val->type->type = glsl_array_type(array_element->type, w[3]); val->type->type = glsl_array_type(array_element->type, w[3]);
val->type->array_element = array_element; val->type->array_element = array_element;
val->type->stride = 0; val->type->stride = 0;
vtn_foreach_decoration(b, val, array_decoration_cb, NULL);
return; return;
} }
case SpvOpTypeStruct: { case SpvOpTypeStruct: {
unsigned num_fields = count - 2; unsigned num_fields = count - 2;
val->type->members = ralloc_array(b, struct vtn_type *, num_fields); val->type->members = ralloc_array(b, struct vtn_type *, num_fields);
val->type->offsets = ralloc_array(b, unsigned, num_fields);
NIR_VLA(struct glsl_struct_field, fields, count); NIR_VLA(struct glsl_struct_field, fields, count);
for (unsigned i = 0; i < num_fields; i++) { for (unsigned i = 0; i < num_fields; i++) {
@ -479,7 +500,7 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
val->type = vtn_value(b, w[3], vtn_value_type_type)->type; val->type = vtn_value(b, w[3], vtn_value_type_type)->type;
return; return;
case SpvOpTypeSampler: { case SpvOpTypeImage: {
const struct glsl_type *sampled_type = const struct glsl_type *sampled_type =
vtn_value(b, w[2], vtn_value_type_type)->type->type; vtn_value(b, w[2], vtn_value_type_type)->type->type;
@ -497,19 +518,21 @@ vtn_handle_type(struct vtn_builder *b, SpvOp opcode,
unreachable("Invalid SPIR-V Sampler dimension"); unreachable("Invalid SPIR-V Sampler dimension");
} }
/* TODO: Handle the various texture image/filter options */ bool is_shadow = w[4];
(void)w[4];
bool is_array = w[5]; bool is_array = w[5];
bool is_shadow = w[6];
assert(w[7] == 0 && "FIXME: Handl multi-sampled textures"); assert(w[6] == 0 && "FIXME: Handl multi-sampled textures");
assert(w[7] == 1 && "FIXME: Add support for non-sampled images");
val->type->type = glsl_sampler_type(dim, is_shadow, is_array, val->type->type = glsl_sampler_type(dim, is_shadow, is_array,
glsl_get_base_type(sampled_type)); glsl_get_base_type(sampled_type));
return; return;
} }
case SpvOpTypeSampledImage:
val->type = vtn_value(b, w[2], vtn_value_type_type)->type;
break;
case SpvOpTypeRuntimeArray: case SpvOpTypeRuntimeArray:
case SpvOpTypeOpaque: case SpvOpTypeOpaque:
case SpvOpTypeEvent: case SpvOpTypeEvent:
@ -693,10 +716,8 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
nir_variable *var = void_var; nir_variable *var = void_var;
switch (dec->decoration) { switch (dec->decoration) {
case SpvDecorationPrecisionLow: case SpvDecorationRelaxedPrecision:
case SpvDecorationPrecisionMedium: break; /* FIXME: Do nothing with this for now. */
case SpvDecorationPrecisionHigh:
break; /* FIXME: Do nothing with these for now. */
case SpvDecorationSmooth: case SpvDecorationSmooth:
var->data.interpolation = INTERP_QUALIFIER_SMOOTH; var->data.interpolation = INTERP_QUALIFIER_SMOOTH;
break; break;
@ -758,9 +779,6 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
case SpvDecorationRowMajor: case SpvDecorationRowMajor:
case SpvDecorationColMajor: case SpvDecorationColMajor:
case SpvDecorationGLSLShared: case SpvDecorationGLSLShared:
case SpvDecorationGLSLStd140:
case SpvDecorationGLSLStd430:
case SpvDecorationGLSLPacked:
case SpvDecorationPatch: case SpvDecorationPatch:
case SpvDecorationRestrict: case SpvDecorationRestrict:
case SpvDecorationAliased: case SpvDecorationAliased:
@ -773,9 +791,7 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
case SpvDecorationSaturatedConversion: case SpvDecorationSaturatedConversion:
case SpvDecorationStream: case SpvDecorationStream:
case SpvDecorationOffset: case SpvDecorationOffset:
case SpvDecorationAlignment:
case SpvDecorationXfbBuffer: case SpvDecorationXfbBuffer:
case SpvDecorationStride:
case SpvDecorationFuncParamAttr: case SpvDecorationFuncParamAttr:
case SpvDecorationFPRoundingMode: case SpvDecorationFPRoundingMode:
case SpvDecorationFPFastMathMode: case SpvDecorationFPFastMathMode:
@ -1118,7 +1134,6 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
case SpvStorageClassWorkgroupLocal: case SpvStorageClassWorkgroupLocal:
case SpvStorageClassWorkgroupGlobal: case SpvStorageClassWorkgroupGlobal:
case SpvStorageClassGeneric: case SpvStorageClassGeneric:
case SpvStorageClassPrivate:
case SpvStorageClassAtomicCounter: case SpvStorageClassAtomicCounter:
default: default:
unreachable("Unhandled variable storage class"); unreachable("Unhandled variable storage class");
@ -1270,10 +1285,9 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
break; break;
} }
case SpvOpVariableArray:
case SpvOpCopyMemorySized: case SpvOpCopyMemorySized:
case SpvOpArrayLength: case SpvOpArrayLength:
case SpvOpImagePointer: case SpvOpImageTexelPointer:
default: default:
unreachable("Unhandled opcode"); unreachable("Unhandled opcode");
} }
@ -1342,31 +1356,24 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
nir_tex_src srcs[8]; /* 8 should be enough */ nir_tex_src srcs[8]; /* 8 should be enough */
nir_tex_src *p = srcs; nir_tex_src *p = srcs;
unsigned idx = 4;
unsigned coord_components = 0; unsigned coord_components = 0;
switch (opcode) { switch (opcode) {
case SpvOpTextureSample: case SpvOpImageSampleImplicitLod:
case SpvOpTextureSampleDref: case SpvOpImageSampleExplicitLod:
case SpvOpTextureSampleLod: case SpvOpImageSampleDrefImplicitLod:
case SpvOpTextureSampleProj: case SpvOpImageSampleDrefExplicitLod:
case SpvOpTextureSampleGrad: case SpvOpImageSampleProjImplicitLod:
case SpvOpTextureSampleOffset: case SpvOpImageSampleProjExplicitLod:
case SpvOpTextureSampleProjLod: case SpvOpImageSampleProjDrefImplicitLod:
case SpvOpTextureSampleProjGrad: case SpvOpImageSampleProjDrefExplicitLod:
case SpvOpTextureSampleLodOffset: case SpvOpImageFetch:
case SpvOpTextureSampleProjOffset: case SpvOpImageGather:
case SpvOpTextureSampleGradOffset: case SpvOpImageDrefGather:
case SpvOpTextureSampleProjLodOffset: case SpvOpImageQueryLod: {
case SpvOpTextureSampleProjGradOffset:
case SpvOpTextureFetchTexelLod:
case SpvOpTextureFetchTexelOffset:
case SpvOpTextureFetchSample:
case SpvOpTextureFetchTexel:
case SpvOpTextureGather:
case SpvOpTextureGatherOffset:
case SpvOpTextureGatherOffsets:
case SpvOpTextureQueryLod: {
/* All these types have the coordinate as their first real argument */ /* All these types have the coordinate as their first real argument */
struct vtn_ssa_value *coord = vtn_ssa_value(b, w[4]); struct vtn_ssa_value *coord = vtn_ssa_value(b, w[idx++]);
coord_components = glsl_get_vector_elements(coord->type); coord_components = glsl_get_vector_elements(coord->type);
p->src = nir_src_for_ssa(coord->def); p->src = nir_src_for_ssa(coord->def);
p->src_type = nir_tex_src_coord; p->src_type = nir_tex_src_coord;
@ -1380,43 +1387,36 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
nir_texop texop; nir_texop texop;
switch (opcode) { switch (opcode) {
case SpvOpTextureSample: case SpvOpImageSampleImplicitLod:
texop = nir_texop_tex; texop = nir_texop_tex;
if (count == 6) {
texop = nir_texop_txb;
*p++ = vtn_tex_src(b, w[5], nir_tex_src_bias);
}
break; break;
case SpvOpTextureSampleDref: case SpvOpImageSampleExplicitLod:
case SpvOpTextureSampleLod: case SpvOpImageSampleDrefImplicitLod:
case SpvOpTextureSampleProj: case SpvOpImageSampleDrefExplicitLod:
case SpvOpTextureSampleGrad: case SpvOpImageSampleProjImplicitLod:
case SpvOpTextureSampleOffset: case SpvOpImageSampleProjExplicitLod:
case SpvOpTextureSampleProjLod: case SpvOpImageSampleProjDrefImplicitLod:
case SpvOpTextureSampleProjGrad: case SpvOpImageSampleProjDrefExplicitLod:
case SpvOpTextureSampleLodOffset: case SpvOpImageFetch:
case SpvOpTextureSampleProjOffset: case SpvOpImageGather:
case SpvOpTextureSampleGradOffset: case SpvOpImageDrefGather:
case SpvOpTextureSampleProjLodOffset: case SpvOpImageQuerySizeLod:
case SpvOpTextureSampleProjGradOffset: case SpvOpImageQuerySize:
case SpvOpTextureFetchTexelLod: case SpvOpImageQueryLod:
case SpvOpTextureFetchTexelOffset: case SpvOpImageQueryLevels:
case SpvOpTextureFetchSample: case SpvOpImageQuerySamples:
case SpvOpTextureFetchTexel:
case SpvOpTextureGather:
case SpvOpTextureGatherOffset:
case SpvOpTextureGatherOffsets:
case SpvOpTextureQuerySizeLod:
case SpvOpTextureQuerySize:
case SpvOpTextureQueryLod:
case SpvOpTextureQueryLevels:
case SpvOpTextureQuerySamples:
default: default:
unreachable("Unhandled opcode"); unreachable("Unhandled opcode");
} }
/* From now on, the remaining sources are "Optional Image Operands." */
if (idx < count) {
/* XXX handle these (bias, lod, etc.) */
assert(0);
}
nir_tex_instr *instr = nir_tex_instr_create(b->shader, p - srcs); nir_tex_instr *instr = nir_tex_instr_create(b->shader, p - srcs);
const struct glsl_type *sampler_type = nir_deref_tail(&sampler->deref)->type; const struct glsl_type *sampler_type = nir_deref_tail(&sampler->deref)->type;
@ -1742,7 +1742,8 @@ vtn_handle_alu(struct vtn_builder *b, SpvOp opcode,
case SpvOpShiftRightArithmetic: op = nir_op_ishr; break; case SpvOpShiftRightArithmetic: op = nir_op_ishr; break;
case SpvOpShiftLeftLogical: op = nir_op_ishl; break; case SpvOpShiftLeftLogical: op = nir_op_ishl; break;
case SpvOpLogicalOr: op = nir_op_ior; break; case SpvOpLogicalOr: op = nir_op_ior; break;
case SpvOpLogicalXor: op = nir_op_ixor; break; case SpvOpLogicalEqual: op = nir_op_ieq; break;
case SpvOpLogicalNotEqual: op = nir_op_ine; break;
case SpvOpLogicalAnd: op = nir_op_iand; break; case SpvOpLogicalAnd: op = nir_op_iand; break;
case SpvOpBitwiseOr: op = nir_op_ior; break; case SpvOpBitwiseOr: op = nir_op_ior; break;
case SpvOpBitwiseXor: op = nir_op_ixor; break; case SpvOpBitwiseXor: op = nir_op_ixor; break;
@ -2200,11 +2201,19 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
switch (opcode) { switch (opcode) {
case SpvOpSource: case SpvOpSource:
case SpvOpSourceExtension: case SpvOpSourceExtension:
case SpvOpCompileFlag:
case SpvOpExtension: case SpvOpExtension:
/* Unhandled, but these are for debug so that's ok. */ /* Unhandled, but these are for debug so that's ok. */
break; break;
case SpvOpCapability:
/*
* TODO properly handle these and give a real error if asking for too
* much.
*/
assert(w[1] == SpvCapabilityMatrix ||
w[1] == SpvCapabilityShader);
break;
case SpvOpExtInstImport: case SpvOpExtInstImport:
vtn_handle_extension(b, opcode, w, count); vtn_handle_extension(b, opcode, w, count);
break; break;
@ -2221,7 +2230,10 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
break; break;
case SpvOpExecutionMode: case SpvOpExecutionMode:
unreachable("Execution modes not yet implemented"); /*
* TODO handle these - for Vulkan OriginUpperLeft is always set for
* fragment shaders, so we can ignore this for now
*/
break; break;
case SpvOpString: case SpvOpString:
@ -2254,7 +2266,9 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpTypeFloat: case SpvOpTypeFloat:
case SpvOpTypeVector: case SpvOpTypeVector:
case SpvOpTypeMatrix: case SpvOpTypeMatrix:
case SpvOpTypeImage:
case SpvOpTypeSampler: case SpvOpTypeSampler:
case SpvOpTypeSampledImage:
case SpvOpTypeArray: case SpvOpTypeArray:
case SpvOpTypeRuntimeArray: case SpvOpTypeRuntimeArray:
case SpvOpTypeStruct: case SpvOpTypeStruct:
@ -2274,8 +2288,6 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpConstant: case SpvOpConstant:
case SpvOpConstantComposite: case SpvOpConstantComposite:
case SpvOpConstantSampler: case SpvOpConstantSampler:
case SpvOpConstantNullPointer:
case SpvOpConstantNullObject:
case SpvOpSpecConstantTrue: case SpvOpSpecConstantTrue:
case SpvOpSpecConstantFalse: case SpvOpSpecConstantFalse:
case SpvOpSpecConstant: case SpvOpSpecConstant:
@ -2422,7 +2434,6 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode,
break; break;
case SpvOpVariable: case SpvOpVariable:
case SpvOpVariableArray:
case SpvOpLoad: case SpvOpLoad:
case SpvOpStore: case SpvOpStore:
case SpvOpCopyMemory: case SpvOpCopyMemory:
@ -2430,7 +2441,7 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpAccessChain: case SpvOpAccessChain:
case SpvOpInBoundsAccessChain: case SpvOpInBoundsAccessChain:
case SpvOpArrayLength: case SpvOpArrayLength:
case SpvOpImagePointer: case SpvOpImageTexelPointer:
vtn_handle_variables(b, opcode, w, count); vtn_handle_variables(b, opcode, w, count);
break; break;
@ -2438,31 +2449,22 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode,
vtn_handle_function_call(b, opcode, w, count); vtn_handle_function_call(b, opcode, w, count);
break; break;
case SpvOpTextureSample: case SpvOpImageSampleImplicitLod:
case SpvOpTextureSampleDref: case SpvOpImageSampleExplicitLod:
case SpvOpTextureSampleLod: case SpvOpImageSampleDrefImplicitLod:
case SpvOpTextureSampleProj: case SpvOpImageSampleDrefExplicitLod:
case SpvOpTextureSampleGrad: case SpvOpImageSampleProjImplicitLod:
case SpvOpTextureSampleOffset: case SpvOpImageSampleProjExplicitLod:
case SpvOpTextureSampleProjLod: case SpvOpImageSampleProjDrefImplicitLod:
case SpvOpTextureSampleProjGrad: case SpvOpImageSampleProjDrefExplicitLod:
case SpvOpTextureSampleLodOffset: case SpvOpImageFetch:
case SpvOpTextureSampleProjOffset: case SpvOpImageGather:
case SpvOpTextureSampleGradOffset: case SpvOpImageDrefGather:
case SpvOpTextureSampleProjLodOffset: case SpvOpImageQuerySizeLod:
case SpvOpTextureSampleProjGradOffset: case SpvOpImageQuerySize:
case SpvOpTextureFetchTexelLod: case SpvOpImageQueryLod:
case SpvOpTextureFetchTexelOffset: case SpvOpImageQueryLevels:
case SpvOpTextureFetchSample: case SpvOpImageQuerySamples:
case SpvOpTextureFetchTexel:
case SpvOpTextureGather:
case SpvOpTextureGatherOffset:
case SpvOpTextureGatherOffsets:
case SpvOpTextureQuerySizeLod:
case SpvOpTextureQuerySize:
case SpvOpTextureQueryLod:
case SpvOpTextureQueryLevels:
case SpvOpTextureQuerySamples:
vtn_handle_texture(b, opcode, w, count); vtn_handle_texture(b, opcode, w, count);
break; break;
@ -2511,7 +2513,8 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpShiftRightArithmetic: case SpvOpShiftRightArithmetic:
case SpvOpShiftLeftLogical: case SpvOpShiftLeftLogical:
case SpvOpLogicalOr: case SpvOpLogicalOr:
case SpvOpLogicalXor: case SpvOpLogicalEqual:
case SpvOpLogicalNotEqual:
case SpvOpLogicalAnd: case SpvOpLogicalAnd:
case SpvOpBitwiseOr: case SpvOpBitwiseOr:
case SpvOpBitwiseXor: case SpvOpBitwiseXor: