From c30d5eefc96925b4bef781806c7a0114eca1b8e0 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 26 Jun 2014 09:30:29 +0200
Subject: Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb
xcb-proto mesa xserver git update 26 June 2014
xserver commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37
libxcb commit 125135452a554e89e49448e2c1ee6658324e1095
libxcb/xcb-proto commit 84bfd909bc3774a459b11614cfebeaa584a1eb38
xkeyboard-config commit 39a226707b133ab5540c2d30176cb3857e74dcca
libX11 commit a4679baaa18142576d42d423afe816447f08336c
fontconfig commit 274f2181f294af2eff3e8db106ec8d7bab2d3ff1
mesa commit 9a8acafa47558cafeb37f80f4b30061ac1962c69
---
mesalib/src/gallium/Automake.inc | 57 ++++++++-------------------
mesalib/src/gallium/SConscript | 20 ----------
mesalib/src/gallium/auxiliary/util/u_format.c | 11 ++++++
mesalib/src/gallium/auxiliary/util/u_format.h | 3 ++
4 files changed, 31 insertions(+), 60 deletions(-)
(limited to 'mesalib/src/gallium')
diff --git a/mesalib/src/gallium/Automake.inc b/mesalib/src/gallium/Automake.inc
index 97735abe0..8bf2a12e8 100644
--- a/mesalib/src/gallium/Automake.inc
+++ b/mesalib/src/gallium/Automake.inc
@@ -41,6 +41,7 @@ GALLIUM_DRI_CFLAGS = \
GALLIUM_VIDEO_CFLAGS = \
-I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/loader \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
@@ -58,22 +59,6 @@ GALLIUM_DRI_LINKER_FLAGS = \
-avoid-version \
$(GC_SECTIONS)
-GALLIUM_VDPAU_LINKER_FLAGS = \
- -shared \
- -module \
- -no-undefined \
- -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
- $(GC_SECTIONS) \
- $(LD_NO_UNDEFINED)
-
-GALLIUM_XVMC_LINKER_FLAGS = \
- -shared \
- -module \
- -no-undefined \
- -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
- $(GC_SECTIONS) \
- $(LD_NO_UNDEFINED)
-
GALLIUM_OMX_LINKER_FLAGS = \
-shared \
-module \
@@ -86,12 +71,6 @@ if HAVE_LD_VERSION_SCRIPT
GALLIUM_DRI_LINKER_FLAGS += \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym
-GALLIUM_VDPAU_LINKER_FLAGS += \
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau.sym
-
-GALLIUM_XVMC_LINKER_FLAGS += \
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc.sym
-
GALLIUM_OMX_LINKER_FLAGS += \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym
endif
@@ -111,20 +90,6 @@ GALLIUM_DRI_LIB_DEPS = \
$(EXPAT_LIBS) \
$(GALLIUM_COMMON_LIB_DEPS)
-GALLIUM_VDPAU_LIB_DEPS = \
- $(top_builddir)/src/gallium/auxiliary/libgallium.la \
- $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
- $(VDPAU_LIBS) \
- $(LIBDRM_LIBS) \
- $(GALLIUM_COMMON_LIB_DEPS)
-
-GALLIUM_XVMC_LIB_DEPS = \
- $(top_builddir)/src/gallium/auxiliary/libgallium.la \
- $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
- $(XVMC_LIBS) \
- $(LIBDRM_LIBS) \
- $(GALLIUM_COMMON_LIB_DEPS)
-
GALLIUM_OMX_LIB_DEPS = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
@@ -141,13 +106,25 @@ GALLIUM_WINSYS_CFLAGS = \
if HAVE_MESA_LLVM
GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS)
-GALLIUM_VDPAU_LINKER_FLAGS += $(LLVM_LDFLAGS)
-GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS)
GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS)
GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS)
-GALLIUM_VDPAU_LIB_DEPS += $(LLVM_LIBS)
-GALLIUM_XVMC_LIB_DEPS += $(LLVM_LIBS)
GALLIUM_OMX_LIB_DEPS += $(LLVM_LIBS)
endif
+
+
+GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
+ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la
+
+if HAVE_DRISW
+GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
+ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
+endif
+
+if NEED_WINSYS_XLIB
+GALLIUM_PIPE_LOADER_WINSYS_LIBS += \
+ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
+ -lX11 -lXext -lXfixes \
+ $(LIBDRM_LIBS)
+endif
diff --git a/mesalib/src/gallium/SConscript b/mesalib/src/gallium/SConscript
index 32bbdbe56..598b2f1ec 100644
--- a/mesalib/src/gallium/SConscript
+++ b/mesalib/src/gallium/SConscript
@@ -21,12 +21,6 @@ SConscript([
'drivers/trace/SConscript',
])
-if not env['msvc']:
- # These drivers do not build on MSVC compilers
- SConscript([
- 'drivers/i915/SConscript',
- ])
-
#
# State trackers
#
@@ -66,11 +60,6 @@ if env['platform'] == 'windows':
'winsys/sw/gdi/SConscript',
])
-if not env['msvc']:
- SConscript([
- 'winsys/i915/sw/SConscript',
- ])
-
if env['platform'] == 'haiku':
SConscript([
'winsys/sw/hgl/SConscript',
@@ -85,11 +74,6 @@ if env['dri']:
'winsys/svga/drm/SConscript',
])
- if env['drm_intel']:
- SConscript([
- 'winsys/i915/drm/SConscript',
- ])
-
#
# Targets
#
@@ -126,10 +110,6 @@ if not env['embedded']:
'targets/dri-swrast/SConscript',
'targets/dri-vmwgfx/SConscript',
])
- if env['drm_intel']:
- SConscript([
- 'targets/dri-i915/SConscript',
- ])
#
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.c b/mesalib/src/gallium/auxiliary/util/u_format.c
index 056f82f72..a53ed6f29 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.c
+++ b/mesalib/src/gallium/auxiliary/util/u_format.c
@@ -187,6 +187,17 @@ util_format_is_intensity(enum pipe_format format)
return FALSE;
}
+boolean
+util_format_is_subsampled_422(enum pipe_format format)
+{
+ const struct util_format_description *desc =
+ util_format_description(format);
+
+ return desc->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED &&
+ desc->block.width == 2 &&
+ desc->block.height == 1 &&
+ desc->block.bits == 32;
+}
boolean
util_format_is_supported(enum pipe_format format, unsigned bind)
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.h b/mesalib/src/gallium/auxiliary/util/u_format.h
index 1dd5d52f1..2e2bf0240 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.h
+++ b/mesalib/src/gallium/auxiliary/util/u_format.h
@@ -663,6 +663,9 @@ util_format_is_luminance_alpha(enum pipe_format format);
boolean
util_format_is_intensity(enum pipe_format format);
+boolean
+util_format_is_subsampled_422(enum pipe_format format);
+
boolean
util_format_is_pure_integer(enum pipe_format format);
--
cgit v1.2.3