diff options
| -rw-r--r-- | src/compiler/Android.glsl.gen.mk | 4 | ||||
| -rw-r--r-- | src/compiler/Makefile.glsl.am | 6 | ||||
| -rw-r--r-- | src/compiler/Makefile.sources | 3 | ||||
| -rw-r--r-- | src/compiler/glsl/float64.glsl | 58 | ||||
| -rw-r--r-- | src/compiler/glsl/meson.build | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 1 |
6 files changed, 80 insertions, 2 deletions
diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk index cdd786aa87c..e31eb6f101f 100644 --- a/src/compiler/Android.glsl.gen.mk +++ b/src/compiler/Android.glsl.gen.mk @@ -103,3 +103,7 @@ $(intermediates)/glsl/ir_expression_operation_constant.h: $(LOCAL_PATH)/glsl/ir_ $(intermediates)/glsl/ir_expression_operation_strings.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $< strings > $@ + +$(intermediates)/compiler/glsl/float64_glsl.h: $(LOCAL_PATH)/glsl/xxd.py + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $< $(MESA_TOP)/src/compiler/glsl/float64.glsl $@ -n float64_source > $@ diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index 9d88d1f66ee..af2294c789e 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -226,6 +226,10 @@ glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py $(MKDIR_GEN) $(PYTHON_GEN) $(srcdir)/glsl/ir_expression_operation.py strings > $@ || ($(RM) $@; false) +glsl/float64_glsl.h: glsl/xxd.py glsl/float64.glsl + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/glsl/xxd.py $(srcdir)/glsl/float64.glsl $@ -n float64_source || ($(RM) $@; false) + # Only the parsers (specifically the header files generated at the same time) # need to be in BUILT_SOURCES. Though if we list the parser headers YACC is # called for the .c/.cpp file and the .h files. By listing the .c/.cpp files @@ -233,6 +237,7 @@ glsl/ir_expression_operation_strings.h: glsl/ir_expression_operation.py # will be created at the appropriate times according to standard automake # dependency rules. BUILT_SOURCES += \ + glsl/float64_glsl.h \ glsl/glsl_parser.cpp \ glsl/glsl_lexer.cpp \ glsl/ir_expression_operation.h \ @@ -241,6 +246,7 @@ BUILT_SOURCES += \ glsl/glcpp/glcpp-parse.c \ glsl/glcpp/glcpp-lex.c CLEANFILES += \ + glsl/float64_glsl.h \ glsl/glcpp/glcpp-parse.h \ glsl/glsl_parser.h \ glsl/glsl_parser.cpp \ diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index ef47bdb33bf..ec62c2fbb42 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -178,7 +178,8 @@ LIBGLSL_GENERATED_FILES = \ glsl/ir_expression_operation_strings.h \ glsl/glsl_lexer.cpp \ glsl/glsl_parser.cpp \ - glsl/glsl_parser.h + glsl/glsl_parser.h \ + compiler/glsl/float64_glsl.h # libglcpp diff --git a/src/compiler/glsl/float64.glsl b/src/compiler/glsl/float64.glsl new file mode 100644 index 00000000000..a299269677a --- /dev/null +++ b/src/compiler/glsl/float64.glsl @@ -0,0 +1,58 @@ +/* + * The implementations contained in this file are heavily based on the + * implementations found in the Berkeley SoftFloat library. As such, they are + * licensed under the same 3-clause BSD license: + * + * License for Berkeley SoftFloat Release 3e + * + * John R. Hauser + * 2018 January 20 + * + * The following applies to the whole of SoftFloat Release 3e as well as to + * each source file individually. + * + * Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 The Regents of the + * University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions, and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#version 430 +#extension GL_ARB_gpu_shader_int64 : enable +#extension GL_ARB_shader_bit_encoding : enable + +#pragma warning(off) + +/* Software IEEE floating-point rounding mode. + * GLSL spec section "4.7.1 Range and Precision": + * The rounding mode cannot be set and is undefined. + * But here, we are able to define the rounding mode at the compilation time. + */ +#define FLOAT_ROUND_NEAREST_EVEN 0 +#define FLOAT_ROUND_TO_ZERO 1 +#define FLOAT_ROUND_DOWN 2 +#define FLOAT_ROUND_UP 3 +#define FLOAT_ROUNDING_MODE FLOAT_ROUND_NEAREST_EVEN diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index 71b4c42e4d7..8096f2d048e 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -53,6 +53,13 @@ ir_expression_operation_strings_h = custom_target( capture : true, ) +float64_glsl_h = custom_target( + 'float64_glsl.h', + input : ['xxd.py', 'float64.glsl'], + output : 'float64_glsl.h', + command : [prog_python, '@INPUT@', '@OUTPUT@', '-n', 'float64_source'], +) + files_libglsl = files( 'ast.h', 'ast_array_index.cpp', @@ -213,7 +220,8 @@ files_libglsl_standalone = files( libglsl = static_library( 'glsl', [files_libglsl, glsl_parser, glsl_lexer_cpp, ir_expression_operation_h, - ir_expression_operation_strings_h, ir_expression_operation_constant_h], + ir_expression_operation_strings_h, ir_expression_operation_constant_h, + float64_glsl_h], c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], link_with : libglcpp, diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index fbad63a0824..a14f427dfb7 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -312,6 +312,7 @@ LOCAL_CFLAGS := \ LOCAL_C_INCLUDES := \ $(MESA_DRI_C_INCLUDES) \ + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,) \ $(MESA_TOP)/include/drm-uapi LOCAL_SRC_FILES := \ |