Merge pull request #385 from billhollings/master

Revert to not forcing gl_in/gl_out block for MSL.
This commit is contained in:
Hans-Kristian Arntzen 2018-01-09 09:07:30 +01:00 коммит произвёл GitHub
Родитель 513ba86fc8 27d4af75a0
Коммит c7aac59188
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
9 изменённых файлов: 141 добавлений и 2 удалений

Просмотреть файл

@ -0,0 +1,30 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct UBO
{
float4x4 uMVP;
};
struct main0_in
{
float3 aNormal [[attribute(1)]];
float4 aVertex [[attribute(0)]];
};
struct main0_out
{
float3 vNormal [[user(locn0)]];
float4 gl_Position [[position]];
};
vertex main0_out main0(main0_in in [[stage_in]], constant UBO& _16 [[buffer(0)]])
{
main0_out out = {};
out.gl_Position = _16.uMVP * in.aVertex;
out.vNormal = in.aNormal;
return out;
}

Просмотреть файл

@ -0,0 +1,23 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 gl_Position [[position]];
float gl_ClipDistance [[clip_distance]] [2];
float gl_CullDistance[2];
};
vertex main0_out main0()
{
main0_out out = {};
out.gl_Position = float4(10.0);
out.gl_ClipDistance[0] = 1.0;
out.gl_ClipDistance[1] = 4.0;
out.gl_CullDistance[0] = 4.0;
out.gl_CullDistance[1] = 9.0;
return out;
}

Просмотреть файл

@ -0,0 +1,30 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct UBO
{
float4x4 uMVP;
};
struct main0_in
{
float3 aNormal [[attribute(1)]];
float4 aVertex [[attribute(0)]];
};
struct main0_out
{
float3 vNormal [[user(locn0)]];
float4 gl_Position [[position]];
};
vertex main0_out main0(main0_in in [[stage_in]], constant UBO& _16 [[buffer(0)]])
{
main0_out out = {};
out.gl_Position = _16.uMVP * in.aVertex;
out.vNormal = in.aNormal;
return out;
}

Просмотреть файл

@ -0,0 +1,23 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 gl_Position [[position]];
float gl_ClipDistance [[clip_distance]] [2];
float gl_CullDistance[2];
};
vertex main0_out main0()
{
main0_out out = {};
out.gl_Position = float4(10.0);
out.gl_ClipDistance[0] = 1.0;
out.gl_ClipDistance[1] = 4.0;
out.gl_CullDistance[0] = 4.0;
out.gl_CullDistance[1] = 9.0;
return out;
}

Просмотреть файл

@ -0,0 +1,20 @@
#version 450
out gl_PerVertex
{
vec4 gl_Position;
};
layout(std140) uniform UBO
{
mat4 uMVP;
};
layout(location = 0) in vec4 aVertex;
layout(location = 1) in vec3 aNormal;
layout(location = 0) out vec3 vNormal;
void main()
{
gl_Position = uMVP * aVertex;
vNormal = aNormal;
}

Просмотреть файл

@ -0,0 +1,10 @@
#version 450
void main()
{
gl_Position = vec4(10.0);
gl_ClipDistance[0] = 1.0;
gl_ClipDistance[1] = 4.0;
gl_CullDistance[0] = 4.0;
gl_CullDistance[1] = 9.0;
}

Просмотреть файл

@ -4305,7 +4305,8 @@ string CompilerGLSL::access_chain_internal(uint32_t base, const uint32_t *indice
}; };
auto *var = maybe_get<SPIRVariable>(base); auto *var = maybe_get<SPIRVariable>(base);
if (i == 0 && var && is_builtin_variable(*var) && !has_decoration(type->self, DecorationBlock)) if (backend.force_gl_in_out_block && i == 0 && var && is_builtin_variable(*var) &&
!has_decoration(type->self, DecorationBlock))
{ {
// This deals with scenarios for tesc/geom where arrays of gl_Position[] are declared. // This deals with scenarios for tesc/geom where arrays of gl_Position[] are declared.
// Normally, these variables live in blocks when compiled from GLSL, // Normally, these variables live in blocks when compiled from GLSL,

Просмотреть файл

@ -322,7 +322,7 @@ protected:
bool allow_precision_qualifiers = false; bool allow_precision_qualifiers = false;
bool can_swizzle_scalar = false; bool can_swizzle_scalar = false;
bool force_temp_use_for_two_vector_shuffles = false; bool force_temp_use_for_two_vector_shuffles = false;
bool force_gl_in_out_block = true;
} backend; } backend;
void emit_struct(SPIRType &type); void emit_struct(SPIRType &type);

Просмотреть файл

@ -71,6 +71,7 @@ string CompilerMSL::compile()
backend.native_row_major_matrix = false; backend.native_row_major_matrix = false;
backend.flexible_member_array_supported = false; backend.flexible_member_array_supported = false;
backend.force_temp_use_for_two_vector_shuffles = true; backend.force_temp_use_for_two_vector_shuffles = true;
backend.force_gl_in_out_block = false;
replace_illegal_names(); replace_illegal_names();
@ -3160,6 +3161,7 @@ string CompilerMSL::builtin_to_glsl(BuiltIn builtin, StorageClass storage)
case BuiltInPosition: case BuiltInPosition:
case BuiltInPointSize: case BuiltInPointSize:
case BuiltInClipDistance: case BuiltInClipDistance:
case BuiltInCullDistance:
case BuiltInLayer: case BuiltInLayer:
case BuiltInFragDepth: case BuiltInFragDepth:
if (current_function && (current_function->self == entry_point)) if (current_function && (current_function->self == entry_point))