For the series:
Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Marek
On Thu, Nov 2, 2017 at 2:50 AM, Timothy Arceri <tarc...@itsqueeze.com> wrote:
> ---
> src/amd/common/ac_nir_to_llvm.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
> index c3c9d7a859..2437ea05c1 100644
> --- a/src/amd/common/ac_nir_to_llvm.c
> +++ b/src/amd/common/ac_nir_to_llvm.c
> @@ -127,21 +127,20 @@ struct nir_to_llvm_context {
> LLVMValueRef esgs_ring;
> LLVMValueRef gsvs_ring;
> LLVMValueRef hs_ring_tess_offchip;
> LLVMValueRef hs_ring_tess_factor;
>
> LLVMValueRef prim_mask;
> LLVMValueRef sample_pos_offset;
> LLVMValueRef persp_sample, persp_center, persp_centroid;
> LLVMValueRef linear_sample, linear_center, linear_centroid;
>
> - LLVMTypeRef i64;
> LLVMTypeRef v2i32;
> LLVMTypeRef v3i32;
> LLVMTypeRef v4i32;
> LLVMTypeRef v8i32;
> LLVMTypeRef f64;
> LLVMTypeRef f32;
> LLVMTypeRef f16;
> LLVMTypeRef v2f32;
> LLVMTypeRef v4f32;
>
> @@ -986,21 +985,20 @@ static void create_function(struct nir_to_llvm_context
> *ctx,
> break;
> default:
> unreachable("Shader stage not implemented");
> }
>
> ctx->shader_info->num_user_sgprs = user_sgpr_idx;
> }
>
> static void setup_types(struct nir_to_llvm_context *ctx)
> {
> - ctx->i64 = LLVMIntTypeInContext(ctx->context, 64);
> ctx->v2i32 = LLVMVectorType(ctx->ac.i32, 2);
> ctx->v3i32 = LLVMVectorType(ctx->ac.i32, 3);
> ctx->v4i32 = LLVMVectorType(ctx->ac.i32, 4);
> ctx->v8i32 = LLVMVectorType(ctx->ac.i32, 8);
> ctx->f32 = LLVMFloatTypeInContext(ctx->context);
> ctx->f16 = LLVMHalfTypeInContext(ctx->context);
> ctx->f64 = LLVMDoubleTypeInContext(ctx->context);
> ctx->v2f32 = LLVMVectorType(ctx->f32, 2);
> ctx->v4f32 = LLVMVectorType(ctx->f32, 4);
>
> @@ -5324,21 +5322,21 @@ glsl_base_to_llvm_type(struct nir_to_llvm_context
> *ctx,
> switch (type) {
> case GLSL_TYPE_INT:
> case GLSL_TYPE_UINT:
> case GLSL_TYPE_BOOL:
> case GLSL_TYPE_SUBROUTINE:
> return ctx->ac.i32;
> case GLSL_TYPE_FLOAT: /* TODO handle mediump */
> return ctx->f32;
> case GLSL_TYPE_INT64:
> case GLSL_TYPE_UINT64:
> - return ctx->i64;
> + return ctx->ac.i64;
> case GLSL_TYPE_DOUBLE:
> return ctx->f64;
> default:
> unreachable("unknown GLSL type");
> }
> }
>
> static LLVMTypeRef
> glsl_to_llvm_type(struct nir_to_llvm_context *ctx,
> const struct glsl_type *type)
> --
> 2.14.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
