Djam/mesa
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/mesa.git synced 2025-02-23 22:52:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "mesa 9.0 git, cooker, mageia sync"

Browse source 
This reverts commit 596e74cbaf650aaa4d75ac5fe32ebdffb0a2f8f2.
This commit is contained in:
Alexander Khryukin 2012-09-17 19:54:10 +04:00
parent 0105272617
commit 85bc9823b0
15 changed files with 630 additions and 730 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
"mesa-9.0-20120907.tar.bz2": a8be44f712ccf4b252816cc3ab44f321d527b16e
"MesaLib-8.0.4.tar.bz2": c64f8c03caf9ededd5f7011e246c42a649096c8c

37
0000-mcregisterinfo-llvm-3.1.patch Normal file
View file

@ -0,0 +1,37 @@
From 1633dcd890d97bd5e4d125d57f2f529f04d14477 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@freedesktop.org>
Date: Tue, 06 Mar 2012 06:00:40 +0000
Subject: gallivm: Pass in a MCRegisterInfo to MCInstPrinter on llvm-3.1.
llvm-3.1svn r152043 changes createMCInstPrinter to take an additional
MCRegisterInfo argument.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 11209da..b6849cb 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -243,7 +243,18 @@ lp_disassemble(const void* func)
int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
#endif
-#if HAVE_LLVM >= 0x0300
+#if HAVE_LLVM >= 0x0301
+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
+ if (!MRI) {
+ debug_printf("error: no register info for target %s\n", Triple.c_str());
+ return;
+ }
+#endif
+
+#if HAVE_LLVM >= 0x0301
+ OwningPtr<MCInstPrinter> Printer(
+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MRI, *STI));
+#elif HAVE_LLVM == 0x0300
OwningPtr<MCInstPrinter> Printer(
T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
#elif HAVE_LLVM >= 0x0208
--
cgit v0.9.0.2-2-gbebe

57
0001-Fix-undefined-symbols-in-libOSMesa-and-libglapi.patch
View file

@ -1,57 +0,0 @@
From 6a934ff6638352b2c28cf5a7452fed2f32853c17 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Sun, 5 Aug 2012 00:47:06 +0300
Subject: [PATCH] Fix undefined symbols in libOSMesa and libglapi
---
src/mapi/shared-glapi/Makefile.am | 2 +-
src/mesa/Makefile.am | 2 +-
src/mesa/drivers/osmesa/Makefile.am | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am
index 8db7688..8d41db2 100644
--- a/src/mapi/shared-glapi/Makefile.am
+++ b/src/mapi/shared-glapi/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/src/mapi/mapi/sources.mak
lib_LTLIBRARIES = libglapi.la
libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
-libglapi_la_LDFLAGS = -no-undefined
+libglapi_la_LDFLAGS = -no-undefined -pthread
include $(GLAPI)/gen/glapi_gen.mk
glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index bb70ed6..82b2f36 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -120,7 +120,7 @@ libmesa_la_SOURCES = \
$(MESA_CXX_FILES) \
$(MESA_ASM_FILES_FOR_ARCH)
-libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
+libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la -ldl
libmesa_la_LDFLAGS =
libmesagallium_la_SOURCES = \
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index dbee925..5a1d88e 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -39,6 +39,12 @@
lib@OSMESA_LIB@_la_LIBADD = \
$(top_builddir)/src/mesa/libmesa.la \
$(top_builddir)/src/mapi/glapi/libglapi.la
+lib@OSMESA_LIB@_la_LIBTOOLFLAGS = --tag=CXX
+
+if HAVE_SHARED_GLAPI
+lib@OSMESA_LIB@_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR)
+lib@OSMESA_LIB@_la_LIBADD += -lglapi
+endif
if BUILD_SHARED
# Provide compatibility with scripts for the old Mesa build system for
--
1.7.10

30
0001-createoprofilejiteventlistener-llvm-3.1.patch Normal file
View file

@ -0,0 +1,30 @@
From fe34006908f1ff99ada34d52c06fd80197e452ec Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@freedesktop.org>
Date: Wed, 14 Mar 2012 05:40:52 +0000
Subject: gallivm: Fix createOProfileJITEventListener namespace with llvm-3.1.
llvm-3.1svn r152620 refactored the OProfile profiling code.
createOProfileJITEventListener was moved from the llvm namespace to the
llvm::JITEventListener namespace.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index fe7616b..68f8808 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -62,7 +62,11 @@
extern "C" void
lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
{
+#if HAVE_LLVM >= 0x0301
+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
+#else
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
+#endif
}
--
cgit v0.9.0.2-2-gbebe

35
0002-mcinstrinfo-llvm-3.1.patch Normal file
View file

@ -0,0 +1,35 @@
From 4f513002f65c629576252b34efedf3c8c4531dfd Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@freedesktop.org>
Date: Tue, 03 Apr 2012 05:14:15 +0000
Subject: gallivm: Pass in a MCInstrInfo to createMCInstPrinter on llvm-3.1.
llvm-3.1svn r153860 makes MCInstrInfo available to the MCInstPrinter.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index c5afff0..9cf2094 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -251,11 +251,17 @@ lp_disassemble(const void* func)
debug_printf("error: no register info for target %s\n", Triple.c_str());
return;
}
+
+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
+ if (!MII) {
+ debug_printf("error: no instruction info for target %s\n", Triple.c_str());
+ return;
+ }
#endif
#if HAVE_LLVM >= 0x0301
OwningPtr<MCInstPrinter> Printer(
- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MRI, *STI));
+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
#elif HAVE_LLVM == 0x0300
OwningPtr<MCInstPrinter> Printer(
T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
--
cgit v0.9.0.2-2-gbebe

23
0003-mcregisterinfo_h-llvm-3.1.patch Normal file
View file

@ -0,0 +1,23 @@
From 563489e5c922481a9a506fc5405a3dacacd6082e Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 15 May 2012 12:10:26 +0000
Subject: gallivm: Add MCRegisterInfo.h to silence benign warnings about missing implementation.
Trivial.
---
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index 9cf2094..444b70a 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -53,6 +53,9 @@
#include <llvm/MC/MCInst.h>
#include <llvm/MC/MCInstPrinter.h>
#endif /* HAVE_LLVM >= 0x0207 */
+#if HAVE_LLVM >= 0x0301
+#include <llvm/MC/MCRegisterInfo.h>
+#endif /* HAVE_LLVM >= 0x0301 */
#include "util/u_math.h"
#include "util/u_debug.h"
--
cgit v0.9.0.2-2-gbebe

29
0004-cve-2012-2864.patch Normal file
View file

@ -0,0 +1,29 @@
From ff996cafce511dd8a6c4e066e409c23e147a670c Mon Sep 17 00:00:00 2001
From: Stéphane Marchesin <marcheu@chromium.org>
Date: Wed, 15 Aug 2012 00:15:54 +0000
Subject: glsl/linker: Avoid buffer over-run in parcel_out_uniform_storage::visit_field
When too may uniforms are used, the error will be caught in
check_resources (src/glsl/linker.cpp).
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Benoit Jacob <bjacob@mozilla.com>
---
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index 25dc1d7..eef9025 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -313,7 +313,7 @@ private:
const gl_texture_index target = base_type->sampler_index();
const unsigned shadow = base_type->sampler_shadow;
for (unsigned i = this->uniforms[id].sampler
- ; i < this->next_sampler
+ ; i < MIN2(this->next_sampler, MAX_SAMPLERS)
; i++) {
this->targets[i] = target;
this->shader_samplers_used |= 1U << i;
--
cgit v0.9.0.2-2-gbebe

36
0201-revert-fix-glxinitializevisualconfigfromtags-handling.patch
View file

@ -1,36 +0,0 @@
This patch should make invesalius work again (#59269).
Note that if you run your apps with LIBGL_DIAGNOSTIC=1 mesa will act as if this
patch was not applied (making invesalius crash).
It reverts the following commit from mesa 7.8 branch:
From ad7d36e91933a49ce3f6ed2c14ae585a8a84fdf5 Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner@nvidia.com>
Date: Thu, 22 Apr 2010 16:30:42 +0000
Subject: Fix __glXInitializeVisualConfigFromTags's handling of unrecognized
fbconfig tags.
__glXInitializeVisualConfigFromTags doesn't skip the payload of
unrecognized tags. Instead, it treats the value as if it were the
next tag, which can happen if the server's GLX extension is not
Mesa's. For example, this falls down when NVIDIA sends a
GLX_FLOAT_COMPONENTS_NV = 0 pair, causing
__glXInitializeVisualConfigFromTags to bail out early.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
diff -p -up ./src/glx/glxext.c.orig ./src/glx/glxext.c
--- ./src/glx/glxext.c.orig 2010-10-02 00:51:28.000000000 +0200
+++ ./src/glx/glxext.c 2010-10-05 21:04:00.000000000 +0200
@@ -568,9 +568,6 @@ __glXInitializeVisualConfigFromTags(stru
long int tagvalue = *bp++;
fprintf(stderr, "WARNING: unknown GLX tag from server: "
"tag 0x%lx value 0x%lx\n", tag, tagvalue);
- } else {
- /* Ignore the unrecognized tag's value */
- bp++;
}
break;
}

112
0202-radeon-llvm-Cleanup-makefile.patch
View file

@ -1,112 +0,0 @@
From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001
From: Tom Stellard <thomas.stellard@amd.com>
Date: Wed, 29 Aug 2012 13:01:15 +0000
Subject: [PATCH] radeon/llvm: Cleanup makefile
Hopefully, this will fix all the parallel make problems people have
been having.
---
src/gallium/drivers/radeon/Makefile | 24 +++++++++++-------------
src/gallium/drivers/radeon/Makefile.sources | 26 ++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
index 43f668a..7f1c613 100644
--- a/src/gallium/drivers/radeon/Makefile
+++ b/src/gallium/drivers/radeon/Makefile
@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3
HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td)
-gen: $(GENERATED_SOURCES)
-
SIRegisterInfo.td: SIGenRegisterInfo.pl
$(PERL) $^ > $@
@@ -38,37 +36,37 @@ endif
R600RegisterInfo.td: R600GenRegisterInfo.pl
$(PERL) $^ > $@
-AMDGPUGenRegisterInfo.inc: *.td
+AMDGPUGenRegisterInfo.inc: $(TD_FILES)
$(call tablegen, -gen-register-info, AMDGPU.td, $@)
-AMDGPUGenInstrInfo.inc: *.td
+AMDGPUGenInstrInfo.inc: $(TD_FILES)
$(call tablegen, -gen-instr-info, AMDGPU.td, $@)
-AMDGPUGenAsmWriter.inc: *.td
+AMDGPUGenAsmWriter.inc: $(TD_FILES)
$(call tablegen, -gen-asm-writer, AMDGPU.td, $@)
-AMDGPUGenDAGISel.inc: *.td
+AMDGPUGenDAGISel.inc: $(TD_FILES)
$(call tablegen, -gen-dag-isel, AMDGPU.td, $@)
-AMDGPUGenCallingConv.inc: *.td
+AMDGPUGenCallingConv.inc: $(TD_FILES)
$(call tablegen, -gen-callingconv, AMDGPU.td, $@)
-AMDGPUGenSubtargetInfo.inc: *.td
+AMDGPUGenSubtargetInfo.inc: $(TD_FILES)
$(call tablegen, -gen-subtarget, AMDGPU.td, $@)
-AMDGPUGenEDInfo.inc: *.td
+AMDGPUGenEDInfo.inc: $(TD_FILES)
$(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@)
-AMDGPUGenIntrinsics.inc: *.td
+AMDGPUGenIntrinsics.inc: $(TD_FILES)
$(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@)
-AMDGPUGenCodeEmitter.inc: *.td
+AMDGPUGenCodeEmitter.inc: $(TD_FILES)
$(call tablegen, -gen-emitter, AMDGPU.td, $@)
-AMDGPUGenMCCodeEmitter.inc: *.td
+AMDGPUGenMCCodeEmitter.inc: $(TD_FILES)
$(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@)
-AMDGPUGenDFAPacketizer.inc: *.td
+AMDGPUGenDFAPacketizer.inc: $(TD_FILES)
$(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@)
LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser)
diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
index 2eb1120..333dd03 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -1,4 +1,30 @@
+TD_FILES := \
+ AMDGPU.td \
+ AMDGPUInstrInfo.td \
+ AMDGPUInstructions.td \
+ AMDGPUIntrinsics.td \
+ AMDGPURegisterInfo.td \
+ AMDILBase.td \
+ AMDILInstrInfo.td \
+ AMDILIntrinsics.td \
+ AMDILRegisterInfo.td \
+ Processors.td \
+ R600InstrInfo.td \
+ R600Instructions.td \
+ R600Intrinsics.td \
+ R600IntrinsicsNoOpenCL.td \
+ R600IntrinsicsOpenCL.td \
+ R600RegisterInfo.td \
+ R600Schedule.td \
+ SIInstrFormats.td \
+ SIInstrInfo.td \
+ SIInstructions.td \
+ SIIntrinsics.td \
+ SIRegisterInfo.td \
+ SISchedule.td
+
+
GENERATED_SOURCES := \
R600Intrinsics.td \
R600RegisterInfo.td \
--
1.7.12

26
0203-radeon-llvm-Remove-R600InstrInfo.td-from-TD_FILES.patch
View file

@ -1,26 +0,0 @@
From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001
From: Tom Stellard <thomas.stellard@amd.com>
Date: Thu, 6 Sep 2012 14:05:22 +0000
Subject: [PATCH] radeon/llvm: Remove R600InstrInfo.td from TD_FILES
Fixes build bug introduced by
cebbdd4ac23725963207bf6f8fc7101150e6065f
---
src/gallium/drivers/radeon/Makefile.sources | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
index 333dd03..f387636 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -10,7 +10,6 @@ TD_FILES := \
AMDILIntrinsics.td \
AMDILRegisterInfo.td \
Processors.td \
- R600InstrInfo.td \
R600Instructions.td \
R600Intrinsics.td \
R600IntrinsicsNoOpenCL.td \
--
1.7.12

25
0900-Mips-support.patch Normal file
View file

@ -0,0 +1,25 @@
From b4ed9bb79c7911047294ba8ae081039927283dae Mon Sep 17 00:00:00 2001
From: Paulo Zanoni <pzanoni@mandriva.com>
Date: Thu, 6 Jan 2011 16:31:54 -0200
Subject: [PATCH] Mips support
---
include/GL/internal/sarea.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/include/GL/internal/sarea.h b/include/GL/internal/sarea.h
index a0d6084..369f589 100644
--- a/include/GL/internal/sarea.h
+++ b/include/GL/internal/sarea.h
@@ -44,6 +44,8 @@
#define SAREA_MAX 0x2000
#elif defined(__ia64__)
#define SAREA_MAX 0x10000 /* 64kB */
+#elif defined(__mips__)
+#define SAREA_MAX getpagesize()
#else
/* Intel 830M driver needs at least 8k SAREA */
#define SAREA_MAX 0x2000
--
1.7.1

44
0901-gallium-only-link-static-archives-between-ld-start-e.patch
View file

@ -1,44 +0,0 @@
From 62fd60132ce4162b66ec4f4ae10aaa357160e654 Mon Sep 17 00:00:00 2001
From: Olivier Blin <dev@blino.org>
Date: Sat, 4 Aug 2012 00:29:45 +0200
Subject: [PATCH] gallium: only link static archives between ld start/end
group options
llvmpipe test programs failed to link with --as-needed ld option
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52167
---
src/gallium/Makefile.template | 2 +-
src/gallium/drivers/llvmpipe/Makefile | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
index 036c119..c30477a 100644
--- a/src/gallium/Makefile.template
+++ b/src/gallium/Makefile.template
@@ -41,7 +41,7 @@ depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(GENERATED_SOURC
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null
$(PROGS): % : %.o $(PROGS_DEPS)
- $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group $(LIBS) -Wl,--end-group
+ $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group $(LIBS) -Wl,--end-group $(LDADD)
# Emacs tags
tags:
diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index ef16fc7..35f8fe8 100644
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -68,7 +68,8 @@ lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxil
$(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
LDFLAGS += $(LLVM_LDFLAGS)
-LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
+LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a
+LDADD += $(LLVM_LIBS) $(GL_LIB_DEPS)
LD=$(CXX)
$(PROGS): lp_test_main.o libllvmpipe.a
--
1.7.11.4

33
Mesa-8.0.1-libva-0.32.patch Normal file
View file

@ -0,0 +1,33 @@
--- Mesa-8.0.1/configure.ac.bero 2012-02-15 00:44:00.000000000 +0100
+++ Mesa-8.0.1/configure.ac 2012-03-05 21:01:55.852793760 +0100
@@ -1578,7 +1578,7 @@ if test "x$enable_vdpau" = xyes; then
fi
if test "x$enable_va" = xyes; then
- PKG_CHECK_MODULES([LIBVA], [libva = 0.31.1])
+ PKG_CHECK_MODULES([LIBVA], [libva >= 0.31.1])
AC_MSG_WARN([vaapi state tracker currently unmaintained])
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS va"
HAVE_ST_VA="yes"
--- Mesa-8.0.1/src/gallium/state_trackers/va/va_context.c.bero 2012-03-05 21:07:33.926812999 +0100
+++ Mesa-8.0.1/src/gallium/state_trackers/va/va_context.c 2012-03-05 21:08:53.236817512 +0100
@@ -39,6 +39,8 @@
#include "va_private.h"
+static struct VADriverVTable vTable;
+
PUBLIC VAStatus
__vaDriverInit_0_31(VADriverContextP ctx)
{
@@ -59,8 +61,9 @@ __vaDriverInit_0_31(VADriverContextP ctx
return VA_STATUS_ERROR_ALLOCATION_FAILED;
}
+ vTable = vlVaGetVtable();
ctx->str_vendor = "mesa gallium vaapi";
- ctx->vtable = vlVaGetVtable();
+ ctx->vtable = &vTable;
ctx->max_attributes = 1;
ctx->max_display_attributes = 1;
ctx->max_entrypoints = VA_MAX_ENTRYPOINTS;

73
mesa-driver-install Executable file
View file

@ -0,0 +1,73 @@
#!/bin/bash
#
# Copyright 2005 by Red Hat, Inc.
# Author: Mike A. Harris <mharris@redhat.com>
#
# License: MIT/X11
# <FIXME: Insert legal terms here>
# redhat-mesa-driver-install:
#
# The purpose of this script is to address some inadequacies of the current
# Mesa 6.3.2 upstream install script. We ship DRI on some OS/arch
# combinations, and disable it on other combinations, so we need a simple
# way to control wether or not DRI modules will get installed, and an easy
# way of specifying which drivers we'll ship on a particular OS/arch
# combination.
#---------------------------------------------------------------------
# NOTE: FC5's current kernel has the following DRM modules. Some of them
# shouldn't be there at all (ppc64), some don't make much sense (via on
# ppc). We'll have to talk to kernel folk to get the ones disabled that
# don't make sense, or which we don't want to ship for some reason or
# another.
#
# for a in i586 i686 ia64 ppc ppc64 s390x x86_64 ; do (echo -n "${a}:" \
# rpm -qlp <path to kernel src.rpm with all arch components replaced by $a) | \
# grep /drm/ | sed -e 's;.*/;;g' |xargs echo ) ;done
#
# i586: drm.ko i810.ko i830.ko i915.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# i686: drm.ko i810.ko i830.ko i915.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# ia64: drm.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# ppc: drm.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# ppc64: drm.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
# s390x:
# x86_64: drm.ko i810.ko i830.ko i915.ko mga.ko r128.ko radeon.ko savage.ko sis.ko tdfx.ko via.ko
#---------------------------------------------------------------------
# Define list of all of the DRI drivers Mesa builds by default.
DRI_DRIVERS_ALL="ffb i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome"
# Current build architecture, passed by rpm spec
if [ $# -gt 0 ] ; then
echo "Usage: ${0##*/}"
echo " Be sure to set 'DRIMODULE_SRCDIR=<libdir>' first"
echo " Be sure to set 'DRIMODULE_DESTDIR=<moduledir>' first"
echo " Be sure to set 'DRI_DRIVERS=<drivers>' first"
exit 1
fi
if [ -z $DRIMODULE_SRCDIR ] ; then
echo "Error: DRIMODULE_SRCDIR not set in environment"
exit
fi
if [ -z $DRIMODULE_DESTDIR ] ; then
echo "Error: DRIMODULE_DESTDIR not set in environment"
exit
else
[ ! -d $DRIMODULE_DESTDIR ] && mkdir -p $DRIMODULE_DESTDIR
fi
#DRIMODULE_DESTDIR=${1##DRIMODULE_DESTDIR=}
ARCH=$1
if [ -z "$DRI_DRIVERS" ]; then
DRI_DRIVERS="$DRI_DRIVERS_ALL"
fi
# Install DRI drivers
for driver in $DRI_DRIVERS ; do
set -vx
install -m 0755 $DRIMODULE_SRCDIR/${driver}_dri.so $DRIMODULE_DESTDIR/
set -
done

798
mesa.spec
View file

File diff suppressed because it is too large Load diff