From 98522c1853eac22b3501e8739020b362786d1811 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 25 Mar 2016 14:40:57 -0700 Subject: [PATCH 1/1] nir/spirv: Get rid of the spirv2nir helper binary This was useful once upon a time but now that we have a real Vulkan driver to run our SPIR-V binaries through, there's really no point. --- src/compiler/Makefile.am | 16 +---------- src/compiler/nir/spirv2nir.c | 55 ------------------------------------ 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 src/compiler/nir/spirv2nir.c diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am index 8f374484696..5032890e73d 100644 --- a/src/compiler/Makefile.am +++ b/src/compiler/Makefile.am @@ -84,7 +84,7 @@ check_PROGRAMS += \ glsl/tests/sampler-types-test \ glsl/tests/uniform-initializer-test -noinst_PROGRAMS = glsl_compiler spirv2nir +noinst_PROGRAMS = glsl_compiler glsl_tests_blob_test_SOURCES = \ glsl/tests/blob_test.c @@ -176,20 +176,6 @@ glsl_glsl_test_LDADD = \ $(top_builddir)/src/libglsl_util.la \ $(PTHREAD_LIBS) -spirv2nir_SOURCES = \ - nir/spirv2nir.c - -spirv2nir_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/src/compiler/nir - -spirv2nir_LDADD = \ - nir/libnir.la \ - $(top_builddir)/src/util/libmesautil.la \ - -lm -lstdc++ \ - $(PTHREAD_LIBS) - # We write our own rules for yacc and lex below. We'd rather use automake, # but automake makes it especially difficult for a number of reasons: # diff --git a/src/compiler/nir/spirv2nir.c b/src/compiler/nir/spirv2nir.c deleted file mode 100644 index c837186bdfc..00000000000 --- a/src/compiler/nir/spirv2nir.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright © 2015 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - * Authors: - * Jason Ekstrand (jason@jlekstrand.net) - * - */ - -/* - * A simple executable that opens a SPIR-V shader, converts it to NIR, and - * dumps out the result. This should be useful for testing the - * spirv_to_nir code. - */ - -#include "spirv/nir_spirv.h" - -#include -#include -#include -#include - -int main(int argc, char **argv) -{ - int fd = open(argv[1], O_RDONLY); - off_t len = lseek(fd, 0, SEEK_END); - - assert(len % 4 == 0); - size_t word_count = len / 4; - - const void *map = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0); - assert(map != NULL); - - nir_function *func = spirv_to_nir(map, word_count, NULL, 0, - MESA_SHADER_FRAGMENT, "main", NULL); - nir_print_shader(func->shader, stderr); -} -- 2.30.2