From 6d8fefe38077f4d532c256e79cfcaf2a46c5269d Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 12 Nov 2013 16:58:49 +0100 Subject: Now use visual studio 2013 express edition for compilation --- mesalib/src/glsl/builtin_functions.cpp | 8 ++++---- mesalib/src/glsl/ir.cpp | 2 +- mesalib/src/glsl/ir_builder.cpp | 2 +- mesalib/src/glsl/ir_builder.h | 2 +- mesalib/src/glsl/ir_constant_expression.cpp | 7 ------- .../VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj | 10 +++++----- mesalib/windows/VC8/mesa/makefile | 6 +++++- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 10 +++++----- mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj | 10 +++++----- 9 files changed, 27 insertions(+), 30 deletions(-) (limited to 'mesalib') diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp index 8cb75e5ad..a45de091b 100644 --- a/mesalib/src/glsl/builtin_functions.cpp +++ b/mesalib/src/glsl/builtin_functions.cpp @@ -558,7 +558,7 @@ private: B1(bitCount) B1(findLSB) B1(findMSB) - B1(fma) + B1(fma_mesa) B2(ldexp) B2(frexp) B1(uaddCarry) @@ -2053,7 +2053,7 @@ builtin_builder::create_builtins() IU(bitCount) IU(findLSB) IU(findMSB) - F(fma) + F(fma_mesa) add_function("ldexp", _ldexp(glsl_type::float_type, glsl_type::int_type), @@ -3857,14 +3857,14 @@ builtin_builder::_findMSB(const glsl_type *type) } ir_function_signature * -builtin_builder::_fma(const glsl_type *type) +builtin_builder::_fma_mesa(const glsl_type *type) { ir_variable *a = in_var(type, "a"); ir_variable *b = in_var(type, "b"); ir_variable *c = in_var(type, "c"); MAKE_SIG(type, gpu_shader5, 3, a, b, c); - body.emit(ret(fma(a, b, c))); + body.emit(ret(fma_mesa(a, b, c))); return sig; } diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index 1b4973612..9715a203e 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -560,7 +560,7 @@ static const char *const operator_strs[] = { "ubo_load", "ldexp", "vector_extract", - "fma", + "fma_mesa", "lrp", "csel", "bfi", diff --git a/mesalib/src/glsl/ir_builder.cpp b/mesalib/src/glsl/ir_builder.cpp index 6c49734be..6fd58de0e 100644 --- a/mesalib/src/glsl/ir_builder.cpp +++ b/mesalib/src/glsl/ir_builder.cpp @@ -496,7 +496,7 @@ b2f(operand a) } ir_expression * -fma(operand a, operand b, operand c) +fma_mesa(operand a, operand b, operand c) { return expr(ir_triop_fma, a, b, c); } diff --git a/mesalib/src/glsl/ir_builder.h b/mesalib/src/glsl/ir_builder.h index 1f0778870..52cc2168f 100644 --- a/mesalib/src/glsl/ir_builder.h +++ b/mesalib/src/glsl/ir_builder.h @@ -184,7 +184,7 @@ ir_expression *i2b(operand a); ir_expression *f2b(operand a); ir_expression *b2f(operand a); -ir_expression *fma(operand a, operand b, operand c); +ir_expression *fma_mesa(operand a, operand b, operand c); ir_expression *lrp(operand x, operand y, operand a); ir_expression *csel(operand a, operand b, operand c); ir_expression *bitfield_insert(operand a, operand b, operand c, operand d); diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp index 02368b0f4..54bfe5832 100755 --- a/mesalib/src/glsl/ir_constant_expression.cpp +++ b/mesalib/src/glsl/ir_constant_expression.cpp @@ -53,13 +53,6 @@ static int isnormal(double x) } #endif -#if defined(_MSC_VER) -static double copysign(double x, double y) -{ - return _copysign(x, y); -} -#endif - static float dot(ir_constant *op0, ir_constant *op1) { diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index f52c2402b..382544612 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,23 +28,23 @@ Application MultiByte true - v110 + v120 Application MultiByte true - v110 + v120 Application MultiByte - v110 + v120 Application MultiByte - v110 + v120 diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index 3134b51ae..c5896231d 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -51,10 +51,14 @@ DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ ..\..\..\src\mesa\main\enums.c \ ..\..\..\src\mesa\main\api_exec.c \ ..\..\..\src\mesa\main\get_hash.h \ - ..\..\..\src\mesa\main\remap_helper.h + ..\..\..\src\mesa\main\remap_helper.h \ + ..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h all: $(TARGETDIR)\Release\swrast_dri.dll $(TARGETDIR)\Debug\swrast_dri.dll +..\..\..\src\mesa\drivers\dri\common\xmlpool\options.h: ..\..\..\src\mesa\drivers\dri\common\xmlpool\t_options.h ..\..\..\src\mesa\drivers\dri\common\xmlpool\gen_xmlpool.py + cd ..\..\..\src\mesa\drivers\dri\common\xmlpool & python gen_xmlpool.py t_options.h . > options.h + ..\..\..\src\mesa\main\dispatch.h: $(wildcard ..\..\..\src\mapi\glapi\gen\*.xml) ..\..\..\src\mapi\glapi\gen\gl_table.py cd ..\..\..\src\mapi\glapi\gen & python gl_table.py -f gl_and_es_API.xml -m remap_table > ..\..\..\mesa\main\dispatch.h diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index f7ca24087..4378bc40e 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ StaticLibrary false MultiByte - v110 + v120 StaticLibrary false MultiByte - v110 + v120 StaticLibrary false MultiByte - v110 + v120 StaticLibrary false MultiByte - v110 + v120 diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj index f7d8a28b9..47d154794 100644 --- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj +++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ DynamicLibrary false MultiByte - v110 + v120 DynamicLibrary false MultiByte - v110 + v120 DynamicLibrary false MultiByte - v110 + v120 DynamicLibrary false MultiByte - v110 + v120 -- cgit v1.2.3