From 3ca0029a0dc7b2ed2c61de72ef16e7ad1831c101 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 1 Sep 2016 14:17:49 -0700 Subject: [PATCH] nir: Add 64-bit integer constant support v2: Rebase on 19a541f (nir: Get rid of nir_constant_data) Signed-off-by: Ian Romanick Reviewed-by: Connor Abbott [v1] --- src/compiler/glsl/glsl_to_nir.cpp | 16 ++++++++++++++++ src/compiler/nir/nir.c | 2 ++ src/compiler/nir/nir_print.c | 11 +++++++++++ 3 files changed, 29 insertions(+) diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp index 33f71bf416a..f4c3d01e723 100644 --- a/src/compiler/glsl/glsl_to_nir.cpp +++ b/src/compiler/glsl/glsl_to_nir.cpp @@ -254,6 +254,22 @@ constant_copy(ir_constant *ir, void *mem_ctx) } break; + case GLSL_TYPE_UINT64: + /* Only float base types can be matrices. */ + assert(cols == 1); + + for (unsigned r = 0; r < rows; r++) + ret->values[0].u64[r] = ir->value.u64[r]; + break; + + case GLSL_TYPE_INT64: + /* Only float base types can be matrices. */ + assert(cols == 1); + + for (unsigned r = 0; r < rows; r++) + ret->values[0].i64[r] = ir->value.i64[r]; + break; + case GLSL_TYPE_BOOL: /* Only float base types can be matrices. */ assert(cols == 1); diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index f501e235c5c..25bfc31653a 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -846,6 +846,8 @@ nir_deref_get_const_initializer_load(nir_shader *shader, nir_deref_var *deref) case GLSL_TYPE_INT: case GLSL_TYPE_UINT: case GLSL_TYPE_DOUBLE: + case GLSL_TYPE_UINT64: + case GLSL_TYPE_INT64: case GLSL_TYPE_BOOL: load->value = constant->values[matrix_col]; break; diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index 8a3d734669a..af105557123 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -330,6 +330,17 @@ print_constant(nir_constant *c, const struct glsl_type *type, print_state *state } break; + case GLSL_TYPE_UINT64: + case GLSL_TYPE_INT64: + /* Only float base types can be matrices. */ + assert(cols == 1); + + for (i = 0; i < cols; i++) { + if (i > 0) fprintf(fp, ", "); + fprintf(fp, "0x%08" PRIx64, c->values[0].u64[i]); + } + break; + case GLSL_TYPE_STRUCT: for (i = 0; i < c->num_elements; i++) { if (i > 0) fprintf(fp, ", "); -- 2.30.2