Mesa (master): scons: Add PROGRAM_NIR_FILES.
Module: Mesa
Branch: master
Commit: 26ddc4f9e103be495bd1720c07ba255e30523983
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=26ddc4f9e103be495bd1720c07ba255e30523983
Author: Vinson Lee
Date: Sat May 12 00:27:52 2018 -0700
scons: Add PROGRAM_NIR_FILES.
Fix SCons build error.
Linking build/linux-x86_64-debug/gallium/targets/libgl-xlib/libGL.so.1.5 ...
build/linux-x86_64-debug/mesa/libmesa.a(st_program.os): In function
`st_translate_prog_to_nir':
src/mesa/state_tracker/st_program.c:392: undefined reference to `prog_to_nir'
Fixes: 5c33e8c7729e ("st/nir: use NIR for asm programs")
Signed-off-by: Vinson Lee
---
src/mesa/SConscript | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index ba98ad4323..5a21b64f56 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -42,6 +42,7 @@ env.CFile('program/program_parse.tab.c',
'program/program_parse.y')
mesa_sources = (
source_lists['MESA_FILES'] +
source_lists['PROGRAM_FILES'] +
+source_lists['PROGRAM_NIR_FILES'] +
source_lists['STATETRACKER_FILES']
)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): swr/rast: Fix include for createInstructionCombiningPass with llvm-7.0.
Module: Mesa
Branch: master
Commit: cd5319a64fb1a9b080521a03e08202e48aca448e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd5319a64fb1a9b080521a03e08202e48aca448e
Author: Vinson Lee
Date: Sat Apr 28 23:28:08 2018 -0700
swr/rast: Fix include for createInstructionCombiningPass with llvm-7.0.
Fix build error after llvm-7.0.0svn r330669 ("InstCombine: Fix layering
by not including Scalar.h in InstCombine").
CXX rasterizer/jitter/libmesaswr_la-blend_jit.lo
rasterizer/jitter/blend_jit.cpp:816:20: error: use of undeclared identifier
'createInstructionCombiningPass'; did you mean
'createInstructionSimplifierPass'?
passes.add(createInstructionCombiningPass());
^~
createInstructionSimplifierPass
Suggested-by: George Kyriazis
Signed-off-by: Vinson Lee
Reviewed-By: George Kyriazis
---
src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp
b/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp
index 216938fa7b..001a1ab241 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp
@@ -69,6 +69,7 @@ using PassManager = llvm::legacy::PassManager;
#include "llvm/Transforms/Scalar.h"
#if LLVM_VERSION_MAJOR >= 7
#include "llvm/Transforms/Utils.h"
+#include "llvm/Transforms/InstCombine/InstCombine.h"
#endif
#include "llvm/Support/Host.h"
#include "llvm/Support/DynamicLibrary.h"
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): swr/rast: Fix WriteBitcodeToFile usage with llvm-7.0.
Module: Mesa
Branch: master
Commit: 589622a2fe1bbfb2564fae497e99a3bcb4a3e069
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=589622a2fe1bbfb2564fae497e99a3bcb4a3e069
Author: Vinson Lee
Date: Mon Apr 30 23:57:23 2018 -0700
swr/rast: Fix WriteBitcodeToFile usage with llvm-7.0.
Fix build error after llvm-7.0svn r325155 ("Pass a reference to a module
to the bitcode writer.").
CXX rasterizer/jitter/libmesaswr_la-JitManager.lo
rasterizer/jitter/JitManager.cpp:548:30: error: reference to type 'const
llvm::Module' could not bind to an lvalue of type 'const llvm::Module *'
llvm::WriteBitcodeToFile(M, bitcodeStream);
^
Suggested-by: George Kyriazis
Signed-off-by: Vinson Lee
Reviewed-By: George Kyriazis
---
src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4
1 file changed, 4 insertions(+)
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index aadcca2555..efb747abde 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -545,7 +545,11 @@ static inline uint32_t ComputeModuleCRC(const
llvm::Module* M)
std::string bitcodeBuffer;
raw_string_ostream bitcodeStream(bitcodeBuffer);
+#if LLVM_VERSION_MAJOR >= 7
+llvm::WriteBitcodeToFile(*M, bitcodeStream);
+#else
llvm::WriteBitcodeToFile(M, bitcodeStream);
+#endif
//M->print(bitcodeStream, nullptr, false);
bitcodeStream.flush();
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): swr: Fix include for createPromoteMemoryToRegisterPass
Module: Mesa Branch: master Commit: 79487c427ee2f82bc947ac1dffd6e2374efaa90f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=79487c427ee2f82bc947ac1dffd6e2374efaa90f Author: Mike Lothian Date: Wed Apr 4 09:22:54 2018 +0100 swr: Fix include for createPromoteMemoryToRegisterPass Include llvm/Transforms/Utils.h with the newest LLVM 7 v2: Include with " " rather than < > (Vinson Lee) v3: Use LLVM_VERSION_MAJOR rather than HAVE_LLVM (George Kyriazis) Signed-of-by: Mike Lothian Tested-by: Vinson Lee Reviewed-By: George Kyriazis --- src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp b/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp index b1d60765e5..216938fa7b 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp @@ -67,6 +67,9 @@ using PassManager = llvm::legacy::PassManager; #include "llvm/Support/DynamicLibrary.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/Scalar.h" +#if LLVM_VERSION_MAJOR >= 7 +#include "llvm/Transforms/Utils.h" +#endif #include "llvm/Support/Host.h" #include "llvm/Support/DynamicLibrary.h" ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallium: Do not add -Wframe-address option for gcc <= 4.4.
Module: Mesa
Branch: master
Commit: dc94a0506f1d267a761961d3ac905d77de3dae2e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc94a0506f1d267a761961d3ac905d77de3dae2e
Author: Vinson Lee
Date: Wed Mar 21 14:59:32 2018 -0700
gallium: Do not add -Wframe-address option for gcc <= 4.4.
This patch fixes these build errors with GCC 4.4.
Compiling src/gallium/auxiliary/util/u_debug_stack.c ...
src/gallium/auxiliary/util/u_debug_stack.c: In function
‘debug_backtrace_capture’:
src/gallium/auxiliary/util/u_debug_stack.c:268: error: #pragma GCC diagnostic
not allowed inside functions
src/gallium/auxiliary/util/u_debug_stack.c:269: error: #pragma GCC diagnostic
not allowed inside functions
src/gallium/auxiliary/util/u_debug_stack.c:271: error: #pragma GCC diagnostic
not allowed inside functions
Fixes: 370e356ebab4 ("gallium: silence __builtin_frame_address nonzero argument
is unsafe warning")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105529
Signed-off-by: Vinson Lee
Reviewed-by: Timothy Arceri
Reviewed-by: Jose Fonseca
---
src/gallium/auxiliary/util/u_debug_stack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/auxiliary/util/u_debug_stack.c
b/src/gallium/auxiliary/util/u_debug_stack.c
index 974e639e89..846f648431 100644
--- a/src/gallium/auxiliary/util/u_debug_stack.c
+++ b/src/gallium/auxiliary/util/u_debug_stack.c
@@ -264,7 +264,7 @@ debug_backtrace_capture(struct debug_stack_frame *backtrace,
}
#endif
-#if defined(PIPE_CC_GCC)
+#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION > 404) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wframe-address"
frame_pointer = ((const void **)__builtin_frame_address(1));
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): swr/rast: Fix macOS macro.
Module: Mesa
Branch: master
Commit: bb742b6ebf2d8c8dcc77f69b44995be2971e116a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb742b6ebf2d8c8dcc77f69b44995be2971e116a
Author: Vinson Lee
Date: Sat Feb 24 15:49:32 2018 -0800
swr/rast: Fix macOS macro.
Fixes: a25093de7188 ("swr/rast: Implement JIT shader caching to disk")
Signed-off-by: Vinson Lee
Reviewed-by: Eric Engestrom
Reviewed-By: George Kyriazis
---
src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
index ab7c6eb15b..0cefa43529 100644
--- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
+++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
@@ -47,7 +47,7 @@
#define JITTER_OUTPUT_DIR SWR_OUTPUT_DIR "\\Jitter"
#endif // _WIN32
-#if defined(__APPLE) || defined(FORCE_LINUX) || defined(__linux__) ||
defined(__gnu_linux__)
+#if defined(__APPLE__) || defined(FORCE_LINUX) || defined(__linux__) ||
defined(__gnu_linux__)
#include
#include
#endif
@@ -532,7 +532,7 @@ static inline uint32_t ComputeModuleCRC(const llvm::Module*
M)
/// constructor
JitCache::JitCache()
{
-#if defined(__APPLE) || defined(FORCE_LINUX) || defined(__linux__) ||
defined(__gnu_linux__)
+#if defined(__APPLE__) || defined(FORCE_LINUX) || defined(__linux__) ||
defined(__gnu_linux__)
if (strncmp(KNOB_JIT_CACHE_DIR.c_str(), "~/", 2) == 0) {
char *homedir;
if (!(homedir = getenv("HOME"))) {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): anv: Check if memfd_create is already defined.
Module: Mesa
Branch: master
Commit: 8c1e4b1afc8d396ccf99c725c59b29a9aa305557
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c1e4b1afc8d396ccf99c725c59b29a9aa305557
Author: Vinson Lee
Date: Tue Nov 28 23:16:58 2017 -0800
anv: Check if memfd_create is already defined.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103909
Signed-off-by: Vinson Lee
Reviewed-by: Eric Engestrom
---
configure.ac | 1 +
meson.build | 2 +-
src/intel/vulkan/anv_allocator.c | 2 ++
src/intel/vulkan/anv_gem_stubs.c | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 1344c12884..f378e54b85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -849,6 +849,7 @@ AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES
-DHAVE_SYS_SYSCTL_H"])
AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
AC_CHECK_FUNC([timespec_get], [DEFINES="$DEFINES -DHAVE_TIMESPEC_GET"])
+AC_CHECK_FUNC([memfd_create], [DEFINES="$DEFINES -DHAVE_MEMFD_CREATE"])
AC_MSG_CHECKING([whether strtod has locale support])
AC_LINK_IFELSE([AC_LANG_SOURCE([[
diff --git a/meson.build b/meson.build
index e2ba3cb052..4a2e817f0f 100644
--- a/meson.build
+++ b/meson.build
@@ -617,7 +617,7 @@ foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h']
endif
endforeach
-foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get']
+foreach f : ['strtof', 'mkostemp', 'posix_memalign', 'timespec_get',
'memfd_create']
if cc.has_function(f)
pre_args += '-DHAVE_@0@'.format(f.to_upper())
endif
diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c
index 8ed32b3c67..33bd3c68c5 100644
--- a/src/intel/vulkan/anv_allocator.c
+++ b/src/intel/vulkan/anv_allocator.c
@@ -109,11 +109,13 @@ struct anv_mmap_cleanup {
#define ANV_MMAP_CLEANUP_INIT ((struct anv_mmap_cleanup){0})
+#ifndef HAVE_MEMFD_CREATE
static inline int
memfd_create(const char *name, unsigned int flags)
{
return syscall(SYS_memfd_create, name, flags);
}
+#endif
static inline uint32_t
ilog2_round_up(uint32_t value)
diff --git a/src/intel/vulkan/anv_gem_stubs.c b/src/intel/vulkan/anv_gem_stubs.c
index 02527b5fcd..26eb5c8a61 100644
--- a/src/intel/vulkan/anv_gem_stubs.c
+++ b/src/intel/vulkan/anv_gem_stubs.c
@@ -27,11 +27,13 @@
#include "anv_private.h"
+#ifndef HAVE_MEMFD_CREATE
static inline int
memfd_create(const char *name, unsigned int flags)
{
return syscall(SYS_memfd_create, name, flags);
}
+#endif
uint32_t
anv_gem_create(struct anv_device *device, uint64_t size)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mapi: Use correct shared libraries suffix on macOS.
Module: Mesa
Branch: master
Commit: cd58b98b03f1c7c044b7a39172d6b258c880ff3c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd58b98b03f1c7c044b7a39172d6b258c880ff3c
Author: Vinson Lee
Date: Tue Nov 14 17:16:32 2017 -0800
mapi: Use correct shared libraries suffix on macOS.
Signed-off-by: Vinson Lee
Reviewed-by: Dylan Baker
Reviewed-by: Eric Engestrom
---
src/mapi/es1api/ABI-check | 7 ++-
src/mapi/es2api/ABI-check | 7 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check
index bd9d0288d6..0a867343c7 100755
--- a/src/mapi/es1api/ABI-check
+++ b/src/mapi/es1api/ABI-check
@@ -9,7 +9,12 @@ set -eu
# or in extensions that are part of the ES 1.1 extension pack.
# (see
http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf)
-LIB=${1-es1api/.libs/libGLESv1_CM.so.1}
+if [ $(uname) == "Darwin" ]
+then
+ LIB=${1-es1api/.libs/libGLESv1_CM.dylib}
+else
+ LIB=${1-es1api/.libs/libGLESv1_CM.so.1}
+fi
if ! [ -f "$LIB" ]
then
diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
index 179bea132e..716e6679a4 100755
--- a/src/mapi/es2api/ABI-check
+++ b/src/mapi/es2api/ABI-check
@@ -6,7 +6,12 @@ set -eu
# GL_EXT_multi_draw_arrays
# GL_OES_EGL_image
-LIB=${1-es2api/.libs/libGLESv2.so.2}
+if [ $(uname) == "Darwin" ]
+then
+ LIB=${1-es2api/.libs/libGLESv2.dylib}
+else
+ LIB=${1-es2api/.libs/libGLESv2.so.2}
+fi
if ! [ -f "$LIB" ]
then
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): m4: Use older autoconf 2.63 compatible ax_check_compile_flag.
Module: Mesa
Branch: master
Commit: 39a69f0692722e05a221b1db4cfd8100f2f20684
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=39a69f0692722e05a221b1db4cfd8100f2f20684
Author: Vinson Lee
Date: Thu Aug 31 15:38:57 2017 -0700
m4: Use older autoconf 2.63 compatible ax_check_compile_flag.
CentOS 6 and RHEL 6 have autoconf 2.63.
Fixes: e4b2b69e828c ("configure: Add and use AX_CHECK_COMPILE_FLAG")
Signed-off-by: Vinson Lee
Reviewed-by: Matt Turner
---
m4/ax_check_compile_flag.m4 | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
index dcabb92a14..51df0c09a7 100644
--- a/m4/ax_check_compile_flag.m4
+++ b/m4/ax_check_compile_flag.m4
@@ -1,5 +1,5 @@
# ===
-# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
# ===
#
# SYNOPSIS
@@ -40,7 +40,7 @@
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>.
+# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
@@ -55,10 +55,10 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 5
+#serial 3
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
@@ -67,7 +67,7 @@ AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1],
CACHEVAR, [
[AS_VAR_SET(CACHEVAR,[yes])],
[AS_VAR_SET(CACHEVAR,[no])])
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
[m4_default([$2], :)],
[m4_default([$3], :)])
AS_VAR_POPDEF([CACHEVAR])dnl
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure.ac: Check for expat21 if expat is not found.
Module: Mesa
Branch: master
Commit: a0ed82947c83a64ff8b85bca638e137e5466bd98
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0ed82947c83a64ff8b85bca638e137e5466bd98
Author: Vinson Lee
Date: Sat Aug 5 13:31:50 2017 -0700
configure.ac: Check for expat21 if expat is not found.
Fixes build error on CentOS 6.9.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102052
Fixes: 5c007203b73d ("configure.ac: drop manual detection of expat
header/library")
Signed-off-by: Vinson Lee
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 52645bb44f..53d52f6d52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1814,7 +1814,9 @@ if test "x$with_dri_drivers" = xno; then
fi
# Check for expat
-PKG_CHECK_MODULES([EXPAT], [expat])
+PKG_CHECK_MODULES([EXPAT], [expat],,
+[PKG_CHECK_MODULES([EXPAT], [expat21])]
+)
dnl If $with_dri_drivers is yes, drivers will be added through
dnl platform checks. Set DEFINES and LIB_DEPS
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Check for xlocale.h before defining HAVE_XLOCALE_H.
Module: Mesa
Branch: master
Commit: c5d0dc7fa5566941a49ede8c83a0cfe0a33a3d7f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5d0dc7fa5566941a49ede8c83a0cfe0a33a3d7f
Author: Vinson Lee
Date: Wed Jul 5 14:16:11 2017 -0700
scons: Check for xlocale.h before defining HAVE_XLOCALE_H.
Don't assume the header is present on some platforms - use the more
robust CheckHeader() instead.
glibc 2.26 removed xlocale.h.
https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
Fix this build error with glibc 2.26.
Compiling src/util/strtod.c ...
src/util/strtod.c:32:10: fatal error: xlocale.h: No such file or directory
#include
^~~
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101657
Signed-off-by: Vinson Lee
Cc: mesa-sta...@lists.freedesktop.org
Reviewed-by: Emil Velikov
Reviewed-by: Eric Engestrom
Tested-by: Eric Engestrom
---
scons/gallium.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index a411277324..61643a6d4f 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -325,8 +325,10 @@ def generate(env):
'GLX_INDIRECT_RENDERING',
]
-if env['platform'] in ('linux', 'darwin'):
+conf = SCons.Script.Configure(env)
+if conf.CheckHeader('xlocale.h'):
cppdefines += ['HAVE_XLOCALE_H']
+env = conf.Finish()
if platform == 'windows':
cppdefines += [
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: Avoid set comprehension.
Module: Mesa
Branch: master
Commit: 95731b7ccc605bbfe2c3cb3d533219bc0788cbaa
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=95731b7ccc605bbfe2c3cb3d533219bc0788cbaa
Author: Vinson Lee
Date: Wed Jun 28 23:13:26 2017 -0700
mesa: Avoid set comprehension.
Fix build error on CentOS 6.9 with Python 2.6.
GENmain/format_fallback.c
File "./main/format_fallback.py", line 42
names = {fmt.name for fmt in formats}
^
SyntaxError: invalid syntax
Fixes: a1983223d883 ("mesa: Add _mesa_format_fallback_rgbx_to_rgba() [v2]")
Signed-off-by: Vinson Lee
Reviewed-by: Dylan Baker
---
src/mesa/main/format_fallback.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/main/format_fallback.py b/src/mesa/main/format_fallback.py
index e3b9916f6e..7782e493d1 100644
--- a/src/mesa/main/format_fallback.py
+++ b/src/mesa/main/format_fallback.py
@@ -39,7 +39,7 @@ def parse_args():
return p.parse_args()
def get_rgbx_to_rgba_map(formats):
-names = {fmt.name for fmt in formats}
+names = set(fmt.name for fmt in formats)
for fmt in formats:
if not fmt.has_channel('r') or not fmt.has_channel('x'):
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i915g: Add blitter_context argument.
Module: Mesa
Branch: master
Commit: 142536a0e32455a485d979d11188fd861882f437
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=142536a0e32455a485d979d11188fd861882f437
Author: Vinson Lee
Date: Thu Jun 8 00:15:59 2017 -0700
i915g: Add blitter_context argument.
Fix build error.
CC i915_surface.lo
i915_surface.c:108:63: error: too few arguments to function call, expected 4,
have 3
util_blitter_default_src_texture(&src_templ, src, src_level);
^
../../../../src/gallium/auxiliary/util/u_blitter.h:271:1: note:
'util_blitter_default_src_texture' declared here
void util_blitter_default_src_texture(struct blitter_context *blitter,
^
Fixes: a893c9169733 ("gallium/u_blitter: use 2D_ARRAY for cubemap blits if
possible")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101340
Signed-off-by: Vinson Lee
Reviewed-by: Nicolai Hähnle
Reviewed-by: Juan A. Suarez Romero
Reviewed-by: Marek Olšák
---
src/gallium/drivers/i915/i915_surface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/i915/i915_surface.c
b/src/gallium/drivers/i915/i915_surface.c
index 27b0d9eae8..57e90c6ed2 100644
--- a/src/gallium/drivers/i915/i915_surface.c
+++ b/src/gallium/drivers/i915/i915_surface.c
@@ -105,7 +105,7 @@ i915_surface_copy_render(struct pipe_context *pipe,
goto fallback;
util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
- util_blitter_default_src_texture(&src_templ, src, src_level);
+ util_blitter_default_src_texture(i915->blitter, &src_templ, src, src_level);
if (!util_blitter_is_copy_supported(i915->blitter, dst, src))
goto fallback;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure.ac: Fix typos.
Module: Mesa Branch: master Commit: b81d85f1754928139f9f01474495e024946aa1b4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b81d85f1754928139f9f01474495e024946aa1b4 Author: Vinson Lee Date: Thu Apr 20 14:48:50 2017 -0700 configure.ac: Fix typos. Signed-off-by: Vinson Lee Reviewed-by: Alejandro Piñeiro Reviewed-by: Emil Velikov Cc: --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 957d15df8c..e42fcfff77 100644 --- a/configure.ac +++ b/configure.ac @@ -724,7 +724,7 @@ dnl Arch/platform-specific settings dnl AC_ARG_ENABLE([asm], [AS_HELP_STRING([--disable-asm], -[disable assembly usage @<:@default=enabled on supported plaforms@:>@])], +[disable assembly usage @<:@default=enabled on supported platforms@:>@])], [enable_asm="$enableval"], [enable_asm=yes] ) @@ -2146,7 +2146,7 @@ dnl DEPRECATED: EGL Platforms configuration dnl AC_ARG_WITH([egl-platforms], [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@], -[DEPRECATED: use --with-plaforms instead@<:@default=auto@:>@])], +[DEPRECATED: use --with-platforms instead@<:@default=auto@:>@])], [with_egl_platforms="$withval"], [with_egl_platforms=auto]) @@ -2161,7 +2161,7 @@ if test "x$with_egl_platforms" = xauto; then with_egl_platforms="" fi else -AC_MSG_WARN([--with-egl-platforms is deprecated. Use --with-plaforms instead.]) +AC_MSG_WARN([--with-egl-platforms is deprecated. Use --with-platforms instead.]) fi dnl ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/mesa: Fix missing-braces warning.
Module: Mesa
Branch: master
Commit: f30f575e7b4bdb39012709ba2dd3104a97a53ffc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f30f575e7b4bdb39012709ba2dd3104a97a53ffc
Author: Vinson Lee
Date: Wed Mar 22 16:21:41 2017 -0700
st/mesa: Fix missing-braces warning.
CXX state_tracker/st_glsl_to_nir.lo
state_tracker/st_glsl_to_nir.cpp:250:57: warning: suggest braces around
initialization of subobject [-Wmissing-braces]
nir_lower_wpos_ytransform_options wpos_options = {0};
^
{}
Signed-off-by: Vinson Lee
Reviewed-by: Samuel Pitoiset
---
src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp
b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 72fd70b215..1d850ef899 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -248,7 +248,7 @@ st_glsl_to_nir(struct st_context *st, struct gl_program
*prog,
static const gl_state_index wposTransformState[STATE_LENGTH] = {
STATE_INTERNAL, STATE_FB_WPOS_Y_TRANSFORM
};
- nir_lower_wpos_ytransform_options wpos_options = {0};
+ nir_lower_wpos_ytransform_options wpos_options = { { 0 } };
struct pipe_screen *pscreen = st->pipe->screen;
memcpy(wpos_options.state_tokens, wposTransformState,
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): libgl-xlib: Link with libunwind.
Module: Mesa
Branch: master
Commit: c161a104629ad49dc6a4f7d1fe82e87fc08121fe
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c161a104629ad49dc6a4f7d1fe82e87fc08121fe
Author: Vinson Lee
Date: Tue Apr 4 14:52:39 2017 -0700
libgl-xlib: Link with libunwind.
Fix linking error.
CXXLDlibGL.la
../../../../src/gallium/auxiliary/.libs/libgallium.a(u_debug_stack.o): In
function `debug_backtrace_capture':
src/gallium/auxiliary/util/u_debug_stack.c:59: undefined reference to
`_Ux86_64_getcontext'
src/gallium/auxiliary/util/u_debug_stack.c:60: undefined reference to
`_ULx86_64_init_local'
src/gallium/auxiliary/util/u_debug_stack.c:62: undefined reference to
`_ULx86_64_step'
src/gallium/auxiliary/util/u_debug_stack.c:71: undefined reference to
`_ULx86_64_get_proc_info'
src/gallium/auxiliary/util/u_debug_stack.c:73: undefined reference to
`_ULx86_64_get_proc_name'
src/gallium/auxiliary/util/u_debug_stack.c:65: undefined reference to
`_ULx86_64_step'
Fixes: 70c272004f72 ("gallium/util: libunwind support")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100562
Signed-off-by: Vinson Lee
Reviewed-by: Rob Clark
---
src/gallium/targets/libgl-xlib/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am
b/src/gallium/targets/libgl-xlib/Makefile.am
index 6f966c3aeb..d2fd2ed7b6 100644
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -73,7 +73,8 @@ lib@GL_LIB@_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(SHARED_GLAPI_LIB) \
$(GL_LIB_DEPS) \
- $(CLOCK_LIB)
+ $(CLOCK_LIB) \
+ $(LIBUNWIND_LIBS)
if HAVE_GALLIUM_LLVM
lib@GL_LIB@_la_LIBADD +=
$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa/tests: Link main-test with CLOCK_LIB.
Module: Mesa Branch: master Commit: f1f1cb41d0a80230085e63e8de65aa58ff3872da URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1f1cb41d0a80230085e63e8de65aa58ff3872da Author: Vinson Lee Date: Mon Mar 27 11:57:48 2017 -0700 mesa/tests: Link main-test with CLOCK_LIB. Fix 'make check' linking error with glibc < 2.17. CXXLD main-test ../../../../src/mesa/.libs/libmesa.a(libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': src/util/../../src/util/u_thread.h:84: undefined reference to `clock_gettime' Signed-off-by: Vinson Lee --- src/mesa/main/tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am index 18f750e4d4..8b4598d924 100644 --- a/src/mesa/main/tests/Makefile.am +++ b/src/mesa/main/tests/Makefile.am @@ -19,7 +19,8 @@ main_test_LDADD = \ $(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/gtest/libgtest.la \ $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) + $(DLOPEN_LIBS) \ + $(CLOCK_LIB) if HAVE_SHARED_GLAPI AM_CPPFLAGS += -DHAVE_SHARED_GLAPI ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: Link tests with CLOCK_LIB.
Module: Mesa Branch: master Commit: 641f629536c2daf6112fe9d5b904c012bb07b912 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=641f629536c2daf6112fe9d5b904c012bb07b912 Author: Vinson Lee Date: Wed Mar 22 15:23:17 2017 -0700 glsl: Link tests with CLOCK_LIB. Fix 'make check' linking errors with glibc < 2.17. CXXLD glsl/glsl_test glsl/.libs/libglsl.a(libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': src/util/../../src/util/u_thread.h:84: undefined reference to `clock_gettime' Signed-off-by: Vinson Lee --- src/compiler/Makefile.glsl.am | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index 761fb931ad..43fd6a98e2 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -66,7 +66,8 @@ glsl_tests_cache_test_CFLAGS = \ $(PTHREAD_CFLAGS) glsl_tests_cache_test_LDADD = \ glsl/libglsl.la \ - $(PTHREAD_LIBS) + $(PTHREAD_LIBS) \ + $(CLOCK_LIB) glsl_tests_general_ir_test_SOURCES = \ glsl/tests/array_refcount_test.cpp \ @@ -83,7 +84,8 @@ glsl_tests_general_ir_test_LDADD =\ glsl/libglsl.la \ glsl/libstandalone.la \ $(top_builddir)/src/libglsl_util.la \ - $(PTHREAD_LIBS) + $(PTHREAD_LIBS) \ + $(CLOCK_LIB) glsl_tests_uniform_initializer_test_SOURCES = \ glsl/tests/copy_constant_to_storage_tests.cpp \ @@ -159,7 +161,8 @@ glsl_glsl_test_LDADD = \ glsl/libglsl.la \ glsl/libstandalone.la \ $(top_builddir)/src/libglsl_util.la \ - $(PTHREAD_LIBS) + $(PTHREAD_LIBS) \ + $(CLOCK_LIB) # 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: ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: Link glsl_compiler with CLOCK_LIB.
Module: Mesa Branch: master Commit: bb32ea4fc6e29986592af50161abc2c2df4ff755 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb32ea4fc6e29986592af50161abc2c2df4ff755 Author: Vinson Lee Date: Tue Mar 21 16:24:29 2017 -0700 glsl: Link glsl_compiler with CLOCK_LIB. Fix linking error on CentOS 6. CXXLD glsl_compiler glsl/.libs/libstandalone.a(lt16-libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': src/util/../../src/util/u_thread.h:84: undefined reference to `clock_gettime' Signed-off-by: Vinson Lee Reviewed-by: Emil Velikov --- src/compiler/Makefile.glsl.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index f7be5ebce9..761fb931ad 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -147,7 +147,8 @@ glsl_compiler_SOURCES = \ glsl/main.cpp glsl_compiler_LDADD = \ - glsl/libstandalone.la + glsl/libstandalone.la \ + $(CLOCK_LIB) glsl_glsl_test_SOURCES = \ glsl/test.cpp \ ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure.ac: Do not strip away space after regex word match.
Module: Mesa
Branch: master
Commit: bd6f0dcafce73b1c7332a1c51f6862470fe2c2a0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd6f0dcafce73b1c7332a1c51f6862470fe2c2a0
Author: Vinson Lee
Date: Wed Mar 22 00:27:15 2017 -0700
configure.ac: Do not strip away space after regex word match.
Fixes: 62c48ccb413b ("configure.ac: Use POSIX compatible regex for word
boundary.")
Signed-off-by: Vinson Lee
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index dbf0bf8318..ab9a91ed17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -909,9 +909,9 @@ llvm_add_target() {
strip_unwanted_llvm_flags() {
echo " `$1` " | sed -E \
-e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
--e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]//g' \
--e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]//g' \
--e 's/[[[:space:]]]+-pedantic[[[:space:]]]//g' \
+-e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]/ /g' \
+-e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]/ /g' \
+-e 's/[[[:space:]]]+-pedantic[[[:space:]]]/ /g' \
-e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
-e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
-e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure.ac: Use POSIX compatible regex for word boundary.
Module: Mesa
Branch: master
Commit: 62c48ccb413bbb0d3d305966514b7783640eaf89
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=62c48ccb413bbb0d3d305966514b7783640eaf89
Author: Vinson Lee
Date: Thu Mar 16 15:26:18 2017 -0700
configure.ac: Use POSIX compatible regex for word boundary.
Fixes build error on Mac OS X.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100236
Suggested-by: Jan Beich
Suggested-by: Michel Dänzer
Signed-off-by: Vinson Lee
Reviewed-by: Eric Engestrom
Acked-by: Emil Velikov
---
configure.ac | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8c9d756f29..dbf0bf8318 100644
--- a/configure.ac
+++ b/configure.ac
@@ -907,19 +907,19 @@ llvm_add_target() {
# Call this inside ` ` to get the return value.
# $1 is the llvm-config command with arguments.
strip_unwanted_llvm_flags() {
-# Use \> (marks the end of the word)
-echo " `$1`" | sed -E \
+echo " `$1` " | sed -E \
-e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
--e 's/[[[:space:]]]+-DNDEBUG\>//g' \
--e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
--e 's/[[[:space:]]]+-pedantic\>//g' \
+-e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]//g' \
+-e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]//g' \
+-e 's/[[[:space:]]]+-pedantic[[[:space:]]]//g' \
-e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
-e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
-e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
--e 's/-fno-rtti\>/-Fno-rtti/g' \
+-e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \
-e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
--e 's/-Fno-rtti\>/-fno-rtti/g' \
--e 's/^[[[:space:]]]//'
+-e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \
+-e 's/^[[[:space:]]]//' \
+-e 's/[[[:space:]]]$//'
}
llvm_set_environment_variables() {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nir: Add positional argument specifiers.
Module: Mesa
Branch: master
Commit: 1fa432741c45cf9cdbdd416cd0f7b424f2ffc7a5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fa432741c45cf9cdbdd416cd0f7b424f2ffc7a5
Author: Vinson Lee
Date: Fri Mar 17 16:21:38 2017 -0700
nir: Add positional argument specifiers.
Fix build with Python < 2.7.
File "src/compiler/nir/nir_builder_opcodes_h.py", line 46, in
from nir_opcodes import opcodes
File "src/compiler/nir/nir_opcodes.py", line 178, in
unop_convert("{}2{}{}".format(src_t[0], dst_t[0], bit_size),
ValueError: zero length field name in format
Fixes: 762a6333f21f ("nir: Rework conversion opcodes")
Signed-off-by: Vinson Lee
---
src/compiler/nir/nir_opcodes.py | 2 +-
src/compiler/nir/nir_opcodes_c.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/compiler/nir/nir_opcodes.py b/src/compiler/nir/nir_opcodes.py
index 52868d5f5a..98692da7be 100644
--- a/src/compiler/nir/nir_opcodes.py
+++ b/src/compiler/nir/nir_opcodes.py
@@ -175,7 +175,7 @@ for src_t in [tint, tuint, tfloat]:
for dst_t in dst_types:
for bit_size in [32, 64]:
- unop_convert("{}2{}{}".format(src_t[0], dst_t[0], bit_size),
+ unop_convert("{0}2{1}{2}".format(src_t[0], dst_t[0], bit_size),
dst_t + str(bit_size), src_t, "src0")
# We'll hand-code the to/from bool conversion opcodes. Because bool doesn't
diff --git a/src/compiler/nir/nir_opcodes_c.py
b/src/compiler/nir/nir_opcodes_c.py
index c66f3bc7ad..a1db54f05a 100644
--- a/src/compiler/nir/nir_opcodes_c.py
+++ b/src/compiler/nir/nir_opcodes_c.py
@@ -64,7 +64,7 @@ nir_type_conversion_op(nir_alu_type src, nir_alu_type dst)
switch (dst_bit_size) {
% for dst_bits in [32, 64]:
case ${dst_bits}:
- return ${'nir_op_{}2{}{}'.format(src_t[0], dst_t[0],
dst_bits)};
+ return ${'nir_op_{0}2{1}{2}'.format(src_t[0], dst_t[0],
dst_bits)};
% endfor
default:
unreachable("Invalid nir alu bit size");
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): swr: s/uint/enum pipe_render_cond_flag/
Module: Mesa
Branch: master
Commit: d64ded7b50d6614b88841383c37fab67d7596c4c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d64ded7b50d6614b88841383c37fab67d7596c4c
Author: Vinson Lee
Date: Wed Mar 8 14:56:04 2017 -0800
swr: s/uint/enum pipe_render_cond_flag/
Fix build error.
swr_context.cpp: In function ‘void swr_blit(pipe_context*, const
pipe_blit_info*)’:
swr_context.cpp:336:44: error: invalid conversion from ‘uint {aka unsigned
int}’ to ‘pipe_render_cond_flag’ [-fpermissive]
ctx->render_cond_mode);
~^~~~
Fixes: b0d39384307d ("gallium: s/uint/enum pipe_render_cond_flag/ for
set_render_condition()")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100133
Signed-off-by: Vinson Lee
Reviewed-by: Roland Scheidegger
---
src/gallium/drivers/swr/swr_context.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/swr/swr_context.h
b/src/gallium/drivers/swr/swr_context.h
index 46ca611..be65a20 100644
--- a/src/gallium/drivers/swr/swr_context.h
+++ b/src/gallium/drivers/swr/swr_context.h
@@ -141,7 +141,7 @@ struct swr_context {
/** Conditional query object and mode */
struct pipe_query *render_cond_query;
- uint render_cond_mode;
+ enum pipe_render_cond_flag render_cond_mode;
boolean render_cond_cond;
unsigned active_queries;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): util/disk_cache: Use backward compatible st_mtime.
Module: Mesa
Branch: master
Commit: 30a4b25efe005c922f048beaf62852714d2462a1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=30a4b25efe005c922f048beaf62852714d2462a1
Author: Vinson Lee
Date: Thu Feb 23 13:48:34 2017 -0800
util/disk_cache: Use backward compatible st_mtime.
Fix Mac OS X build error.
CC libmesautil_la-disk_cache.lo
In file included from disk_cache.c:46:
./disk_cache.h:57:20: error: no member named 'st_mtim' in 'struct stat'
*timestamp = st.st_mtim.tv_sec;
~~ ^
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99918
Fixes: 207e3a6e4b ("util/radv: move *_get_function_timestamp() to utils")
Signed-off-by: Vinson Lee
Reviewed-by: Timothy Arceri
Reviewed-by: Nicolai Hähnle
---
src/util/disk_cache.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h
index 7f4da80..b7c0df2 100644
--- a/src/util/disk_cache.h
+++ b/src/util/disk_cache.h
@@ -54,7 +54,7 @@ disk_cache_get_function_timestamp(void *ptr, uint32_t*
timestamp)
if (stat(info.dli_fname, &st)) {
return false;
}
- *timestamp = st.st_mtim.tv_sec;
+ *timestamp = st.st_mtime;
return true;
#else
return false;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: Fix missing-braces warning.
Module: Mesa
Branch: master
Commit: c3f9540a0cee99b0fcaf1f17d485e669c1e293e0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3f9540a0cee99b0fcaf1f17d485e669c1e293e0
Author: Vinson Lee
Date: Mon Feb 13 17:52:59 2017 -0800
glsl: Fix missing-braces warning.
CXXglsl/ast_to_hir.lo
glsl/ast_to_hir.cpp: In member function 'virtual ir_rvalue*
ast_declarator_list::hir(exec_list*, _mesa_glsl_parse_state*)':
glsl/ast_to_hir.cpp:4846:42: warning: missing braces around initializer for
'unsigned int [16]' [-Wmissing-braces]
Signed-off-by: Vinson Lee
Reviewed-by: Andres Gomez
---
src/compiler/glsl/ast_to_hir.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 88febe7..db48cf8 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -4849,7 +4849,7 @@ ast_declarator_list::hir(exec_list *instructions,
if ((var->data.mode == ir_var_auto || var->data.mode == ir_var_temporary)
&& (var->type->is_numeric() || var->type->is_boolean())
&& state->zero_init) {
- const ir_constant_data data = {0};
+ const ir_constant_data data = { { 0 } };
var->data.has_initializer = true;
var->constant_initializer = new(var) ir_constant(var->type, &data);
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nir: Fix anonymous union initialization with older GCC.
Module: Mesa
Branch: master
Commit: 01d80bed1f639ed98f09107206ebe36899d3c852
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=01d80bed1f639ed98f09107206ebe36899d3c852
Author: Vinson Lee
Date: Sun Jan 8 09:02:38 2017 -0800
nir: Fix anonymous union initialization with older GCC.
Fix this build error with GCC 4.4.7.
CC nir/nir_opt_copy_prop_vars.lo
nir/nir_opt_copy_prop_vars.c: In function ‘copy_prop_vars_block’:
nir/nir_opt_copy_prop_vars.c:765: error: unknown field ‘deref’ specified in
initializer
nir/nir_opt_copy_prop_vars.c:765: warning: missing braces around initializer
nir/nir_opt_copy_prop_vars.c:765: warning: (near initialization for
‘(anonymous).’)
nir/nir_opt_copy_prop_vars.c:765: warning: initialization from incompatible
pointer type
Fixes: 62332d139c8f ("nir: Add a local variable-based copy propagation pass")
Signed-off-by: Vinson Lee
Acked-by: Jason Ekstrand
---
src/compiler/nir/nir_opt_copy_prop_vars.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c
b/src/compiler/nir/nir_opt_copy_prop_vars.c
index 8c24cd7..7f17469 100644
--- a/src/compiler/nir/nir_opt_copy_prop_vars.c
+++ b/src/compiler/nir/nir_opt_copy_prop_vars.c
@@ -762,7 +762,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
} else {
value = (struct value) {
.is_ssa = false,
- .deref = src,
+ { .deref = src },
};
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): llvmpipe: Link tests with CLOCK_LIB.
Module: Mesa Branch: master Commit: ede8c02ab0f9c2bd7bb42d2398103674cb505f6c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ede8c02ab0f9c2bd7bb42d2398103674cb505f6c Author: Vinson Lee Date: Fri Dec 2 17:44:34 2016 -0800 llvmpipe: Link tests with CLOCK_LIB. Fix linking error with 'make check'. CXXLD lp_test_format ../../../../src/gallium/auxiliary/.libs/libgallium.a(os_time.o): In function `os_time_get_nano': src/gallium/auxiliary/os/os_time.c:59: undefined reference to `clock_gettime' Signed-off-by: Vinson Lee --- src/gallium/drivers/llvmpipe/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am index 85ae0ae..562c2d6 100644 --- a/src/gallium/drivers/llvmpipe/Makefile.am +++ b/src/gallium/drivers/llvmpipe/Makefile.am @@ -54,7 +54,8 @@ TEST_LIBS = \ $(top_builddir)/src/util/libmesautil.la \ $(LLVM_LIBS) \ $(DLOPEN_LIBS) \ - $(PTHREAD_LIBS) + $(PTHREAD_LIBS) \ + $(CLOCK_LIB) lp_test_format_SOURCES = lp_test_format.c lp_test_main.c lp_test_format_LDADD = $(TEST_LIBS) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Recognize LLVM_CONFIG environment variable.
Module: Mesa
Branch: master
Commit: f07da5aa5e2e6021f02104235429b670f6b468ec
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f07da5aa5e2e6021f02104235429b670f6b468ec
Author: Vinson Lee
Date: Tue Nov 22 17:01:35 2016 -0800
scons: Recognize LLVM_CONFIG environment variable.
Signed-off-by: Vinson Lee
Reviewed-by: Emil Velikov
Reviewed-by: Jose Fonseca
---
common.py | 2 +-
scons/llvm.py | 17 +
src/gallium/drivers/swr/SConscript | 3 ++-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/common.py b/common.py
index 704ad2e..24a7e8a 100644
--- a/common.py
+++ b/common.py
@@ -59,7 +59,7 @@ if target_platform == 'windows' and host_platform !=
'windows':
# find default_llvm value
-if 'LLVM' in os.environ:
+if 'LLVM' in os.environ or 'LLVM_CONFIG' in os.environ:
default_llvm = 'yes'
else:
default_llvm = 'no'
diff --git a/scons/llvm.py b/scons/llvm.py
index 977e47a..2d0f05b 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -194,11 +194,12 @@ def generate(env):
# that.
env.Append(LINKFLAGS = ['/nodefaultlib:LIBCMT'])
else:
-if not env.Detect('llvm-config'):
-print 'scons: llvm-config script not found'
+llvm_config = os.environ.get('LLVM_CONFIG', 'llvm-config')
+if not env.Detect(llvm_config):
+print 'scons: %s script not found' % llvm_config
return
-llvm_version = env.backtick('llvm-config --version').rstrip()
+llvm_version = env.backtick('%s --version' % llvm_config).rstrip()
llvm_version = distutils.version.LooseVersion(llvm_version)
if llvm_version <
distutils.version.LooseVersion(required_llvm_version):
@@ -208,7 +209,7 @@ def generate(env):
try:
# Treat --cppflags specially to prevent NDEBUG from disabling
# assertion failures in debug builds.
-cppflags = env.ParseFlags('!llvm-config --cppflags')
+cppflags = env.ParseFlags('!%s --cppflags' % llvm_config)
try:
cppflags['CPPDEFINES'].remove('NDEBUG')
except ValueError:
@@ -216,16 +217,16 @@ def generate(env):
env.MergeFlags(cppflags)
# Match llvm --fno-rtti flag
-cxxflags = env.backtick('llvm-config --cxxflags').split()
+cxxflags = env.backtick('%s --cxxflags' % llvm_config).split()
if '-fno-rtti' in cxxflags:
env.Append(CXXFLAGS = ['-fno-rtti'])
components = ['engine', 'mcjit', 'bitwriter', 'x86asmprinter',
'mcdisassembler', 'irreader']
-env.ParseConfig('llvm-config --libs ' + ' '.join(components))
-env.ParseConfig('llvm-config --ldflags')
+env.ParseConfig('%s --libs ' % llvm_config + ' '.join(components))
+env.ParseConfig('%s --ldflags' % llvm_config)
if llvm_version >= distutils.version.LooseVersion('3.5'):
-env.ParseConfig('llvm-config --system-libs')
+env.ParseConfig('%s --system-libs' % llvm_config)
env.Append(CXXFLAGS = ['-std=c++11'])
except OSError:
print 'scons: llvm-config version %s failed' % llvm_version
diff --git a/src/gallium/drivers/swr/SConscript
b/src/gallium/drivers/swr/SConscript
index 0de51a7..3f0517b 100644
--- a/src/gallium/drivers/swr/SConscript
+++ b/src/gallium/drivers/swr/SConscript
@@ -31,7 +31,8 @@ if env['platform'] == 'windows':
# on windows there is no llvm-config, so LLVM is defined
llvm_includedir = os.path.join(os.environ['LLVM'], 'include')
else:
-llvm_includedir = env.backtick('llvm-config --includedir').rstrip()
+llvm_config = os.environ.get('LLVM_CONFIG', 'llvm-config')
+llvm_includedir = env.backtick('%s --includedir' % llvm_config).rstrip()
print "llvm include dir %s" % llvm_includedir
# the loader is included in the mesa lib itself
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): util: Fix Clang trivial destructor check.
Module: Mesa
Branch: master
Commit: ed6694d5114e81cf1c413aec8265ddc8a5c52599
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed6694d5114e81cf1c413aec8265ddc8a5c52599
Author: Vinson Lee
Date: Sun Nov 13 22:53:54 2016 -0800
util: Fix Clang trivial destructor check.
Check for Clang before GCC.
Clang defines __GNUC__ == 4 and __GNUC_MINOR__ == 2 and matches the GCC
check but not the GCC version for trivial destructor.
Fixes: 98ab905af0e0 ("mesa: Define introspection macro to determine
whether a type is trivially destructible.")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98526
Signed-off-by: Vinson Lee
Reviewed-by: Marek Olšák
Reviewed-by: Edward O'Callaghan
Reviewed-by: Francisco Jerez
---
src/util/macros.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/util/macros.h b/src/util/macros.h
index 0563fa5..733bf42 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -167,12 +167,12 @@ do { \
* performs no action and all member variables and base classes are
* trivially destructible themselves.
*/
-# if defined(__GNUC__)
-# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+# if (defined(__clang__) && defined(__has_feature))
+# if __has_feature(has_trivial_destructor)
# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
# endif
-# elif (defined(__clang__) && defined(__has_feature))
-# if __has_feature(has_trivial_destructor)
+# elif defined(__GNUC__)
+# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T)
# endif
# elif defined(_MSC_VER) && !defined(__INTEL_COMPILER)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Require libdrm >= 2.4.66 for DRM.
Module: Mesa
Branch: master
Commit: f2770fb3d5e7a4a456f8f14726f72a1e37496419
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2770fb3d5e7a4a456f8f14726f72a1e37496419
Author: Vinson Lee
Date: Mon Oct 24 16:33:01 2016 -0700
scons: Require libdrm >= 2.4.66 for DRM.
configure.ac already requires 2.4.66.
Fix SCons build. drmDevicePtr is not available until libdrm 2.4.65.
Compiling src/loader/loader.c ...
src/loader/loader.c:111:40: error: unknown type name ‘drmDevicePtr’
static char *drm_construct_id_path_tag(drmDevicePtr device)
^
Fixes: 4a183f4d06f8 ("scons: loader: use libdrm when available")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98421
Signed-off-by: Vinson Lee
Reviewed-by: Emil Velikov
Reviewed-by: Vedran Miletić
---
scons/gallium.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index 9f7555c..dc7fdce 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -651,7 +651,7 @@ def generate(env):
env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes', 'glproto
>= 1.4.13'])
env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx >= 1.8.1', 'xcb-dri2 >=
1.8'])
env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
-env.PkgCheckModules('DRM', ['libdrm >= 2.4.38'])
+env.PkgCheckModules('DRM', ['libdrm >= 2.4.66'])
if env['x11']:
env.Append(CPPPATH = env['X11_CPPPATH'])
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): util: Include string.h in bitscan.h.
Module: Mesa Branch: master Commit: 889ee4da05400687a6c5296a7632dc26f1d61924 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=889ee4da05400687a6c5296a7632dc26f1d61924 Author: Vinson Lee Date: Wed Oct 19 18:03:12 2016 -0700 util: Include string.h in bitscan.h. Fix build error with clang. Compiling src/compiler/glsl/link_varyings.cpp ... In file included from src/compiler/glsl/link_varyings.cpp:33: In file included from src/compiler/glsl/glsl_symbol_table.h:34: In file included from src/compiler/glsl/ir.h:33: In file included from src/compiler/glsl_types.h:29: /usr/include/string.h:518:12: error: exception specification in declaration does not match previous declaration extern int ffs (int __i) __THROW __attribute__ ((__const__)); ^ src/util/bitscan.h:51:13: note: expanded from macro 'ffs' ^ src/util/bitscan.h:96:18: note: previous declaration is here const int i = ffs(*mask) - 1; ^ src/util/bitscan.h:51:13: note: expanded from macro 'ffs' ^ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97952 Signed-off-by: Vinson Lee Reviewed-by: Timothy Arceri --- src/util/bitscan.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/bitscan.h b/src/util/bitscan.h index 8afef81..a5dfa1f 100644 --- a/src/util/bitscan.h +++ b/src/util/bitscan.h @@ -31,6 +31,7 @@ #include #include +#include #if defined(_MSC_VER) #include ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Revert "mesa_glinterop: remove inclusion of GLX header"
Module: Mesa
Branch: master
Commit: c10dcb2ce837922c6ee4e191e6d6202098a5ee10
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c10dcb2ce837922c6ee4e191e6d6202098a5ee10
Author: Vinson Lee
Date: Mon Oct 3 15:16:30 2016 -0700
Revert "mesa_glinterop: remove inclusion of GLX header"
This reverts commit 8472045b16b3e4621553fe451a20a9ba9f0d44b6.
Conflicts:
include/GL/mesa_glinterop.h
This patch fixes this build error with GCC 4.4.
Compiling src/glx/dri_common_interop.c ...
In file included from src/glx/dri_common_interop.c:33:
include/GL/mesa_glinterop.h:62: error: redefinition of typedef ‘GLXContext’
include/GL/glx.h:165: note: previous declaration of ‘GLXContext’ was here
Fixes: 8472045b16b3 ("mesa_glinterop: remove inclusion of GLX header")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96770
Signed-off-by: Vinson Lee
---
include/GL/mesa_glinterop.h | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h
index 383d7f9..c6a967e 100644
--- a/include/GL/mesa_glinterop.h
+++ b/include/GL/mesa_glinterop.h
@@ -52,15 +52,12 @@
#include
#include
+#include
#ifdef __cplusplus
extern "C" {
#endif
-/* Forward declarations to avoid inclusion of GL/glx.h */
-typedef struct _XDisplay Display;
-typedef struct __GLXcontextRec *GLXContext;
-
/* Forward declarations to avoid inclusion of EGL/egl.h */
typedef void *EGLDisplay;
typedef void *EGLContext;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: Add missing cache_destroy stub function.
Module: Mesa
Branch: master
Commit: 0a898ec28bf1bd1bd302c881af13a02b557acb07
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a898ec28bf1bd1bd302c881af13a02b557acb07
Author: Vinson Lee
Date: Fri Oct 7 13:57:44 2016 -0700
glsl: Add missing cache_destroy stub function.
CC glsl/tests/cache_test.o
glsl/tests/cache_test.c: In function ‘test_cache_create’:
glsl/tests/cache_test.c:160:4: error: implicit declaration of function
‘cache_destroy’ [-Werror=implicit-function-declaration]
cache_destroy(cache);
^
Fixes: 87ab26b2ab35 ("glsl: Add initial functions to implement an on-disk
cache")
Signed-off-by: Vinson Lee
Reviewed-by: Timothy Arceri
---
src/compiler/glsl/cache.h | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/compiler/glsl/cache.h b/src/compiler/glsl/cache.h
index 78df32b..d804169 100644
--- a/src/compiler/glsl/cache.h
+++ b/src/compiler/glsl/cache.h
@@ -139,6 +139,11 @@ cache_create(void)
}
static inline void
+cache_destroy(struct program_cache *cache) {
+ return;
+}
+
+static inline void
cache_put(struct program_cache *cache, cache_key key,
const void *data, size_t size)
{
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: Add positional argument specifiers.
Module: Mesa
Branch: master
Commit: 215075ae30aa60dd78dd7b3372f422e9e8e6a52b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=215075ae30aa60dd78dd7b3372f422e9e8e6a52b
Author: Vinson Lee
Date: Thu Sep 1 00:20:02 2016 -0700
glsl: Add positional argument specifiers.
Fix build with Python < 2.7.
File "./glsl/ir_expression_operation.py", line 360, in get_enum_name
return "ir_{}op_{}".format(("un", "bin", "tri",
"quad")[self.num_operands-1], self.name)
ValueError: zero length field name in format
Fixes: e31c72a331b1 ("glsl: Convert tuple into a class")
Signed-off-by: Vinson Lee
---
src/compiler/glsl/ir_expression_operation.py | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/compiler/glsl/ir_expression_operation.py
b/src/compiler/glsl/ir_expression_operation.py
index 43ba46e..9aa08d3 100644
--- a/src/compiler/glsl/ir_expression_operation.py
+++ b/src/compiler/glsl/ir_expression_operation.py
@@ -357,7 +357,7 @@ class operation(object):
def get_enum_name(self):
- return "ir_{}op_{}".format(("un", "bin", "tri",
"quad")[self.num_operands-1], self.name)
+ return "ir_{0}op_{1}".format(("un", "bin", "tri",
"quad")[self.num_operands-1], self.name)
def get_template(self):
@@ -394,10 +394,10 @@ class operation(object):
def get_c_expression(self, types, indices=("c", "c", "c")):
- src0 = "op[0]->value.{}[{}]".format(types[0].union_field, indices[0])
- src1 = "op[1]->value.{}[{}]".format(types[1].union_field, indices[1]) if
len(types) >= 2 else "ERROR"
- src2 = "op[2]->value.{}[{}]".format(types[2].union_field, indices[2]) if
len(types) >= 3 else "ERROR"
- src3 = "op[3]->value.{}[c]".format(types[3].union_field) if len(types)
>= 4 else "ERROR"
+ src0 = "op[0]->value.{0}[{1}]".format(types[0].union_field, indices[0])
+ src1 = "op[1]->value.{0}[{1}]".format(types[1].union_field, indices[1])
if len(types) >= 2 else "ERROR"
+ src2 = "op[2]->value.{0}[{1}]".format(types[2].union_field, indices[2])
if len(types) >= 3 else "ERROR"
+ src3 = "op[3]->value.{0}[c]".format(types[3].union_field) if len(types)
>= 4 else "ERROR"
expr = self.c_expression[types[0].union_field] if types[0].union_field
in self.c_expression else self.c_expression['default']
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa/st: Use 'struct nir_shader' instead of 'nir_shader'.
Module: Mesa
Branch: master
Commit: 3fea592c4eb26f6652bef1e5dc430e2296e14bac
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fea592c4eb26f6652bef1e5dc430e2296e14bac
Author: Vinson Lee
Date: Wed Jun 29 20:15:03 2016 -0700
mesa/st: Use 'struct nir_shader' instead of 'nir_shader'.
Fix this build error with GCC 4.4.
CC state_tracker/st_nir_lower_builtin.lo
In file included from state_tracker/st_nir_lower_builtin.c:61:
state_tracker/st_nir.h:34: error: redefinition of typedef ‘nir_shader’
../../src/compiler/nir/nir.h:1830: note: previous declaration of ‘nir_shader’
was here
Suggested-by: Rob Clark
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96235
Signed-off-by: Vinson Lee
Reviewed-by: Jason Ekstrand
Reviewed-by: Rob Clark
---
src/mesa/state_tracker/st_nir.h | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mesa/state_tracker/st_nir.h b/src/mesa/state_tracker/st_nir.h
index 19e2d2d..523a274 100644
--- a/src/mesa/state_tracker/st_nir.h
+++ b/src/mesa/state_tracker/st_nir.h
@@ -31,14 +31,14 @@
extern "C" {
#endif
-typedef struct nir_shader nir_shader;
+struct nir_shader;
-void st_nir_lower_builtin(nir_shader *shader);
-nir_shader * st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
-struct gl_shader_program *shader_program,
-gl_shader_stage stage);
+void st_nir_lower_builtin(struct nir_shader *shader);
+struct nir_shader * st_glsl_to_nir(struct st_context *st, struct gl_program
*prog,
+ struct gl_shader_program *shader_program,
+ gl_shader_stage stage);
-void st_finalize_nir(struct st_context *st, struct gl_program *prog,
nir_shader *nir);
+void st_finalize_nir(struct st_context *st, struct gl_program *prog, struct
nir_shader *nir);
struct gl_program *
st_nir_get_mesa_program(struct gl_context *ctx,
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): swr: [rasterizer] Do not define _mm256_storeu2_m128i with icc.
Module: Mesa Branch: master Commit: 884ac617220e4ac033061bd7313079bf5471cb58 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=884ac617220e4ac033061bd7313079bf5471cb58 Author: Vinson Lee Date: Wed May 25 21:09:10 2016 -0700 swr: [rasterizer] Do not define _mm256_storeu2_m128i with icc. Fix build error with icc. CXX libswrAVX_la-swr_clear.lo icpc: command line warning #10006: ignoring unknown option '-Wdelete-non-virtual-dtor' In file included from ./rasterizer/jitter/jit_api.h(31), from swr_context.h(30), from swr_clear.cpp(24): ./rasterizer/common/os.h(135): error: expected an identifier void _mm256_storeu2_m128i(__m128i *hi, __m128i *lo, __m256i a) ^ Signed-off-by: Vinson Lee Reviewed-by: Tim Rowley --- src/gallium/drivers/swr/rasterizer/common/os.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h index b97b005..370c619 100644 --- a/src/gallium/drivers/swr/rasterizer/common/os.h +++ b/src/gallium/drivers/swr/rasterizer/common/os.h @@ -129,7 +129,7 @@ uint64_t __rdtsc() } #endif -#ifndef __clang__ +#if !defined( __clang__) && !defined(__INTEL_COMPILER) // Intrinsic not defined in gcc static INLINE void _mm256_storeu2_m128i(__m128i *hi, __m128i *lo, __m256i a) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): swr: [rasterizer] Include cmath for std::isnan and std:: isinf.
Module: Mesa Branch: master Commit: 8d639138c712c5bbe0b9ea8adbc810b23a2e8d1b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d639138c712c5bbe0b9ea8adbc810b23a2e8d1b Author: Vinson Lee Date: Mon May 9 16:02:12 2016 -0700 swr: [rasterizer] Include cmath for std::isnan and std::isinf. This patch fixes this build error. CXX rasterizer/memory/libswrAVX_la-ClearTile.lo In file included from rasterizer/memory/ClearTile.cpp:34:0: ./rasterizer/memory/Convert.h: In function ‘uint16_t Convert32To16Float(float)’: ./rasterizer/memory/Convert.h:170:9: error: ‘__builtin_isnan’ is not a member of ‘std’ if (std::isnan(val)) ^ ./rasterizer/memory/Convert.h:170:9: note: suggested alternative: : note: ‘__builtin_isnan’ ./rasterizer/memory/Convert.h:176:14: error: ‘__builtin_isinf_sign’ is not a member of ‘std’ else if (std::isinf(val)) ^ ./rasterizer/memory/Convert.h:176:14: note: suggested alternative: : note: ‘__builtin_isinf_sign’ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95180 Signed-off-by: Vinson Lee Reviewed-by: Jose Fonseca Reviewed-by: Tim Rowley --- src/gallium/drivers/swr/rasterizer/memory/Convert.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/swr/rasterizer/memory/Convert.h b/src/gallium/drivers/swr/rasterizer/memory/Convert.h index 4c4642f..42b973c 100644 --- a/src/gallium/drivers/swr/rasterizer/memory/Convert.h +++ b/src/gallium/drivers/swr/rasterizer/memory/Convert.h @@ -32,6 +32,8 @@ #pragma warning(disable: 4723) #endif +#include + // /// @brief Convert an IEEE 754 16-bit float to an 32-bit single precision ///float ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nv50,nvc0: Fix invalid constant.
Module: Mesa
Branch: master
Commit: a100d89d09981d2ebb42a7e4643a48e78db8dfe3
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a100d89d09981d2ebb42a7e4643a48e78db8dfe3
Author: Vinson Lee
Date: Fri Mar 18 18:28:28 2016 -0700
nv50,nvc0: Fix invalid constant.
Fix clang build error.
CXX codegen/nv50_ir_lowering_nvc0.lo
codegen/nv50_ir_lowering_nvc0.cpp:1783:42: error: invalid suffix 'd' on
floating constant
Value *zero = bld.loadImm(NULL, 0.0d);
^
Fixes: c1e4a6bfbf01 ("nv50,nvc0: handle SQRT lowering inside the driver")
Signed-off-by: Vinson Lee
Reviewed-by: Ilia Mirkin
---
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
index d0936d8..01364b3 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
@@ -1780,7 +1780,7 @@ NVC0LoweringPass::handleSQRT(Instruction *i)
{
if (i->dType == TYPE_F64) {
Value *pred = bld.getSSA(1, FILE_PREDICATE);
- Value *zero = bld.loadImm(NULL, 0.0d);
+ Value *zero = bld.loadImm(NULL, 0);
Value *dst = bld.getSSA(8);
bld.mkOp1(OP_RSQ, i->dType, dst, i->getSrc(0));
bld.mkCmp(OP_SET, CC_LE, i->dType, pred, i->dType, i->getSrc(0), zero);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nouveau: Fix clang reserved-user-defined-literal error.
Module: Mesa Branch: master Commit: d46feee697671a0815dc8dac4ffb70d1e9142bc2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d46feee697671a0815dc8dac4ffb70d1e9142bc2 Author: Vinson Lee Date: Wed Mar 9 00:53:02 2016 -0800 nouveau: Fix clang reserved-user-defined-literal error. CXX codegen/nv50_ir.lo In file included from codegen/nv50_ir.cpp:28: ./nouveau_debug.h:19:30: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] fprintf(stderr, "%s:%d - "fmt, __FUNCTION__, __LINE__, ##args) ^ Signed-off-by: Vinson Lee Reviewed-by: Samuel Pitoiset --- src/gallium/drivers/nouveau/nouveau_debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/nouveau/nouveau_debug.h b/src/gallium/drivers/nouveau/nouveau_debug.h index d17df81..546a4ad 100644 --- a/src/gallium/drivers/nouveau/nouveau_debug.h +++ b/src/gallium/drivers/nouveau/nouveau_debug.h @@ -16,7 +16,7 @@ #define NOUVEAU_DEBUG 0 #define NOUVEAU_ERR(fmt, args...) \ - fprintf(stderr, "%s:%d - "fmt, __FUNCTION__, __LINE__, ##args) + fprintf(stderr, "%s:%d - " fmt, __FUNCTION__, __LINE__, ##args) #define NOUVEAU_DBG(ch, args...) \ if ((NOUVEAU_DEBUG) & (NOUVEAU_DEBUG_##ch))\ ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): llvmpipe: Do not use barriers if not using threads.
Module: Mesa
Branch: master
Commit: 4ed4c1d9210b11ce6faea81455c21531904ea45b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ed4c1d9210b11ce6faea81455c21531904ea45b
Author: Vinson Lee
Date: Wed Feb 10 16:42:19 2016 -0800
llvmpipe: Do not use barriers if not using threads.
Cc: mesa-sta...@lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94088
Signed-off-by: Vinson Lee
Reviewed-by: Roland Scheidegger
---
src/gallium/drivers/llvmpipe/lp_rast.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c
b/src/gallium/drivers/llvmpipe/lp_rast.c
index d22e507..9e56c96 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast.c
@@ -910,7 +910,9 @@ lp_rast_create( unsigned num_threads )
create_rast_threads(rast);
/* for synchronizing rasterization threads */
- pipe_barrier_init( &rast->barrier, rast->num_threads );
+ if (rast->num_threads > 0) {
+ pipe_barrier_init( &rast->barrier, rast->num_threads );
+ }
memset(lp_dummy_tile, 0, sizeof lp_dummy_tile);
@@ -967,7 +969,9 @@ void lp_rast_destroy( struct lp_rasterizer *rast )
}
/* for synchronizing rasterization threads */
- pipe_barrier_destroy( &rast->barrier );
+ if (rast->num_threads > 0) {
+ pipe_barrier_destroy( &rast->barrier );
+ }
lp_scene_queue_destroy(rast->full_scenes);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa/extensions: Fix NVX_gpu_memory_info lexicographical order.
Module: Mesa
Branch: master
Commit: ccaf734275ede89bfc86f274a64570be715fed94
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccaf734275ede89bfc86f274a64570be715fed94
Author: Vinson Lee
Date: Fri Feb 5 23:16:31 2016 -0800
mesa/extensions: Fix NVX_gpu_memory_info lexicographical order.
Fixes MesaExtensionsTest.AlphabeticallySorted.
Fixes: 1d79b9958090 ("mesa: implement GL_NVX_gpu_memory_info (v2)")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94016
Signed-off-by: Vinson Lee
Reviewed-by: Marek Olšák
---
src/mesa/main/extensions_table.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index ded6f2c..d1e3a99 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -273,6 +273,8 @@ EXT(MESA_texture_signed_rgba,
EXT_texture_snorm
EXT(MESA_window_pos , dummy_true
, GLL, x , x , x , 2000)
EXT(MESA_ycbcr_texture , MESA_ycbcr_texture
, GLL, GLC, x , x , 2002)
+EXT(NVX_gpu_memory_info , NVX_gpu_memory_info
, GLL, GLC, x , x , 2013)
+
EXT(NV_blend_square , dummy_true
, GLL, x , x , x , 1999)
EXT(NV_conditional_render , NV_conditional_render
, GLL, GLC, x , x , 2008)
EXT(NV_depth_clamp , ARB_depth_clamp
, GLL, GLC, x , x , 2001)
@@ -293,7 +295,6 @@ EXT(NV_texture_barrier ,
NV_texture_barrier
EXT(NV_texture_env_combine4 , NV_texture_env_combine4
, GLL, x , x , x , 1999)
EXT(NV_texture_rectangle, NV_texture_rectangle
, GLL, x , x , x , 2000)
EXT(NV_vdpau_interop, NV_vdpau_interop
, GLL, GLC, x , x , 2010)
-EXT(NVX_gpu_memory_info , NVX_gpu_memory_info
, GLL, GLC, x , x , 2013)
EXT(OES_EGL_image , OES_EGL_image
, GLL, GLC, ES1, ES2, 2006) /* FIXME: Mesa expects GL_OES_EGL_image to be
available in OpenGL contexts. */
EXT(OES_EGL_image_external , OES_EGL_image_external
, x , x , ES1, ES2, 2010)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nir: Silence GCC maybe-uninitialized warnings.
Module: Mesa
Branch: master
Commit: 3a0fef0005eca63c6f8067d55145b8e884221cfa
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a0fef0005eca63c6f8067d55145b8e884221cfa
Author: Vinson Lee
Date: Mon Nov 2 01:23:59 2015 -0800
nir: Silence GCC maybe-uninitialized warnings.
nir/nir_control_flow.c: In function ‘split_block_cursor.isra.11’:
nir/nir_control_flow.c:460:15: warning: ‘after’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
*_after = after;
^
nir/nir_control_flow.c:458:16: warning: ‘before’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
*_before = before;
^
Signed-off-by: Vinson Lee
Reviewed-by: Connor Abbott
---
src/glsl/nir/nir_control_flow.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/src/glsl/nir/nir_control_flow.c b/src/glsl/nir/nir_control_flow.c
index 7f51c4f..96395a4 100644
--- a/src/glsl/nir/nir_control_flow.c
+++ b/src/glsl/nir/nir_control_flow.c
@@ -452,6 +452,9 @@ split_block_cursor(nir_cursor cursor,
before = split_block_before_instr(nir_instr_next(cursor.instr));
}
break;
+
+ default:
+ unreachable("not reached");
}
if (_before)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): ABI-check: Use more portable bash invocation.
Module: Mesa Branch: master Commit: 2ef5a4f8304ed368e56806e1e2be6e7d2bd290f7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ef5a4f8304ed368e56806e1e2be6e7d2bd290f7 Author: Vinson Lee Date: Tue Jul 21 14:02:01 2015 -0700 ABI-check: Use more portable bash invocation. Fixes 'make check' on FreeBSD. Signed-off-by: Vinson Lee Reviewed-by: Matt Turner --- src/mapi/es1api/ABI-check |2 +- src/mapi/es2api/ABI-check |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check index 44654cd..819568f 100755 --- a/src/mapi/es1api/ABI-check +++ b/src/mapi/es1api/ABI-check @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Print defined gl.* functions not in GL ES 1.1 or in # (FIXME, none of these should be part of the ABI) diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check index abbb55c..e0bf3c8 100755 --- a/src/mapi/es2api/ABI-check +++ b/src/mapi/es2api/ABI-check @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Print defined gl.* functions not in GL ES 3.0 or in # (FIXME, none of these should be part of the ABI) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Always define __STDC_LIMIT_MACROS.
Module: Mesa
Branch: master
Commit: ee113bbbc51f7c19da5c873410fadabfdd4d4a6d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee113bbbc51f7c19da5c873410fadabfdd4d4a6d
Author: Vinson Lee
Date: Fri Aug 14 15:19:49 2015 -0700
scons: Always define __STDC_LIMIT_MACROS.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91591
Signed-off-by: Vinson Lee
Reviewed-by: Roland Scheidegger
---
scons/gallium.py |1 +
1 file changed, 1 insertion(+)
diff --git a/scons/gallium.py b/scons/gallium.py
index 51b84d7..46dbf0e 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -300,6 +300,7 @@ def generate(env):
# C preprocessor options
cppdefines = []
+cppdefines += ['__STDC_LIMIT_MACROS']
if env['build'] in ('debug', 'checked'):
cppdefines += ['DEBUG']
else:
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): vl/mpeg12: Silence GCC unused-variable warning.
Module: Mesa
Branch: master
Commit: 996349cb190154ebdc8cc9f23e5f8f9aabbd6b4d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=996349cb190154ebdc8cc9f23e5f8f9aabbd6b4d
Author: Vinson Lee
Date: Wed Jul 29 20:32:41 2015 -0700
vl/mpeg12: Silence GCC unused-variable warning.
vl/vl_mpeg12_bitstream.c: In function 'decode_slice':
vl/vl_mpeg12_bitstream.c:928:19: warning: unused variable 'extra'
[-Wunused-variable]
unsigned extra = vl_vlc_get_uimsbf(&bs->vlc, 1);
^
Signed-off-by: Vinson Lee
Reviewed-by: Christian König
---
src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c |1 +
1 file changed, 1 insertion(+)
diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c
b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c
index 539a991..52ce6c4 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c
@@ -929,6 +929,7 @@ decode_slice(struct vl_mpg12_bs *bs, struct
pipe_video_buffer *target)
mb.PMV[1][0][0] = mb.PMV[0][0][0];
mb.PMV[1][0][1] = mb.PMV[0][0][1];
assert(extra);
+ (void) extra;
} else if (mb.macroblock_type & PIPE_MPEG12_MB_TYPE_INTRA ||
!(mb.macroblock_type & (PIPE_MPEG12_MB_TYPE_MOTION_FORWARD |
PIPE_MPEG12_MB_TYPE_MOTION_BACKWARD)))
{
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallivm: Fix GCC unused-variable warning.
Module: Mesa
Branch: master
Commit: 8477dd7c2e4416838c54da75a769109b4c5cc48e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8477dd7c2e4416838c54da75a769109b4c5cc48e
Author: Vinson Lee
Date: Wed Jul 29 20:17:36 2015 -0700
gallivm: Fix GCC unused-variable warning.
lp_bld_tgsi_soa.c: In function 'lp_emit_immediate_soa':
lp_bld_tgsi_soa.c:3065:18: warning: unused variable 'size' [-Wunused-variable]
const uint size = imm->Immediate.NrTokens - 1;
^
Signed-off-by: Vinson Lee
Reviewed-by: Brian Paul
---
src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index 55f606f..fae604e 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -3062,8 +3062,7 @@ void lp_emit_immediate_soa(
} else {
/* simply copy the immediate values into the next immediates[] slot */
unsigned i;
- const uint size = imm->Immediate.NrTokens - 1;
- assert(size <= 4);
+ assert(imm->Immediate.NrTokens - 1 <= 4);
assert(bld->num_immediates < LP_MAX_INLINED_IMMEDIATES);
for(i = 0; i < 4; ++i )
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): radeon: Silence GCC unused-but-set-variable warnings.
Module: Mesa
Branch: master
Commit: 22c9339abf00c2ecf40e0d8fd740faafba3ec37b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=22c9339abf00c2ecf40e0d8fd740faafba3ec37b
Author: Vinson Lee
Date: Tue Jul 21 21:50:29 2015 -0700
radeon: Silence GCC unused-but-set-variable warnings.
radeon_fbo.c: In function 'radeon_map_renderbuffer_s8z24':
radeon_fbo.c:162:9: warning: variable 'ret' set but not used
[-Wunused-but-set-variable]
int ret;
^
radeon_fbo.c: In function 'radeon_map_renderbuffer_z16':
radeon_fbo.c:200:9: warning: variable 'ret' set but not used
[-Wunused-but-set-variable]
int ret;
^
radeon_fbo.c: In function 'radeon_map_renderbuffer':
radeon_fbo.c:242:8: warning: variable 'ret' set but not used
[-Wunused-but-set-variable]
int ret;
^
radeon_fbo.c: In function 'radeon_unmap_renderbuffer':
radeon_fbo.c:419:14: warning: variable 'ok' set but not used
[-Wunused-but-set-variable]
GLboolean ok;
^
Signed-off-by: Vinson Lee
Reviewed-by: Marek Olšák
---
src/mesa/drivers/dri/radeon/radeon_fbo.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c
b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index 5e4aaca..5eece51 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -169,6 +169,7 @@ radeon_map_renderbuffer_s8z24(struct gl_context *ctx,
rrb->map_buffer = malloc(w * h * 4);
ret = radeon_bo_map(rrb->bo, !!(mode & GL_MAP_WRITE_BIT));
assert(!ret);
+(void) ret;
untiled_s8z24_map = rrb->map_buffer;
tiled_s8z24_map = rrb->bo->ptr;
@@ -207,6 +208,7 @@ radeon_map_renderbuffer_z16(struct gl_context *ctx,
rrb->map_buffer = malloc(w * h * 2);
ret = radeon_bo_map(rrb->bo, !!(mode & GL_MAP_WRITE_BIT));
assert(!ret);
+(void) ret;
untiled_z16_map = rrb->map_buffer;
tiled_z16_map = rrb->bo->ptr;
@@ -324,6 +326,7 @@ radeon_map_renderbuffer(struct gl_context *ctx,
ret = radeon_bo_map(rrb->bo, !!(mode & GL_MAP_WRITE_BIT));
assert(!ret);
+ (void) ret;
map = rrb->bo->ptr;
stride = rrb->map_pitch;
@@ -416,7 +419,6 @@ radeon_unmap_renderbuffer(struct gl_context *ctx,
{
struct radeon_context *const rmesa = RADEON_CONTEXT(ctx);
struct radeon_renderbuffer *rrb = radeon_renderbuffer(rb);
- GLboolean ok;
if ((rmesa->radeonScreen->chip_flags & RADEON_CHIPSET_DEPTH_ALWAYS_TILED)
&& !rrb->has_surface) {
if (rb->Format == MESA_FORMAT_Z24_UNORM_S8_UINT || rb->Format ==
MESA_FORMAT_Z24_UNORM_X8_UINT) {
@@ -438,6 +440,7 @@ radeon_unmap_renderbuffer(struct gl_context *ctx,
radeon_bo_unmap(rrb->map_bo);
if (rrb->map_mode & GL_MAP_WRITE_BIT) {
+ GLboolean ok;
ok = rmesa->vtbl.blit(ctx, rrb->map_bo, 0,
rb->Format, rrb->map_pitch / rrb->cpp,
rrb->map_w, rrb->map_h,
@@ -449,6 +452,7 @@ radeon_unmap_renderbuffer(struct gl_context *ctx,
rrb->map_w, rrb->map_h,
GL_FALSE);
assert(ok);
+ (void) ok;
}
radeon_bo_unref(rrb->map_bo);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): st/mesa: Silence GCC unused-variable warning.
Module: Mesa
Branch: master
Commit: 912921059d137085faef676504bea265328bdde4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=912921059d137085faef676504bea265328bdde4
Author: Vinson Lee
Date: Mon Jul 20 21:52:40 2015 -0700
st/mesa: Silence GCC unused-variable warning.
Silence a release build warning.
st_glsl_to_tgsi.cpp: In function 'pipe_error st_translate_program(gl_context*,
uint, ureg_program*, glsl_to_tgsi_visitor*, const gl_program*, GLuint, const
GLuint*, const GLuint*, const ubyte*, const ubyte*, const GLuint*, const
GLuint*, GLuint, const GLuint*, const GLuint*, const ubyte*, const ubyte*,
boolean, boolean)':
st_glsl_to_tgsi.cpp:5461:36: warning: unused variable 'pscreen'
[-Wunused-variable]
struct pipe_screen *pscreen = st->pipe->screen;
^
Signed-off-by: Vinson Lee
Reviewed-by: Brian Paul
---
src/mesa/state_tracker/st_glsl_to_tgsi.cpp |1 +
1 file changed, 1 insertion(+)
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 25e30c7..c9d40c5 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -5461,6 +5461,7 @@ st_translate_program(
struct pipe_screen *pscreen = st->pipe->screen;
assert(procType == TGSI_PROCESSOR_VERTEX);
assert(pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX,
PIPE_SHADER_CAP_INTEGERS));
+ (void) pscreen;
if (!ctx->Const.NativeIntegers) {
struct ureg_dst temp = ureg_DECL_local_temporary(t->ureg);
ureg_U2F( t->ureg, ureg_writemask(temp, TGSI_WRITEMASK_X),
t->systemValues[i]);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallivm: Do not use NoFramePointerElim with LLVM 3.7.
Module: Mesa Branch: master Commit: 147ffd48166d851341cadd12de98895f32ec25a2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=147ffd48166d851341cadd12de98895f32ec25a2 Author: Vinson Lee Date: Tue May 26 22:18:28 2015 -0700 gallivm: Do not use NoFramePointerElim with LLVM 3.7. TargetOptions::NoFramePointerElim was removed in llvm-3.7.0svn r238244 "Remove NoFramePointerElim and NoFramePointerElimOverride from TargetOptions and remove ExecutionEngine's dependence on CodeGen. NFC." Signed-off-by: Vinson Lee Reviewed-by: Tom Stellard --- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |2 ++ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp |2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index be3e834..76c302f 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -277,8 +277,10 @@ disassemble(const void* func, llvm::raw_ostream & Out) options.StackAlignmentOverride = 4; #endif #if defined(DEBUG) || defined(PROFILE) +#if HAVE_LLVM < 0x0307 options.NoFramePointerElim = true; #endif +#endif OwningPtr TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options)); /* diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 5e8a634..ffed9e6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -439,8 +439,10 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, #if HAVE_LLVM < 0x0304 options.NoFramePointerElimNonLeaf = true; #endif +#if HAVE_LLVM < 0x0307 options.NoFramePointerElim = true; #endif +#endif builder.setEngineKind(EngineKind::JIT) .setErrorStr(&Error) ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glapi: Add positional argument specifier.
Module: Mesa
Branch: master
Commit: cf5e015f71496e0626cd5c6262af1c5099391850
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf5e015f71496e0626cd5c6262af1c5099391850
Author: Vinson Lee
Date: Wed May 6 12:39:09 2015 -0700
glapi: Add positional argument specifier.
Fix build error introduced with commit 1c5a57a "glapi/es3.1: Add support
for GLES versions > 3.0" with Python < 2.7.
File "src/mapi/glapi/gen/gl_genexec.py", line 230, in
printer.Print(api)
File "src/mapi/glapi/gen/gl_XML.py", line 120, in Print
self.printBody(api)
File "src/mapi/glapi/gen/gl_genexec.py", line 187, in printBody
condition_parts.append('(ctx->API == API_OPENGLES2 && ctx->Version >=
{})'.format(int(f.api_map['es2'] * 10)))
ValueError: zero length field name in format
Signed-off-by: Vinson Lee
Reviewed-by: Kenneth Graunke
Reviewed-by: Ian Romanick
---
src/mapi/glapi/gen/gl_genexec.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index e58cdfc..4e76fe3 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -184,7 +184,7 @@ class PrintCode(gl_XML.gl_print_base):
condition_parts.append('ctx->API == API_OPENGLES')
if 'es2' in f.api_map:
if f.api_map['es2'] > 2.0:
-condition_parts.append('(ctx->API == API_OPENGLES2 &&
ctx->Version >= {})'.format(int(f.api_map['es2'] * 10)))
+condition_parts.append('(ctx->API == API_OPENGLES2 &&
ctx->Version >= {0})'.format(int(f.api_map['es2'] * 10)))
else:
condition_parts.append('ctx->API == API_OPENGLES2')
if not condition_parts:
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): r600g: Fix Clang return-type build error.
Module: Mesa
Branch: master
Commit: 382b1a36e33c2d1f985996ecea54bdda547587d7
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=382b1a36e33c2d1f985996ecea54bdda547587d7
Author: Vinson Lee
Date: Wed May 6 10:09:38 2015 -0700
r600g: Fix Clang return-type build error.
Fix Clang return-type error introduced with commit
96f164f6f047833091eb98a73aa80c31dc94f962 "gallium: make
pipe_context::begin_query return a boolean".
CC r600_query.lo
r600_query.c:443:3: error: non-void function 'r600_begin_query' should return a
value [-Wreturn-type]
return;
^
Signed-off-by: Vinson Lee
Reviewed-by: Tom Stellard
---
src/gallium/drivers/radeon/r600_query.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/radeon/r600_query.c
b/src/gallium/drivers/radeon/r600_query.c
index 28a814a..71f4a15 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -440,7 +440,7 @@ static boolean r600_begin_query(struct pipe_context *ctx,
/* Non-GPU queries. */
switch (rquery->type) {
case PIPE_QUERY_TIMESTAMP_DISJOINT:
- return;
+ return true;
case R600_QUERY_DRAW_CALLS:
rquery->begin_result = rctx->num_draw_calls;
return true;
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallivm: Fix build since llvm-3.7.0svn r234460.
Module: Mesa
Branch: master
Commit: 50e9fa2ed69cb5f76f66231976ea789c0091a64d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=50e9fa2ed69cb5f76f66231976ea789c0091a64d
Author: Vinson Lee
Date: Wed Apr 8 22:51:57 2015 -0700
gallivm: Fix build since llvm-3.7.0svn r234460.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89963
Signed-off-by: Vinson Lee
Reviewed-by: Tom Stellard
---
src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |4
1 file changed, 4 insertions(+)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 65d2896..b712915 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -97,7 +97,11 @@ private:
uint64_t pos;
public:
+#if HAVE_LLVM >= 0x0307
+ raw_debug_ostream() : raw_ostream(SK_FD), pos(0) { }
+#else
raw_debug_ostream() : pos(0) { }
+#endif
void write_impl(const char *Ptr, size_t Size);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): common.py: Fix PEP 8 issues.
Module: Mesa
Branch: master
Commit: 60f77b22b1e3bbef7e4d1f10012acf830d81ed7b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=60f77b22b1e3bbef7e4d1f10012acf830d81ed7b
Author: Vinson Lee
Date: Sat Mar 14 01:45:03 2015 -0700
common.py: Fix PEP 8 issues.
Signed-off-by: Vinson Lee
Reviewed-by: Brian Paul
---
common.py | 97 +
1 file changed, 53 insertions(+), 44 deletions(-)
diff --git a/common.py b/common.py
index 1d2d586..7a93941 100644
--- a/common.py
+++ b/common.py
@@ -26,28 +26,28 @@ else:
target_platform = host_platform
_machine_map = {
- 'x86': 'x86',
- 'i386': 'x86',
- 'i486': 'x86',
- 'i586': 'x86',
- 'i686': 'x86',
- 'BePC': 'x86',
- 'Intel': 'x86',
- 'ppc' : 'ppc',
- 'BeBox': 'ppc',
- 'BeMac': 'ppc',
- 'AMD64': 'x86_64',
- 'x86_64': 'x86_64',
- 'sparc': 'sparc',
- 'sun4u': 'sparc',
+'x86': 'x86',
+'i386': 'x86',
+'i486': 'x86',
+'i586': 'x86',
+'i686': 'x86',
+'BePC': 'x86',
+'Intel': 'x86',
+'ppc': 'ppc',
+'BeBox': 'ppc',
+'BeMac': 'ppc',
+'AMD64': 'x86_64',
+'x86_64': 'x86_64',
+'sparc': 'sparc',
+'sun4u': 'sparc',
}
# find host_machine value
if 'PROCESSOR_ARCHITECTURE' in os.environ:
- host_machine = os.environ['PROCESSOR_ARCHITECTURE']
+host_machine = os.environ['PROCESSOR_ARCHITECTURE']
else:
- host_machine = _platform.machine()
+host_machine = _platform.machine()
host_machine = _machine_map.get(host_machine, 'generic')
default_machine = host_machine
@@ -65,7 +65,8 @@ else:
default_llvm = 'no'
try:
if target_platform != 'windows' and \
- subprocess.call(['llvm-config', '--version'],
stdout=subprocess.PIPE) == 0:
+ subprocess.call(['llvm-config', '--version'],
+ stdout=subprocess.PIPE) == 0:
default_llvm = 'yes'
except:
pass
@@ -75,30 +76,38 @@ else:
# Common options
def AddOptions(opts):
- try:
- from SCons.Variables.BoolVariable import BoolVariable as
BoolOption
- except ImportError:
- from SCons.Options.BoolOption import BoolOption
- try:
- from SCons.Variables.EnumVariable import EnumVariable as
EnumOption
- except ImportError:
- from SCons.Options.EnumOption import EnumOption
- opts.Add(EnumOption('build', 'build type', 'debug',
- allowed_values=('debug', 'checked', 'profile',
'release')))
- opts.Add(BoolOption('verbose', 'verbose output', 'no'))
- opts.Add(EnumOption('machine', 'use machine-specific assembly code',
default_machine,
-
allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
- opts.Add(EnumOption('platform', 'target platform', host_platform,
-
allowed_values=('cygwin', 'darwin', 'freebsd', 'haiku', 'linux',
'sunos', 'windows')))
- opts.Add(BoolOption('embedded', 'embedded build', 'no'))
- opts.Add(BoolOption('analyze', 'enable static code analysis where
available', 'no'))
- opts.Add('toolchain', 'compiler toolchain', default_toolchain)
- opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support',
'no'))
- opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
- opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp
(swrast)', 'no'))
- opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
- opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
- opts.Add(BoolOption('quiet', 'DEPRECATED: prof
Mesa (master): i915: Fix GCC unused-but-set-variable warning in release build.
Module: Mesa
Branch: master
Commit: 282f67becd072068147c95f26d9c705acf1bbe1b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=282f67becd072068147c95f26d9c705acf1bbe1b
Author: Vinson Lee
Date: Fri Mar 6 21:52:31 2015 -0800
i915: Fix GCC unused-but-set-variable warning in release build.
i915_fragprog.c: In function ‘i915ValidateFragmentProgram’:
i915_fragprog.c:1453:11: warning: variable ‘k’ set but not used
[-Wunused-but-set-variable]
int k;
^
Signed-off-by: Vinson Lee
Reviewed-by: Anuj Phogat
---
src/mesa/drivers/dri/i915/i915_fragprog.c |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c
b/src/mesa/drivers/dri/i915/i915_fragprog.c
index d42da5a..9b00223 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -1450,8 +1450,6 @@ i915ValidateFragmentProgram(struct i915_context *i915)
if (s2 != i915->state.Ctx[I915_CTXREG_LIS2] ||
s4 != i915->state.Ctx[I915_CTXREG_LIS4]) {
- int k;
-
I915_STATECHANGE(i915, I915_UPLOAD_CTX);
/* Must do this *after* statechange, so as not to affect
@@ -1471,8 +1469,7 @@ i915ValidateFragmentProgram(struct i915_context *i915)
i915->state.Ctx[I915_CTXREG_LIS2] = s2;
i915->state.Ctx[I915_CTXREG_LIS4] = s4;
- k = intel->vtbl.check_vertex_size(intel, intel->vertex_size);
- assert(k);
+ assert(intel->vtbl.check_vertex_size(intel, intel->vertex_size));
}
if (!p->params_uptodate)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965: Silence GCC maybe-uninitialized warning.
Module: Mesa
Branch: master
Commit: 13f4963ed2de90680841658af4561ef7ab238406
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=13f4963ed2de90680841658af4561ef7ab238406
Author: Vinson Lee
Date: Fri Mar 6 22:08:00 2015 -0800
i965: Silence GCC maybe-uninitialized warning.
brw_shader.cpp: In function ‘bool brw_saturate_immediate(brw_reg_type,
brw_reg*)’:
brw_shader.cpp:618:31: warning: ‘sat_imm.brw_saturate_immediate(brw_reg_type,
brw_reg*)ud’ may be used uninitialized in this function
[-Wmaybe-uninitialized]
reg->dw1.ud = sat_imm.ud;
^
Signed-off-by: Vinson Lee
Reviewed-by: Anuj Phogat
---
src/mesa/drivers/dri/i965/brw_shader.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp
b/src/mesa/drivers/dri/i965/brw_shader.cpp
index f2b4d82..ff0ef4b 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -584,7 +584,7 @@ brw_saturate_immediate(enum brw_reg_type type, struct
brw_reg *reg)
unsigned ud;
int d;
float f;
- } imm = { reg->dw1.ud }, sat_imm;
+ } imm = { reg->dw1.ud }, sat_imm = { 0 };
switch (type) {
case BRW_REGISTER_TYPE_UD:
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): Add macro for unused function attribute.
Module: Mesa
Branch: master
Commit: 5f759836ad75360a2f4581083043a86f7a8c1e09
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f759836ad75360a2f4581083043a86f7a8c1e09
Author: Vinson Lee
Date: Sat Mar 7 14:07:10 2015 -0800
Add macro for unused function attribute.
Suggested-by: Emil Velikov
Signed-off-by: Vinson Lee
Reviewed-by: Emil Velikov
---
configure.ac |1 +
scons/gallium.py |1 +
src/util/macros.h |6 ++
3 files changed, 8 insertions(+)
diff --git a/configure.ac b/configure.ac
index 90c7737..2954f80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,6 +195,7 @@ AX_GCC_FUNC_ATTRIBUTE([flatten])
AX_GCC_FUNC_ATTRIBUTE([format])
AX_GCC_FUNC_ATTRIBUTE([malloc])
AX_GCC_FUNC_ATTRIBUTE([packed])
+AX_GCC_FUNC_ATTRIBUTE([unused])
AM_CONDITIONAL([GEN_ASM_OFFSETS], test "x$GEN_ASM_OFFSETS" = xyes)
diff --git a/scons/gallium.py b/scons/gallium.py
index 7533f06..b162089 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -369,6 +369,7 @@ def generate(env):
'HAVE___BUILTIN_FFS',
'HAVE___BUILTIN_FFSLL',
'HAVE_FUNC_ATTRIBUTE_FLATTEN',
+'HAVE_FUNC_ATTRIBUTE_UNUSED',
# GCC 3.0
'HAVE_FUNC_ATTRIBUTE_FORMAT',
'HAVE_FUNC_ATTRIBUTE_PACKED',
diff --git a/src/util/macros.h b/src/util/macros.h
index 63daba3..6c7bda7 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -176,5 +176,11 @@ do { \
# endif
#endif
+#ifdef HAVE_FUNC_ATTRIBUTE_UNUSED
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
#endif /* UTIL_MACROS_H */
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i915: Fix GCC unused-variable warning in release build.
Module: Mesa
Branch: master
Commit: 1ca39ec03cfba9c032f6e3b8b6c1f24e69bf96ac
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ca39ec03cfba9c032f6e3b8b6c1f24e69bf96ac
Author: Vinson Lee
Date: Tue Mar 3 18:54:48 2015 -0800
i915: Fix GCC unused-variable warning in release build.
i915_debug_fp.c: In function ‘i915_disassemble_program’:
i915_debug_fp.c:302:11: warning: unused variable ‘size’ [-Wunused-variable]
GLuint size = program[0] & 0x1ff;
^
Signed-off-by: Vinson Lee
Reviewed-by: Timothy Arceri
---
src/mesa/drivers/dri/i915/i915_debug_fp.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/i915_debug_fp.c
b/src/mesa/drivers/dri/i915/i915_debug_fp.c
index 9b4bc76..3f09902 100644
--- a/src/mesa/drivers/dri/i915/i915_debug_fp.c
+++ b/src/mesa/drivers/dri/i915/i915_debug_fp.c
@@ -299,12 +299,11 @@ print_dcl_op(GLuint opcode, const GLuint * program)
void
i915_disassemble_program(const GLuint * program, GLuint sz)
{
- GLuint size = program[0] & 0x1ff;
GLint i;
printf("\t\tBEGIN\n");
- assert(size + 2 == sz);
+ assert(program[0] & 0x1ff + 2 == sz);
program++;
for (i = 1; i < sz; i += 3, program += 3) {
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: Fix GCC unused-variable warning in release build.
Module: Mesa
Branch: master
Commit: 29c23644cc8cfe9a1cdd75f79a96a1c9b49d26fa
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=29c23644cc8cfe9a1cdd75f79a96a1c9b49d26fa
Author: Vinson Lee
Date: Tue Mar 3 18:46:13 2015 -0800
glsl: Fix GCC unused-variable warning in release build.
CXX ast_array_index.lo
ast_array_index.cpp: In function ‘void update_max_array_access(ir_rvalue*, int,
YYLTYPE*, _mesa_glsl_parse_state*)’:
ast_array_index.cpp:86:30: warning: unused variable ‘interface_type’
[-Wunused-variable]
const glsl_type *interface_type =
^
Signed-off-by: Vinson Lee
Reviewed-by: Timothy Arceri
---
src/glsl/ast_array_index.cpp |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/glsl/ast_array_index.cpp b/src/glsl/ast_array_index.cpp
index ff0c757..ecef651 100644
--- a/src/glsl/ast_array_index.cpp
+++ b/src/glsl/ast_array_index.cpp
@@ -83,11 +83,9 @@ update_max_array_access(ir_rvalue *ir, int idx, YYLTYPE *loc,
if (deref_var != NULL) {
if (deref_var->var->is_interface_instance()) {
-const glsl_type *interface_type =
- deref_var->var->get_interface_type();
unsigned field_index =
deref_record->record->type->field_index(deref_record->field);
-assert(field_index < interface_type->length);
+assert(field_index < deref_var->var->get_interface_type()->length);
unsigned *const max_ifc_array_access =
deref_var->var->get_max_ifc_array_access();
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Define _DEFAULT_SOURCE.
Module: Mesa Branch: master Commit: b77576edc1a8010e5457f82b41c335ae27cb066b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b77576edc1a8010e5457f82b41c335ae27cb066b Author: Vinson Lee Date: Sun Mar 1 00:41:48 2015 -0800 scons: Define _DEFAULT_SOURCE. Fix GCC cpp warnings with glibc >= 2.19. /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" ^ Signed-off-by: Vinson Lee Acked-by: Emil Velikov --- scons/gallium.py |1 + 1 file changed, 1 insertion(+) diff --git a/scons/gallium.py b/scons/gallium.py index 711aa3b..c34468f 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -283,6 +283,7 @@ def generate(env): '_SVID_SOURCE', '_BSD_SOURCE', '_GNU_SOURCE', +'_DEFAULT_SOURCE', 'HAVE_PTHREAD', 'HAVE_POSIX_MEMALIGN', ] ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): r300g/tests: Include stdio.h.
Module: Mesa Branch: master Commit: 8170eba7e7c37235bd5fad2f9adfdd0eda8e3246 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8170eba7e7c37235bd5fad2f9adfdd0eda8e3246 Author: Vinson Lee Date: Thu Feb 26 21:00:15 2015 -0800 r300g/tests: Include stdio.h. Fix build error. CC compiler/tests/r300_compiler_tests-radeon_compiler_regalloc_tests.o compiler/tests/radeon_compiler_regalloc_tests.c: In function ‘test_runner_rc_regalloc’: compiler/tests/radeon_compiler_regalloc_tests.c:57:3: error: implicit declaration of function ‘fprintf’ [-Werror=implicit-function-declaration] fprintf(stderr, "Failed to load program\n"); ^ Signed-off-by: Vinson Lee --- .../drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c index 5306b08..e1b6b24 100644 --- a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c +++ b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c @@ -23,6 +23,8 @@ * Author: Tom Stellard */ +#include + #include "radeon_program_pair.h" #include "r300_compiler_tests.h" ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): sha1: Fix gcry_md_hd_t typo.
Module: Mesa
Branch: master
Commit: 9075823c17280d36ca2ba2e98ec93fb097801593
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9075823c17280d36ca2ba2e98ec93fb097801593
Author: Vinson Lee
Date: Fri Jan 16 16:21:41 2015 -0800
sha1: Fix gcry_md_hd_t typo.
Fix build error.
CC libmesautil_la-sha1.lo
sha1.c: In function '_mesa_sha1_final':
sha1.c:210:22: error: 'grcy_md_hd_t' undeclared (first use in this function)
gcry_md_hd_t h = (grcy_md_hd_t) ctx;
^
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88519
Signed-off-by: Vinson Lee
---
src/util/sha1.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/sha1.c b/src/util/sha1.c
index 658dc27..27ba93b 100644
--- a/src/util/sha1.c
+++ b/src/util/sha1.c
@@ -207,7 +207,7 @@ _mesa_sha1_update(struct mesa_sha1 *ctx, const void *data,
int size)
int
_mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
{
- gcry_md_hd_t h = (grcy_md_hd_t) ctx;
+ gcry_md_hd_t h = (gcry_md_hd_t) ctx;
memcpy(result, gcry_md_read(h, GCRY_MD_SHA1), 20);
gcry_md_close(h);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): nir: s/malloc.h/stdlib.h/
Module: Mesa Branch: master Commit: 10a4f1e77aec66dfc1af4092ebd5be39383c3223 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=10a4f1e77aec66dfc1af4092ebd5be39383c3223 Author: Vinson Lee Date: Fri Jan 16 16:14:51 2015 -0800 nir: s/malloc.h/stdlib.h/ Fix build error on Mac OS X. CC nir_to_ssa.lo nir_to_ssa.c:29:10: fatal error: 'malloc.h' file not found ^ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88478 Signed-off-by: Vinson Lee --- src/glsl/nir/nir_to_ssa.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/nir/nir_to_ssa.c b/src/glsl/nir/nir_to_ssa.c index 03cce92..3e75211 100644 --- a/src/glsl/nir/nir_to_ssa.c +++ b/src/glsl/nir/nir_to_ssa.c @@ -26,7 +26,7 @@ */ #include "nir.h" -#include "malloc.h" +#include #include /* ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): ax_prog_flex.m4: Merge upstream OpenBSD fixes.
Module: Mesa Branch: master Commit: 5ae13051249f6f9d44dae15e9deb62e7cb09aed7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ae13051249f6f9d44dae15e9deb62e7cb09aed7 Author: Vinson Lee Date: Mon Jan 5 14:53:03 2015 -0800 ax_prog_flex.m4: Merge upstream OpenBSD fixes. Merge the following upstream autoconf-archive patches. ax_prog_flex: change grep syntax to accept e.g. "flex.real" in case a wrapper or symlink is used. AX_PROG_FLEX: avoid use of grep empty string escape extension (fix for OpenBSD) AX_PROG_FLEX: Also accept gflex. Signed-off-by: Vinson Lee Reviewed-by: Matt Turner Reviewed-by: Jonathan Gray --- m4/ax_prog_flex.m4 |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/ax_prog_flex.m4 b/m4/ax_prog_flex.m4 index 82fbc30..1f1f597 100644 --- a/m4/ax_prog_flex.m4 +++ b/m4/ax_prog_flex.m4 @@ -42,7 +42,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 9 +#serial 12 # mattst88: # Replaced m4_ifnblank(...) with m4_ifval(m4_normalize(...), ...) @@ -53,7 +53,7 @@ AC_DEFUN([AX_PROG_FLEX], [ AC_REQUIRE([AC_PROG_EGREP]) AC_CACHE_CHECK([if flex is the lexer generator],[ax_cv_prog_flex],[ -AS_IF([$LEX --version 2>/dev/null | $EGREP -q '^\'], +AS_IF([$LEX --version 2>/dev/null | $EGREP -qw '^g?flex'], [ax_cv_prog_flex=yes], [ax_cv_prog_flex=no]) ]) AS_IF([test "$ax_cv_prog_flex" = "yes"], ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965: Fix union usage for G++ <= 4.6.
Module: Mesa
Branch: master
Commit: d20235f79a4b2786c984175b502b97ac73648781
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d20235f79a4b2786c984175b502b97ac73648781
Author: Vinson Lee
Date: Fri Dec 5 18:05:06 2014 -0800
i965: Fix union usage for G++ <= 4.6.
This patch fixes this build error with G++ <= 4.6.
CXXtest_vf_float_conversions.o
test_vf_float_conversions.cpp: In function ‘unsigned int f2u(float)’:
test_vf_float_conversions.cpp:63:20: error: expected primary-expression before
‘.’ token
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86939
Signed-off-by: Vinson Lee
Reviewed-by: Matt Turner
---
src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp
b/src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp
index 2ea36fd..6a8bcea 100644
--- a/src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp
+++ b/src/mesa/drivers/dri/i965/test_vf_float_conversions.cpp
@@ -60,7 +60,8 @@ union fu {
static unsigned
f2u(float f)
{
- union fu fu = { .f = f };
+ union fu fu;
+ fu.f = f;
return fu.u;
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Require glproto >= 1.4.13 for X11.
Module: Mesa
Branch: master
Commit: 876c53375e58a19f8fa1681ae235b463a5781f46
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=876c53375e58a19f8fa1681ae235b463a5781f46
Author: Vinson Lee
Date: Sat Nov 15 14:07:42 2014 -0800
scons: Require glproto >= 1.4.13 for X11.
GLXBadProfileARB and X_GLXCreateContextAtrribsARB require glproto >=
1.4.13. These symbols were added in commit
d5d41112cbccd9301500e8e023be77eb9cb622cd "st/xlib: Generate errors as
specified."
Signed-off-by: Vinson Lee
Cc: "10.4"
Reviewed-by: José Fonseca
---
scons/gallium.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index e3786d2..4df6e1a 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -621,7 +621,7 @@ def generate(env):
env.Tool('custom')
createInstallMethods(env)
-env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes'])
+env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes', 'glproto
>= 1.4.13'])
env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx >= 1.8.1', 'xcb-dri2 >=
1.8'])
env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
env.PkgCheckModules('DRM', ['libdrm >= 2.4.38'])
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl/list: Revert unintentional file mode change in previous commit.
Module: Mesa Branch: master Commit: 42443339f10354523af09df7a13eabe6f3766d5a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=42443339f10354523af09df7a13eabe6f3766d5a Author: Vinson Lee Date: Fri Nov 7 21:04:08 2014 -0800 glsl/list: Revert unintentional file mode change in previous commit. Signed-off-by: Vinson Lee --- 0 files changed diff --git a/src/glsl/list.h b/src/glsl/list.h old mode 100755 new mode 100644 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl/list: Move declaration before code.
Module: Mesa
Branch: master
Commit: f9fc3949e182cb2da8ce6d8d71f441986795664f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9fc3949e182cb2da8ce6d8d71f441986795664f
Author: Vinson Lee
Date: Fri Nov 7 15:33:41 2014 -0800
glsl/list: Move declaration before code.
Fixes MSVC build error.
shaderapi.c
src\glsl\list.h(535) : error C2143: syntax error : missing ';' before 'type'
src\glsl\list.h(535) : error C2143: syntax error : missing ')' before 'type'
src\glsl\list.h(536) : error C2065: 'node' : undeclared identifier
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86025
Signed-off-by: Vinson Lee
---
src/glsl/list.h |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/glsl/list.h b/src/glsl/list.h
old mode 100644
new mode 100755
index e4b063c..995c666
--- a/src/glsl/list.h
+++ b/src/glsl/list.h
@@ -524,6 +524,8 @@ exec_node_insert_list_before(struct exec_node *n, struct
exec_list *before)
static inline void
exec_list_validate(const struct exec_list *list)
{
+ const struct exec_node *node;
+
assert(list->head->prev == (const struct exec_node *) &list->head);
assert(list->tail == NULL);
assert(list->tail_pred->next == (const struct exec_node *) &list->tail);
@@ -532,7 +534,7 @@ exec_list_validate(const struct exec_list *list)
* either require C++ or assume the exec_node is embedded in a structure
* which is not the case for this function.
*/
- for (const struct exec_node *node = exec_list_get_head_const(list);
+ for (node = exec_list_get_head_const(list);
!exec_node_is_tail_sentinel(node);
node = exec_node_get_next_const(node)) {
assert(node->next->prev == node);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): clover: Fix build error with LLVM 3.4.
Module: Mesa
Branch: master
Commit: 1ab6543431b5a4eaf589cdabf2227088dd62ce6f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ab6543431b5a4eaf589cdabf2227088dd62ce6f
Author: Vinson Lee
Date: Sun Oct 19 00:13:33 2014 -0700
clover: Fix build error with LLVM 3.4.
DataLayoutPass was added in LLVM 3.5 r202168, commit
57edc9d4ff1648568a5dd7e9958649065b260dca "Make DataLayout a plain
object, not a pass.".
This patch fixes this build error with LLVM 3.4.
CXX llvm/libclllvm_la-invocation.lo
llvm/invocation.cpp: In function 'void {anonymous}::optimize(llvm::Module*,
unsigned int, const std::vector&)':
llvm/invocation.cpp:324:18: error: expected type-specifier
PM.add(new llvm::DataLayoutPass(mod));
^
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85189
Signed-off-by: Vinson Lee
Reviewed-by: Tom Stellard
---
src/gallium/state_trackers/clover/llvm/invocation.cpp |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 507daa0..7c31008 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -344,7 +344,9 @@ namespace {
llvm::Function *kernel = *I;
export_list.push_back(kernel->getName().data());
}
-#if HAVE_LLVM < 0x0306
+#if HAVE_LLVM < 0x0305
+ PM.add(new llvm::DataLayout(mod));
+#elif HAVE_LLVM < 0x0306
PM.add(new llvm::DataLayoutPass(mod));
#else
PM.add(new llvm::DataLayoutPass());
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): auxilary/os: Add DragonFly BSD support in os_get_total_physical_memory.
Module: Mesa Branch: master Commit: a2fd55cfb65d3933c27ed6c2259966a98acc55eb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a2fd55cfb65d3933c27ed6c2259966a98acc55eb Author: Vinson Lee Date: Fri Oct 10 22:40:21 2014 -0700 auxilary/os: Add DragonFly BSD support in os_get_total_physical_memory. This patch fixes this build error on DragonFly BSD. CC os/os_misc.lo os/os_misc.c: In function 'os_get_total_physical_memory': os/os_misc.c:132:2: error: #error Unsupported *BSD Signed-off-by: Vinson Lee Reviewed-by: Brian Paul --- src/gallium/auxiliary/os/os_misc.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/auxiliary/os/os_misc.c b/src/gallium/auxiliary/os/os_misc.c index 4c5a22d..ebf033c 100644 --- a/src/gallium/auxiliary/os/os_misc.c +++ b/src/gallium/auxiliary/os/os_misc.c @@ -128,6 +128,8 @@ os_get_total_physical_memory(uint64_t *size) mib[1] = HW_PHYSMEM64; #elif defined(PIPE_OS_FREEBSD) mib[1] = HW_REALMEM; +#elif defined(PIPE_OS_DRAGONFLY) + mib[1] = HW_PHYSMEM; #else #error Unsupported *BSD #endif ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gallium: Add tokens for DragonFly BSD.
Module: Mesa Branch: master Commit: 5480d6b13f1c2748a24b5d0033653cd41d7b1c97 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5480d6b13f1c2748a24b5d0033653cd41d7b1c97 Author: Vinson Lee Date: Tue Sep 16 16:11:53 2014 -0700 gallium: Add tokens for DragonFly BSD. Signed-off-by: Vinson Lee Acked-by: Brian Paul --- src/gallium/include/pipe/p_config.h |6 ++ 1 file changed, 6 insertions(+) diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h index b5e7736..5b6db7d 100644 --- a/src/gallium/include/pipe/p_config.h +++ b/src/gallium/include/pipe/p_config.h @@ -218,6 +218,12 @@ #define PIPE_OS_UNIX #endif +#if defined(__DragonFly__) +#define PIPE_OS_DRAGONFLY +#define PIPE_OS_BSD +#define PIPE_OS_UNIX +#endif + #if defined(__GNU__) #define PIPE_OS_HURD #define PIPE_OS_UNIX ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): llvmpipe: Add missing LLVMGetGlobalContext() arg in lp_test_format.c.
Module: Mesa
Branch: master
Commit: 6a238ac0b7436c26cc236740d68cdc3eab3aea89
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a238ac0b7436c26cc236740d68cdc3eab3aea89
Author: Vinson Lee
Date: Tue Sep 30 21:52:13 2014 -0700
llvmpipe: Add missing LLVMGetGlobalContext() arg in lp_test_format.c.
Fix build error introduced with commit
eedbce9c63a3f385908bdc8a69e8be98dd3522ff.
lp_test_format.c: In function ‘test_format_unorm8’:
lp_test_format.c:226:4: error: too few arguments to function ‘gallivm_create’
gallivm = gallivm_create("test_module_unorm8");
^
In file included from
../../../../src/gallium/auxiliary/gallivm/lp_bld_format.h:38:0,
from lp_test_format.c:42:
../../../../src/gallium/auxiliary/gallivm/lp_bld_init.h:58:1: note: declared
here
gallivm_create(const char *name, LLVMContextRef context);
^
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84538
Signed-off-by: Vinson Lee
---
src/gallium/drivers/llvmpipe/lp_test_format.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c
b/src/gallium/drivers/llvmpipe/lp_test_format.c
index 8a81151..cdacb1b 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_format.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_format.c
@@ -223,7 +223,7 @@ test_format_unorm8(unsigned verbose, FILE *fp,
boolean success = TRUE;
unsigned i, j, k, l;
- gallivm = gallivm_create("test_module_unorm8");
+ gallivm = gallivm_create("test_module_unorm8", LLVMGetGlobalContext());
fetch = add_fetch_rgba_test(gallivm, verbose, desc, lp_unorm8_vec4_type());
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): pipe-loader: Include unistd.h in pipe_loader_drm.c for close function.
Module: Mesa Branch: master Commit: cc20c45a365cf18e58aa26fed615a496cbf73c70 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc20c45a365cf18e58aa26fed615a496cbf73c70 Author: Vinson Lee Date: Sat Sep 6 15:53:55 2014 -0700 pipe-loader: Include unistd.h in pipe_loader_drm.c for close function. This patch fixes a build error on DragonFly. CC libpipe_loader_la-pipe_loader_drm.lo pipe_loader_drm.c: In function 'pipe_loader_drm_probe': pipe_loader_drm.c:207:10: error: implicit declaration of function 'close' [-Werror=implicit-function-declaration] Signed-off-by: Vinson Lee Reviewed-by: Brian Paul --- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c |1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index f531dbf..ffeb299 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -33,6 +33,7 @@ #include #include #include +#include #ifdef HAVE_PIPE_LOADER_XCB ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): auxilary/os: Add Solaris support in os_get_total_physical_memory.
Module: Mesa
Branch: master
Commit: c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
Author: Vinson Lee
Date: Fri Aug 22 10:18:40 2014 -0700
auxilary/os: Add Solaris support in os_get_total_physical_memory.
The patch fixes the build on Oracle Solaris.
CC os/os_misc.lo
"os/os_misc.c", line 59: #error: unexpected platform in os_sysinfo.c
Signed-off-by: Vinson Lee
Reviewed-by: Emil Velikov
---
src/gallium/auxiliary/os/os_misc.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/os/os_misc.c
b/src/gallium/auxiliary/os/os_misc.c
index ef84c79..4c5a22d 100644
--- a/src/gallium/auxiliary/os/os_misc.c
+++ b/src/gallium/auxiliary/os/os_misc.c
@@ -47,7 +47,7 @@
#endif
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) ||
defined(PIPE_OS_SOLARIS)
# include
#elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD)
# include
@@ -111,7 +111,7 @@ os_get_option(const char *name)
bool
os_get_total_physical_memory(uint64_t *size)
{
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_CYGWIN) ||
defined(PIPE_OS_SOLARIS)
const long phys_pages = sysconf(_SC_PHYS_PAGES);
const long page_size = sysconf(_SC_PAGE_SIZE);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): SCons: Rename dri2_query_renderer.c to dri_common_query_renderer.c.
Module: Mesa Branch: master Commit: 1748ea8b2b5dafda5cb91f4b95620e0a1df7abea URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1748ea8b2b5dafda5cb91f4b95620e0a1df7abea Author: Vinson Lee Date: Thu Aug 21 12:22:18 2014 -0700 SCons: Rename dri2_query_renderer.c to dri_common_query_renderer.c. Fix SCons build error introduced with commit 3fe7daec14282dc8e2f5c8cc547927e305009677. Signed-off-by: Vinson Lee --- src/glx/SConscript |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glx/SConscript b/src/glx/SConscript index cc36bf0..473c5ab 100644 --- a/src/glx/SConscript +++ b/src/glx/SConscript @@ -81,7 +81,7 @@ sources = [ 'glxhash.c', 'dri2_glx.c', 'dri2.c', -'dri2_query_renderer.c', +'dri_common_query_renderer.c', #'dri3_glx.c', 'applegl_glx.c', ] ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): dri/xmlconfig: s/uint/unsigned int/
Module: Mesa
Branch: master
Commit: c40d7d6d948912a4d51cbf8f0854cf2ebe916636
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c40d7d6d948912a4d51cbf8f0854cf2ebe916636
Author: Vinson Lee
Date: Sun Aug 3 13:00:32 2014 -0700
dri/xmlconfig: s/uint/unsigned int/
This patch fixes this build error on Mac OS X.
./xmlconfig.h:61:5: error: unknown type name 'uint'; did you mean 'int'?
uint nRanges; /**< \brief Number of ranges */
^~~~
int
./xmlconfig.h:79:5: error: unknown type name 'uint'; did you mean 'int'?
uint tableSize;
^~~~
int
Signed-off-by: Vinson Lee
Reviewed-by: Brian Paul
---
src/mesa/drivers/dri/common/xmlconfig.h |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/common/xmlconfig.h
b/src/mesa/drivers/dri/common/xmlconfig.h
index af03234..8969843 100644
--- a/src/mesa/drivers/dri/common/xmlconfig.h
+++ b/src/mesa/drivers/dri/common/xmlconfig.h
@@ -58,7 +58,7 @@ typedef struct driOptionInfo {
char *name; /**< \brief Name */
driOptionType type; /**< \brief Type */
driOptionRange *ranges; /**< \brief Array of ranges */
-uint nRanges; /**< \brief Number of ranges */
+unsigned int nRanges; /**< \brief Number of ranges */
} driOptionInfo;
/** \brief Option cache
@@ -76,7 +76,7 @@ typedef struct driOptionCache {
* \li Default values in screen
* \li Actual values in contexts
*/
-uint tableSize;
+unsigned int tableSize;
/**< \brief Size of the arrays
*
* In the current implementation it's not actually a size but log2(size).
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glapi: Do not use backtrace on DragonFly.
Module: Mesa Branch: master Commit: bf3a26266d3f5da18a215c8c11ce75d01582e989 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf3a26266d3f5da18a215c8c11ce75d01582e989 Author: Vinson Lee Date: Thu Jun 19 14:31:24 2014 -0700 glapi: Do not use backtrace on DragonFly. execinfo.h is not available on DragonFly. Fixes this build error. CC glapi_gentable.lo glapi_gentable.c:44:22: fatal error: execinfo.h: No such file or directory Signed-off-by: Vinson Lee Reviewed-by: Brian Paul --- src/mapi/glapi/gen/gl_gentable.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py index 9db6a77..7577b66 100644 --- a/src/mapi/glapi/gen/gl_gentable.py +++ b/src/mapi/glapi/gen/gl_gentable.py @@ -42,7 +42,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i #endif #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ - || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__)) + || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) #define USE_BACKTRACE #endif ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure.ac: Add LLVM patch version to error message.
Module: Mesa
Branch: master
Commit: f6fc80734533140a69b30361fe0d4773a03515db
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f6fc80734533140a69b30361fe0d4773a03515db
Author: Vinson Lee
Date: Fri Jul 18 12:12:37 2014 -0700
configure.ac: Add LLVM patch version to error message.
Signed-off-by: Vinson Lee
Reviewed-by: Marek Olšák
---
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index bdcc989..744e55c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1884,7 +1884,7 @@ radeon_llvm_check() {
LLVM_REQUIRED_VERSION_MINOR="4"
LLVM_REQUIRED_VERSION_PATCH="2"
if test "${LLVM_VERSION_INT}${LLVM_VERSION_PATCH}" -lt
"${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}${LLVM_REQUIRED_VERSION_PATCH}";
then
-AC_MSG_ERROR([LLVM
$LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer is required
for $1])
+AC_MSG_ERROR([LLVM
$LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR.$LLVM_REQUIRED_VERSION_PATCH
or newer is required for $1])
fi
if test true && $LLVM_CONFIG --targets-built | grep -qvw 'R600' ; then
AC_MSG_ERROR([LLVM R600 Target not enabled. You can enable it when
building the LLVM
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glapi: Use GetProcAddress instead of dlsym on Windows.
Module: Mesa
Branch: master
Commit: e945a19b35025c962131b2c4b7393461445f08f2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e945a19b35025c962131b2c4b7393461445f08f2
Author: Vinson Lee
Date: Mon Jun 9 18:07:07 2014 -0700
glapi: Use GetProcAddress instead of dlsym on Windows.
This patch fixes this MinGW build error.
glapi_gentable.c: In function '_glapi_create_table_from_handle':
glapi_gentable.c:123:9: error: implicit declaration of function 'dlsym'
[-Werror=implicit-function-declaration]
*procp = dlsym(handle, symboln);
^
Signed-off-by: Vinson Lee
Acked-by: Brian Paul
---
src/mapi/glapi/gen/gl_gentable.py |4
1 file changed, 4 insertions(+)
diff --git a/src/mapi/glapi/gen/gl_gentable.py
b/src/mapi/glapi/gen/gl_gentable.py
index d45a5e0..9db6a77 100644
--- a/src/mapi/glapi/gen/gl_gentable.py
+++ b/src/mapi/glapi/gen/gl_gentable.py
@@ -134,7 +134,11 @@ body_template = """
if(!disp->%(name)s) {
void ** procp = (void **) &disp->%(name)s;
snprintf(symboln, sizeof(symboln), "%%s%(entry_point)s",
symbol_prefix);
+#ifdef _WIN32
+*procp = GetProcAddress(handle, symboln);
+#else
*procp = dlsym(handle, symboln);
+#endif
}
"""
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): glsl: Fix clang mismatched-tags warnings with glsl_type.
Module: Mesa
Branch: master
Commit: 4133c7126c8c694ee4b05da1f312c411c0f6fdeb
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4133c7126c8c694ee4b05da1f312c411c0f6fdeb
Author: Vinson Lee
Date: Sat Jun 14 23:37:41 2014 -0700
glsl: Fix clang mismatched-tags warnings with glsl_type.
Fix clang mismatched-tags warnings introduced with commit
4f5445a45d3ed02e00a061b10c943c0b079c6020.
./glsl_symbol_table.h:37:1: warning: class 'glsl_type' was previously declared
as a struct [-Wmismatched-tags]
class glsl_type;
^
./glsl_types.h:86:8: note: previous use is here
struct glsl_type {
^
./glsl_symbol_table.h:37:1: note: did you mean struct here?
class glsl_type;
^
Signed-off-by: Vinson Lee
Reviewed-by: Matt Turner
---
src/glsl/glsl_symbol_table.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/glsl/glsl_symbol_table.h b/src/glsl/glsl_symbol_table.h
index 39b84e4..2528264 100644
--- a/src/glsl/glsl_symbol_table.h
+++ b/src/glsl/glsl_symbol_table.h
@@ -34,7 +34,7 @@ extern "C" {
#include "ir.h"
class symbol_table_entry;
-class glsl_type;
+struct glsl_type;
/**
* Facade class for _mesa_symbol_table
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa/drivers: Fix clang constant-logical-operand warnings.
Module: Mesa
Branch: master
Commit: 32c55448602f8ed764005e72682f5f3979763321
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=32c55448602f8ed764005e72682f5f3979763321
Author: Vinson Lee
Date: Fri Jun 13 21:37:18 2014 -0700
mesa/drivers: Fix clang constant-logical-operand warnings.
This patch fixes several clang constant-logical-operand warnings such as
the following.
../../../../../src/mesa/tnl_dd/t_dd_tritmp.h:130:32: warning: use of logical
'||' with constant operand [-Wconstant-logical-operand]
if (DO_TWOSIDE || DO_OFFSET || DO_UNFILLED || DO_TWOSTENCIL)
^ ~~~
../../../../../src/mesa/tnl_dd/t_dd_tritmp.h:130:32: note: use '|' for a
bitwise operation
if (DO_TWOSIDE || DO_OFFSET || DO_UNFILLED || DO_TWOSTENCIL)
^~
|
Signed-off-by: Vinson Lee
Reviewed-by: Matt Turner
---
src/mesa/drivers/dri/i915/intel_tris.c |8
src/mesa/drivers/dri/r200/r200_swtcl.c |4 ++--
src/mesa/drivers/dri/radeon/radeon_maos_verts.c | 10 +-
src/mesa/drivers/dri/radeon/radeon_swtcl.c |4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c
b/src/mesa/drivers/dri/i915/intel_tris.c
index 97dbcbd..94d85ce 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -602,10 +602,10 @@ static struct
} rast_tab[INTEL_MAX_TRIFUNC];
-#define DO_FALLBACK (IND & INTEL_FALLBACK_BIT)
-#define DO_OFFSET (IND & INTEL_OFFSET_BIT)
-#define DO_UNFILLED (IND & INTEL_UNFILLED_BIT)
-#define DO_TWOSIDE (IND & INTEL_TWOSIDE_BIT)
+#define DO_FALLBACK ((IND & INTEL_FALLBACK_BIT) != 0)
+#define DO_OFFSET ((IND & INTEL_OFFSET_BIT) != 0)
+#define DO_UNFILLED ((IND & INTEL_UNFILLED_BIT) != 0)
+#define DO_TWOSIDE ((IND & INTEL_TWOSIDE_BIT) != 0)
#define DO_FLAT 0
#define DO_TRI 1
#define DO_QUAD 1
diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c
b/src/mesa/drivers/dri/r200/r200_swtcl.c
index 28604ea..07c64f8 100644
--- a/src/mesa/drivers/dri/r200/r200_swtcl.c
+++ b/src/mesa/drivers/dri/r200/r200_swtcl.c
@@ -411,8 +411,8 @@ static struct {
#define DO_FALLBACK 0
-#define DO_UNFILLED (IND & R200_UNFILLED_BIT)
-#define DO_TWOSIDE (IND & R200_TWOSIDE_BIT)
+#define DO_UNFILLED ((IND & R200_UNFILLED_BIT) != 0)
+#define DO_TWOSIDE ((IND & R200_TWOSIDE_BIT) != 0)
#define DO_FLAT 0
#define DO_OFFSET 0
#define DO_TRI 1
diff --git a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
index cb8c7b3..9a77850 100644
--- a/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
+++ b/src/mesa/drivers/dri/radeon/radeon_maos_verts.c
@@ -67,11 +67,11 @@ static struct {
_mesa_need_secondary_color(ctx))
#define DO_FOG ((IND & RADEON_CP_VC_FRMT_PKSPEC) && ctx->Fog.Enabled && \
(ctx->Fog.FogCoordinateSource == GL_FOG_COORD))
-#define DO_TEX0 (IND & RADEON_CP_VC_FRMT_ST0)
-#define DO_TEX1 (IND & RADEON_CP_VC_FRMT_ST1)
-#define DO_TEX2 (IND & RADEON_CP_VC_FRMT_ST2)
-#define DO_PTEX (IND & RADEON_CP_VC_FRMT_Q0)
-#define DO_NORM (IND & RADEON_CP_VC_FRMT_N0)
+#define DO_TEX0 ((IND & RADEON_CP_VC_FRMT_ST0) != 0)
+#define DO_TEX1 ((IND & RADEON_CP_VC_FRMT_ST1) != 0)
+#define DO_TEX2 ((IND & RADEON_CP_VC_FRMT_ST2) != 0)
+#define DO_PTEX ((IND & RADEON_CP_VC_FRMT_Q0) != 0)
+#define DO_NORM ((IND & RADEON_CP_VC_FRMT_N0) != 0)
#define DO_TEX3 0
diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c
b/src/mesa/drivers/dri/radeon/radeon_swtcl.c
index fae151a..abed7da 100644
--- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.c
@@ -536,8 +536,8 @@ static struct {
#define DO_FALLBACK 0
#define DO_OFFSET0
-#define DO_UNFILLED (IND & RADEON_UNFILLED_BIT)
-#define DO_TWOSIDE (IND & RADEON_TWOSIDE_BIT)
+#define DO_UNFILLED ((IND & RADEON_UNFILLED_BIT) != 0)
+#define DO_TWOSIDE ((IND & RADEON_TWOSIDE_BIT) != 0)
#define DO_FLAT 0
#define DO_TRI 1
#define DO_QUAD 1
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure.ac: Do not use Pthreads with MinGW.
Module: Mesa Branch: master Commit: 82c577acfa39aa45adef8bfbeae21945cb0ff7a3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82c577acfa39aa45adef8bfbeae21945cb0ff7a3 Author: Vinson Lee Date: Tue Jun 3 17:00:24 2014 -0700 configure.ac: Do not use Pthreads with MinGW. Match the behavior of the SCons MinGW build. This patch also fixes these build errors. CC glapi_entrypoint.lo glapi_entrypoint.c: In function 'init_glapi_relocs_once': glapi_entrypoint.c:341:4: error: unknown type name 'pthread_once_t' static pthread_once_t once_control = PTHREAD_ONCE_INIT; ^ glapi_entrypoint.c:341:41: error: 'PTHREAD_ONCE_INIT' undeclared (first use in this function) static pthread_once_t once_control = PTHREAD_ONCE_INIT; ^ glapi_entrypoint.c:341:41: note: each undeclared identifier is reported only once for each function it appears in glapi_entrypoint.c:342:4: error: implicit declaration of function 'pthread_once' [-Werror=implicit-function-declaration] pthread_once( & once_control, init_glapi_relocs ); ^ Signed-off-by: Vinson Lee Reviewed-by: Matt Turner --- configure.ac |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9c64400..a12f27a 100644 --- a/configure.ac +++ b/configure.ac @@ -552,7 +552,13 @@ dnl See if posix_memalign is available AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"]) dnl Check for pthreads -AX_PTHREAD +case "$host_os" in +mingw*) +;; +*) +AX_PTHREAD +;; +esac dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS dnl to -pthread, which causes problems if we need -lpthread to appear in dnl pkgconfig files. ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965: Add _default_ name changes to test_eu_compact.c.
Module: Mesa Branch: master Commit: dad22cc590a118c25c963c59784f6904c181bb58 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dad22cc590a118c25c963c59784f6904c181bb58 Author: Vinson Lee Date: Mon Jun 2 23:38:05 2014 -0700 i965: Add _default_ name changes to test_eu_compact.c. These were missed in commit e374809819d82f2e3e946fe809c4d46061ddc5b5. Fixes 'make check'. CC test_eu_compact.o test_eu_compact.c: In function ‘gen_f0_0_MOV_GRF_GRF’: test_eu_compact.c:222:4: error: implicit declaration of function ‘brw_set_predicate_control’ [-Werror=implicit-function-declaration] brw_set_predicate_control(p, true); ^ test_eu_compact.c: In function ‘run_tests’: test_eu_compact.c:270:6: error: implicit declaration of function ‘brw_set_access_mode’ [-Werror=implicit-function-declaration] brw_set_access_mode(p, BRW_ALIGN_16); ^ Signed-off-by: Vinson Lee --- src/mesa/drivers/dri/i965/test_eu_compact.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/test_eu_compact.c b/src/mesa/drivers/dri/i965/test_eu_compact.c index 231487d..809b557 100644 --- a/src/mesa/drivers/dri/i965/test_eu_compact.c +++ b/src/mesa/drivers/dri/i965/test_eu_compact.c @@ -219,7 +219,7 @@ gen_f0_0_MOV_GRF_GRF(struct brw_compile *p) struct brw_reg g2 = brw_vec8_grf(2, 0); brw_push_insn_state(p); - brw_set_predicate_control(p, true); + brw_set_default_predicate_control(p, true); brw_MOV(p, g0, g2); brw_pop_insn_state(p); } @@ -235,7 +235,7 @@ gen_f0_1_MOV_GRF_GRF(struct brw_compile *p) struct brw_reg g2 = brw_vec8_grf(2, 0); brw_push_insn_state(p); - brw_set_predicate_control(p, true); + brw_set_default_predicate_control(p, true); struct brw_instruction *mov = brw_MOV(p, g0, g2); mov->bits2.da1.flag_subreg_nr = 1; brw_pop_insn_state(p); @@ -265,11 +265,11 @@ run_tests(struct brw_context *brw) struct brw_compile *p = rzalloc(NULL, struct brw_compile); brw_init_compile(brw, p, p); -brw_set_predicate_control(p, BRW_PREDICATE_NONE); +brw_set_default_predicate_control(p, BRW_PREDICATE_NONE); if (align_16) - brw_set_access_mode(p, BRW_ALIGN_16); + brw_set_default_access_mode(p, BRW_ALIGN_16); else - brw_set_access_mode(p, BRW_ALIGN_1); + brw_set_default_access_mode(p, BRW_ALIGN_1); tests[i].func(p); assert(p->nr_insn == 1); ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): util: Do not use __builtin_clrsb with Intel C++ Compiler.
Module: Mesa
Branch: master
Commit: 83bba8f14603022c6c80bef95020e079d7cb73c0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=83bba8f14603022c6c80bef95020e079d7cb73c0
Author: Vinson Lee
Date: Fri May 30 19:40:26 2014 -0700
util: Do not use __builtin_clrsb with Intel C++ Compiler.
This patch fixes this build error with icc 14.0.2.
In file included from state_tracker/st_glsl_to_tgsi.cpp(63):
../../src/gallium/auxiliary/util/u_math.h(583): error: identifier
"__builtin_clrsb" is undefined
return 31 - __builtin_clrsb(i);
^
Signed-off-by: Vinson Lee
---
src/gallium/auxiliary/util/u_math.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/auxiliary/util/u_math.h
b/src/gallium/auxiliary/util/u_math.h
index 2ade64a..b9ed197 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -579,7 +579,7 @@ static INLINE unsigned util_last_bit(unsigned u)
*/
static INLINE unsigned util_last_bit_signed(int i)
{
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407)
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) &&
!defined(__INTEL_COMPILER)
return 31 - __builtin_clrsb(i);
#else
if (i >= 0)
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa/x86: Fix build with clang <= 3.3.
Module: Mesa Branch: master Commit: f0748b50146ed3cda77c625efea67b1b032e7737 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0748b50146ed3cda77c625efea67b1b032e7737 Author: Vinson Lee Date: Sun May 25 21:32:49 2014 -0700 mesa/x86: Fix build with clang <= 3.3. clang <= 3.3 cpuid.h does not define contants for feature bits. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79095 Signed-off-by: Vinson Lee --- src/mesa/x86/common_x86.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c index 261f491..b401c35 100644 --- a/src/mesa/x86/common_x86.c +++ b/src/mesa/x86/common_x86.c @@ -52,6 +52,8 @@ #if !defined(bit_SSE4_1) && defined(bit_SSE41) /* XXX: clang defines bit_SSE41 instead of bit_SSE4_1 */ #define bit_SSE4_1 bit_SSE41 +#elif !defined(bit_SSE4_1) && !defined(bit_SSE41) +#define bit_SSE4_1 0x0008 #endif #endif ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure.ac: Do not enable -Wl, --no-undefined on Mac OS X.
Module: Mesa Branch: master Commit: 5dd927bbfc36c8176536bb66a58467f97a1a3be3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5dd927bbfc36c8176536bb66a58467f97a1a3be3 Author: Vinson Lee Date: Wed May 21 22:13:13 2014 -0700 configure.ac: Do not enable -Wl,--no-undefined on Mac OS X. This patch fixes this build error on Mac OS X. CCLD libglapi.la clang: warning: argument unused during compilation: '-pthread' clang: warning: argument unused during compilation: '-pthread' ld: unknown option: --no-undefined clang: error: linker command failed with exit code 1 (use -v to see invocation) Signed-off-by: Vinson Lee --- configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b6e8049..76d1333 100644 --- a/configure.ac +++ b/configure.ac @@ -336,7 +336,7 @@ dnl OpenBSD does not have DT_NEEDED entries for libc by design dnl so when these flags are passed to ld via libtool the checks will fail dnl case "$host_os" in -openbsd*) +openbsd* | darwin* ) LD_NO_UNDEFINED="" ;; *) LD_NO_UNDEFINED="-Wl,--no-undefined" ;; ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): configure.ac: Remove -fstack-protector-strong from LLVM flags.
Module: Mesa
Branch: master
Commit: 8479edf3d7c693ad53f0285db03f1e2acfb777e1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8479edf3d7c693ad53f0285db03f1e2acfb777e1
Author: Vinson Lee
Date: Fri May 9 18:21:59 2014 -0700
configure.ac: Remove -fstack-protector-strong from LLVM flags.
-fstack-protector-strong is not supported by clang.
This patch fixes this build error on Fedora 20 with clang.
CXX gallivm/lp_bld_debug.lo
clang: error: unknown argument: '-fstack-protector-strong'
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75010
Signed-off-by: Vinson Lee
---
configure.ac |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 4e4d761..b6e8049 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1591,7 +1591,8 @@ strip_unwanted_llvm_flags() {
-e 's/-fno-exceptions\>//g' \
-e 's/-fomit-frame-pointer\>//g' \
-e 's/-fvisibility-inlines-hidden\>//g' \
- -e 's/-fPIC\>//g'
+ -e 's/-fPIC\>//g' \
+ -e 's/-fstack-protector-strong\>//g'
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): i965: Rename brw_disasm to brw_disassemble_inst.
Module: Mesa
Branch: master
Commit: 9e74de884a0595e577ebdfb7c7c13f4fd4d4dff5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e74de884a0595e577ebdfb7c7c13f4fd4d4dff5
Author: Vinson Lee
Date: Mon May 19 00:39:12 2014 -0700
i965: Rename brw_disasm to brw_disassemble_inst.
Fixes build error introduced with commit
4b04152db055babb8b06929a0c9ebea5c7f4fb92.
CC test_eu_compact.o
test_eu_compact.c: In function ‘test_compact_instruction’:
test_eu_compact.c:54:3: error: implicit declaration of function ‘brw_disasm’
[-Werror=implicit-function-declaration]
brw_disasm(stderr, &src, brw->gen, false);
^
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=7
Signed-off-by: Vinson Lee
---
src/mesa/drivers/dri/i965/test_eu_compact.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/test_eu_compact.c
b/src/mesa/drivers/dri/i965/test_eu_compact.c
index 8713918..231487d 100644
--- a/src/mesa/drivers/dri/i965/test_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/test_eu_compact.c
@@ -51,7 +51,7 @@ test_compact_instruction(struct brw_compile *p, struct
brw_instruction src)
if (memcmp(&unchanged, &dst, sizeof(dst))) {
fprintf(stderr, "Failed to compact, but dst changed\n");
fprintf(stderr, " Instruction: ");
-brw_disasm(stderr, &src, brw->gen, false);
+brw_disassemble_inst(stderr, &src, brw->gen, false);
return false;
}
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): gtest: Update to 1.7.0.
Module: Mesa Branch: master Commit: 36fb36aa36d8933fef04c1bdaed3ccc9b5108908 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=36fb36aa36d8933fef04c1bdaed3ccc9b5108908 Author: Vinson Lee Date: Wed Feb 26 22:54:24 2014 -0800 gtest: Update to 1.7.0. This patch fixes gtest build errors on Mac OS X 10.9. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73106 Signed-off-by: Vinson Lee Tested-by: Ian Romanick Acked-by: Ian Romanick --- src/gtest/include/gtest/gtest-death-test.h | 17 +- src/gtest/include/gtest/gtest-message.h| 74 +- src/gtest/include/gtest/gtest-param-test.h |2 +- src/gtest/include/gtest/gtest-param-test.h.pump|2 +- src/gtest/include/gtest/gtest-printers.h | 91 +- src/gtest/include/gtest/gtest-spi.h|2 +- src/gtest/include/gtest/gtest-test-part.h | 17 +- src/gtest/include/gtest/gtest.h| 304 +++-- src/gtest/include/gtest/gtest_pred_impl.h | 12 +- .../gtest/internal/gtest-death-test-internal.h | 21 +- src/gtest/include/gtest/internal/gtest-filepath.h | 14 +- src/gtest/include/gtest/internal/gtest-internal.h | 182 +-- .../include/gtest/internal/gtest-linked_ptr.h |8 +- .../gtest/internal/gtest-param-util-generated.h| 593 +++--- .../internal/gtest-param-util-generated.h.pump |2 +- .../include/gtest/internal/gtest-param-util.h |8 +- src/gtest/include/gtest/internal/gtest-port.h | 274 - src/gtest/include/gtest/internal/gtest-string.h| 217 +--- src/gtest/include/gtest/internal/gtest-tuple.h | 92 +- .../include/gtest/internal/gtest-tuple.h.pump | 13 +- src/gtest/include/gtest/internal/gtest-type-util.h | 21 +- .../include/gtest/internal/gtest-type-util.h.pump | 21 +- src/gtest/src/gtest-death-test.cc | 280 +++-- src/gtest/src/gtest-filepath.cc| 30 +- src/gtest/src/gtest-internal-inl.h | 242 +++- src/gtest/src/gtest-port.cc| 119 +- src/gtest/src/gtest-printers.cc| 101 +- src/gtest/src/gtest-test-part.cc |6 +- src/gtest/src/gtest-typed-test.cc |6 +- src/gtest/src/gtest.cc | 1241 +++- src/gtest/src/gtest_main.cc|5 +- 31 files changed, 2509 insertions(+), 1508 deletions(-) Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=36fb36aa36d8933fef04c1bdaed3ccc9b5108908 ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): radeon: Fix build.
Module: Mesa Branch: master Commit: e6c565fcc591f4856eff512f72e961ff0686475c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6c565fcc591f4856eff512f72e961ff0686475c Author: Vinson Lee Date: Mon Mar 10 22:49:51 2014 -0700 radeon: Fix build. Fix build error introduced with commit dfa25ea5cd19d5a050a1c94bd7370a2259b9f007. CC r600_streamout.lo r600_streamout.c:108:6: error: conflicting types for 'r600_set_streamout_targets' void r600_set_streamout_targets(struct pipe_context *ctx, ^ ./r600_pipe_common.h:413:6: note: previous declaration is here void r600_set_streamout_targets(struct pipe_context *ctx, ^ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76009 Signed-off-by: Vinson Lee --- src/gallium/drivers/radeon/r600_pipe_common.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index a178e9c..17867d3 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -413,7 +413,7 @@ void r600_streamout_buffers_dirty(struct r600_common_context *rctx); void r600_set_streamout_targets(struct pipe_context *ctx, unsigned num_targets, struct pipe_stream_output_target **targets, - unsigned *offset); + const unsigned *offset); void r600_emit_streamout_end(struct r600_common_context *rctx); void r600_streamout_init(struct r600_common_context *rctx); ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Add drivers/common/meta_generate_mipmap.c to src/ mesa/SConscript.
Module: Mesa Branch: master Commit: 98fb8c95c0bf73597c7a97be5b992fa96b945c1c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=98fb8c95c0bf73597c7a97be5b992fa96b945c1c Author: Vinson Lee Date: Fri Mar 7 23:39:29 2014 -0800 scons: Add drivers/common/meta_generate_mipmap.c to src/mesa/SConscript. This patch fixes this SCons build error introduced with commit 70e7905608b374f65d1f4b657f8ab61808c76ef6. build/linux-x86_64-debug/mesa/libmesa.a(driverfuncs.os): In function `_mesa_init_driver_functions': src/mesa/drivers/common/driverfuncs.c:99: undefined reference to `_mesa_meta_GenerateMipmap' Signed-off-by: Vinson Lee --- src/mesa/SConscript |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 7f4e419..cd959be 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -326,7 +326,8 @@ program_sources = [ common_driver_sources =[ 'drivers/common/driverfuncs.c', 'drivers/common/meta.c', -'drivers/common/meta_blit.c' +'drivers/common/meta_blit.c', +'drivers/common/meta_generate_mipmap.c' ] mesa_sources = ( ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Build with C++11 with LLVM >= 3.5.
Module: Mesa
Branch: master
Commit: f2d724c68662668b7c232ae0e5f018a82dfa0b3d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2d724c68662668b7c232ae0e5f018a82dfa0b3d
Author: Vinson Lee
Date: Sat Mar 1 18:31:07 2014 -0800
scons: Build with C++11 with LLVM >= 3.5.
Starting with llvm-3.5svn r202574, LLVM expects C+11 mode.
commit f8bc17fadc8f170c1126328d203f0dab78960137
Author: Chandler Carruth
Date: Sat Mar 1 06:31:00 2014 +
[C++11] Turn off compiler-based detection of R-value references, relying
on the fact that we now build in C++11 mode with modern compilers. This
should flush out any issues. If the build bots are happy with this, I'll
GC all the code for coping without R-value references.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202574
91177308-0d34-0410-b5e6-96231b3b80d8
Signed-off-by: Vinson Lee
---
scons/llvm.py |1 +
1 file changed, 1 insertion(+)
diff --git a/scons/llvm.py b/scons/llvm.py
index 6282cb5..134a072 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -204,6 +204,7 @@ def generate(env):
env.ParseConfig('llvm-config --ldflags')
if llvm_version >= distutils.version.LooseVersion('3.5'):
env.ParseConfig('llvm-config --system-libs')
+env.Append(CXXFLAGS = ['-std=c++11'])
except OSError:
print 'scons: llvm-config version %s failed' % llvm_version
return
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: Add GL_ARB_buffer_storage to dispatch_sanity.cpp.
Module: Mesa
Branch: master
Commit: f094866d93b772cc91844e012ad07ce4a78fda5d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f094866d93b772cc91844e012ad07ce4a78fda5d
Author: Vinson Lee
Date: Tue Feb 25 12:18:41 2014 -0800
mesa: Add GL_ARB_buffer_storage to dispatch_sanity.cpp.
Fixes 'make check' failure introduced with commit
119ffa7307d62e7310ce3902fded662ee4021c92.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75503
Signed-off-by: Vinson Lee
Reviewed-by: Ian Romanick
---
src/mesa/main/tests/dispatch_sanity.cpp |3 +++
1 file changed, 3 insertions(+)
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp
b/src/mesa/main/tests/dispatch_sanity.cpp
index 117a570..d1b0011 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -933,6 +933,9 @@ const struct function gl_core_functions_possible[] = {
{ "glVDPAUMapSurfacesNV", 11, -1 },
{ "glVDPAUUnmapSurfacesNV", 11, -1 },
+ /* GL_ARB_buffer_storage */
+ { "glBufferStorage", 43, -1 },
+
{ NULL, 0, -1 }
};
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): libgl-xlib: Fix xlib_sw_winsys.h include path.
Module: Mesa Branch: master Commit: 079773d1cb690d24dff40752e0a1842ba706d656 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=079773d1cb690d24dff40752e0a1842ba706d656 Author: Vinson Lee Date: Fri Feb 21 19:53:29 2014 -0800 libgl-xlib: Fix xlib_sw_winsys.h include path. This patch fixes this SCons build error introduced with commit 4f37e52f374b8b1d7177634dc09ab71e30e1779d. Compiling src/gallium/targets/libgl-xlib/xlib.c ... src/gallium/targets/libgl-xlib/xlib.c:35:42: fatal error: state_tracker/xlib_sw_winsys.h: No such file or directory #include "state_tracker/xlib_sw_winsys.h" ^ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75347 Signed-off-by: Vinson Lee --- src/gallium/targets/libgl-xlib/xlib.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c index c059a0e..1b62afb 100644 --- a/src/gallium/targets/libgl-xlib/xlib.c +++ b/src/gallium/targets/libgl-xlib/xlib.c @@ -32,7 +32,7 @@ */ #include "pipe/p_compiler.h" #include "util/u_debug.h" -#include "state_tracker/xlib_sw_winsys.h" +#include "sw/xlib/xlib_sw_winsys.h" #include "xm_public.h" #include "state_tracker/st_gl_api.h" ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa: Move declarations before code.
Module: Mesa
Branch: master
Commit: 24ce678f83ce232f795548c5d27ae36b22e27dc4
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=24ce678f83ce232f795548c5d27ae36b22e27dc4
Author: Vinson Lee
Date: Fri Feb 21 19:37:31 2014 -0800
mesa: Move declarations before code.
This patch fixes these MSVC build errors.
Compiling src\mesa\drivers\common\meta_blit.c ...
meta_blit.c
src\mesa\drivers\common\meta_blit.c(255) : error C2143: syntax error : missing
';' before 'type'
src\mesa\drivers\common\meta_blit.c(255) : error C2143: syntax error : missing
')' before 'type'
src\mesa\drivers\common\meta_blit.c(255) : error C2065: 'i' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(255) : warning C4552: '<' : operator has no
effect; expected operator with side-effect
src\mesa\drivers\common\meta_blit.c(255) : error C2059: syntax error : ')'
src\mesa\drivers\common\meta_blit.c(255) : error C2143: syntax error : missing
';' before '{'
src\mesa\drivers\common\meta_blit.c(258) : error C2065: 'i' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(263) : error C2143: syntax error : missing
';' before 'type'
src\mesa\drivers\common\meta_blit.c(263) : error C2143: syntax error : missing
')' before 'type'
src\mesa\drivers\common\meta_blit.c(263) : error C2065: 'step' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(263) : warning C4552: '<=' : operator has
no effect; expected operator with side-effect
src\mesa\drivers\common\meta_blit.c(263) : error C2059: syntax error : ')'
src\mesa\drivers\common\meta_blit.c(263) : error C2143: syntax error : missing
';' before '{'
src\mesa\drivers\common\meta_blit.c(264) : error C2143: syntax error : missing
';' before 'type'
src\mesa\drivers\common\meta_blit.c(264) : error C2143: syntax error : missing
')' before 'type'
src\mesa\drivers\common\meta_blit.c(264) : error C2065: 'i' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(264) : warning C4552: '<' : operator has no
effect; expected operator with side-effect
src\mesa\drivers\common\meta_blit.c(264) : error C2059: syntax error : ')'
src\mesa\drivers\common\meta_blit.c(264) : error C2065: 'step' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(264) : error C2143: syntax error : missing
';' before '{'
src\mesa\drivers\common\meta_blit.c(268) : error C2065: 'step' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(268) : error C2065: 'i' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(269) : error C2065: 'step' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(269) : error C2065: 'i' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(270) : error C2065: 'step' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(270) : error C2065: 'i' : undeclared
identifier
src\mesa\drivers\common\meta_blit.c(559) : warning C4244: 'function' :
conversion from 'const GLint' to 'GLfloat', possible loss of data
src\mesa\drivers\common\meta_blit.c(723) : warning C4244: 'function' :
conversion from 'const GLint' to 'GLfloat', possible loss of data
src\mesa\drivers\common\meta_blit.c(773) : warning C4244: 'function' :
conversion from 'const GLint' to 'GLfloat', possible loss of data
Signed-off-by: Vinson Lee
---
src/mesa/drivers/common/meta_blit.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/common/meta_blit.c
b/src/mesa/drivers/common/meta_blit.c
index 69c2590..112fbb1 100644
--- a/src/mesa/drivers/common/meta_blit.c
+++ b/src/mesa/drivers/common/meta_blit.c
@@ -218,16 +218,21 @@ setup_glsl_msaa_blit_shader(struct gl_context *ctx,
/* You can create 2D_MULTISAMPLE textures with 0 sample count (meaning 1
* sample). Yes, this is ridiculous.
*/
- int samples = MAX2(src_rb->NumSamples, 1);
+ int samples;
char *sample_resolve;
const char *arb_sample_shading_extension_string;
const char *merge_function;
+ samples = MAX2(src_rb->NumSamples, 1);
+
if (dst_is_msaa) {
arb_sample_shading_extension_string = "#extension
GL_ARB_sample_shading : enable";
sample_resolve = ralloc_asprintf(mem_ctx, " out_color =
texelFetch(texSampler, ivec2(texCoords), gl_SampleID);");
merge_function = "";
} else {
+ int i;
+ int step;
+
if (src_datatype == GL_INT) {
merge_function =
"ivec4 merge(ivec4 a, ivec4 b) { return (a >> ivec4(1)) + (b >>
Mesa (master): mesa: Move declarations before code.
Module: Mesa Branch: master Commit: 5a0b08e9ea5ee6075aee551b223e045e7506cb7d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a0b08e9ea5ee6075aee551b223e045e7506cb7d Author: Vinson Lee Date: Fri Feb 21 19:09:30 2014 -0800 mesa: Move declarations before code. This patch fixes these MSVC build errors introduced with 73b78f9c9f86dd38fb165f4730aeac9519635b07. Compiling src\mesa\main\uniforms.c ... uniforms.c src\mesa\main\uniforms.c(291) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(294) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(294) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(294) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 src\mesa\main\uniforms.c(306) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(309) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(309) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(309) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 src\mesa\main\uniforms.c(322) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(325) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(325) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(325) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 src\mesa\main\uniforms.c(345) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(348) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(348) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(348) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 src\mesa\main\uniforms.c(360) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(363) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(363) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(363) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 src\mesa\main\uniforms.c(376) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(379) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(379) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(379) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 src\mesa\main\uniforms.c(588) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(591) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(591) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(591) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 src\mesa\main\uniforms.c(603) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(606) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(606) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(606) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 src\mesa\main\uniforms.c(619) : error C2143: syntax error : missing ';' before 'type' src\mesa\main\uniforms.c(622) : error C2065: 'shProg' : undeclared identifier src\mesa\main\uniforms.c(622) : warning C4047: 'function' : 'gl_shader_program *' differs in levels of indirection from 'int' src\mesa\main\uniforms.c(622) : warning C4024: '_mesa_uniform' : different types for formal and actual parameter 2 Signed-off-by: Vinson Lee --- src/mesa/main/uniforms.c | 47 -- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 4c12366..c25c2df 100644 --- a/s
Mesa (master): mesa/sso: Change CreateShaderProgramv return type from uint to GLuint.
Module: Mesa Branch: master Commit: aaefc85f3b7c7bf5c0ab28344509ef4b291b4415 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aaefc85f3b7c7bf5c0ab28344509ef4b291b4415 Author: Vinson Lee Date: Fri Feb 21 17:16:14 2014 -0800 mesa/sso: Change CreateShaderProgramv return type from uint to GLuint. This patch fixes this MinGW build error. Compiling src/mapi/glapi/glapi_dispatch.c ... In file included from src/mapi/glapi/glapi_dispatch.c:41:0: build/windows-x86_64-debug/mapi/glapi/glapitable.h:930:4: error: expected specifier-qualifier-list before 'uint' uint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 886 */ ^ Signed-off-by: Vinson Lee --- src/mapi/glapi/gen/ARB_separate_shader_objects.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml index f996456..80234ea 100644 --- a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml +++ b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml @@ -28,7 +28,7 @@ - + ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): scons: Add main/pipelineobj.c to src/mesa/SConscript.
Module: Mesa Branch: master Commit: 34587e4a004a4ce6df8d8cbaaf2853f2183743db URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=34587e4a004a4ce6df8d8cbaaf2853f2183743db Author: Vinson Lee Date: Fri Feb 21 16:58:17 2014 -0800 scons: Add main/pipelineobj.c to src/mesa/SConscript. This patch fixes this SCons build error. build/linux-x86_64-debug/mesa/libmesa.a(context.os): In function `init_attrib_groups': src/mesa/main/context.c:815: undefined reference to `_mesa_init_pipeline' Signed-off-by: Vinson Lee --- src/mesa/SConscript |1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 29775a9..7f4e419 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -98,6 +98,7 @@ main_sources = [ 'main/pack.c', 'main/pbo.c', 'main/performance_monitor.c', +'main/pipelineobj.c', 'main/pixel.c', 'main/pixelstore.c', 'main/pixeltransfer.c', ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): mesa/sso: Fix typo of 'unsigned'.
Module: Mesa
Branch: master
Commit: 897a5fa3605c7cae95e9d8826f1119c0b44055f2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=897a5fa3605c7cae95e9d8826f1119c0b44055f2
Author: Vinson Lee
Date: Fri Feb 21 16:38:45 2014 -0800
mesa/sso: Fix typo of 'unsigned'.
Fix build error introduced with commit f4c13a890fa24ff1f998e7cac0ecc31505a29403.
CC pixeltransfer.lo
main/pipelineobj.c: In function '_mesa_delete_pipeline_object':
main/pipelineobj.c:59:4: error: unknown type name 'unsinged'
unsinged i;
^
Signed-off-by: Vinson Lee
---
src/mesa/main/pipelineobj.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index aaed9f9..54be4e0 100644
--- a/src/mesa/main/pipelineobj.c
+++ b/src/mesa/main/pipelineobj.c
@@ -56,7 +56,7 @@ void
_mesa_delete_pipeline_object(struct gl_context *ctx,
struct gl_pipeline_object *obj)
{
- unsinged i;
+ unsigned i;
_mesa_reference_shader_program(ctx, &obj->_CurrentFragmentProgram, NULL);
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): c11: Do not use pthread_mutex_timedlock on NetBSD.
Module: Mesa Branch: master Commit: a487b4d0e3dfdf21d9604d4e36c65c5113c4ce7a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a487b4d0e3dfdf21d9604d4e36c65c5113c4ce7a Author: Vinson Lee Date: Fri Jan 24 15:35:18 2014 -0800 c11: Do not use pthread_mutex_timedlock on NetBSD. This patch fixes the NetBSD build. NetBSD does not have pthread_mutex_timedlock. CC glapi_dispatch.lo threads_posix.h: In function 'mtx_timedlock': threads_posix.h:216:5: error: implicit declaration of function 'pthread_mutex_timedlock' Signed-off-by: Vinson Lee --- include/c11/threads_posix.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h index e54af39..7e96715 100644 --- a/include/c11/threads_posix.h +++ b/include/c11/threads_posix.h @@ -41,7 +41,7 @@ Configuration macro: Use pthread_mutex_timedlock() for `mtx_timedlock()' Otherwise use mtx_trylock() + *busy loop* emulation. */ -#if !defined(__CYGWIN__) && !defined(__APPLE__) +#if !defined(__CYGWIN__) && !defined(__APPLE__) && !defined(__NetBSD__) #define EMULATED_THREADS_USE_NATIVE_TIMEDLOCK #endif ___ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
Mesa (master): meta: Move loop variable declaration outside loop.
Module: Mesa
Branch: master
Commit: 6caf34b97e5d22f5910695e30941bea3d0bf2e46
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6caf34b97e5d22f5910695e30941bea3d0bf2e46
Author: Vinson Lee
Date: Tue Jan 21 22:46:39 2014 -0800
meta: Move loop variable declaration outside loop.
Fixes MSVC build error introduced with commit
69b258cb4636315b4c1aaaceeedd1eed8af98ba8.
meta.c(618) : error C2143: syntax error : missing ';' before 'type'
meta.c(618) : error C2143: syntax error : missing ')' before 'type'
meta.c(618) : error C2065: 'i' : undeclared identifier
meta.c(618) : warning C4552: '<' : operator has no effect; expected operator
with side-effect
meta.c(618) : error C2059: syntax error : ')'
meta.c(618) : error C2143: syntax error : missing ';' before '{'
meta.c(619) : error C2065: 'i' : undeclared identifier
meta.c(620) : error C2065: 'i' : undeclared identifier
Signed-off-by: Vinson Lee
---
src/mesa/drivers/common/meta.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 44fafac..2443a77 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -596,6 +596,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
}
if (state & MESA_META_SHADER) {
+ int i;
+
if (ctx->API == API_OPENGL_COMPAT && ctx->Extensions.ARB_vertex_program)
{
save->VertexProgramEnabled = ctx->VertexProgram.Enabled;
_mesa_reference_vertprog(ctx, &save->VertexProgram,
@@ -615,7 +617,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_set_enable(ctx, GL_FRAGMENT_SHADER_ATI, GL_FALSE);
}
- for (int i = 0; i < MESA_SHADER_STAGES; i++) {
+ for (i = 0; i < MESA_SHADER_STAGES; i++) {
_mesa_reference_shader_program(ctx, &save->Shader[i],
ctx->Shader.CurrentProgram[i]);
}
___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
