From ed320cc3d501179a642588c2aba13aef0d66f865ea65a01023c4903c59566f03 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 22 Oct 2008 16:22:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=47 --- Mesa.changes | 8 ++++ Mesa.spec | 9 +++- ...Lib-7.2_intel-2008-q3_793c3b9-46921a5.diff | 47 +++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff diff --git a/Mesa.changes b/Mesa.changes index 64eb9e1..3952bc8 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 21 06:01:30 CEST 2008 - sndirsch@suse.de + +- MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff + * i965: Fix a potential assertion failure. + * intel: GLSL 1.20 is broken in Mesa, so disable it in the i965 + driver + ------------------------------------------------------------------- Thu Oct 9 09:56:11 CEST 2008 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index e3b1caf..50679f0 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -27,12 +27,13 @@ Provides: xorg-x11-Mesa Obsoletes: xorg-x11-Mesa AutoReqProv: on Version: 7.2 -Release: 3 +Release: 5 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL Source: MesaLib-%{version}_intel-2008-q3_793c3b9.tar.bz2 Source1: MesaDemos-%{version}.tar.bz2 Source3: README.updates Source4: manual-pages.tar.bz2 +Patch: MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff Patch1: dri_driver_dir.diff Patch6: link-shared.diff Patch7: disable_gem_warning.diff @@ -116,6 +117,7 @@ test -f progs/ggi/asc-view.c && exit 1 rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # we use freeglut rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h} +%patch -p1 %patch1 sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile ### FIXME @@ -226,6 +228,11 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/libOSMesa.a %changelog +* Tue Oct 21 2008 sndirsch@suse.de +- MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff + * i965: Fix a potential assertion failure. + * intel: GLSL 1.20 is broken in Mesa, so disable it in the i965 + driver * Thu Oct 09 2008 sndirsch@suse.de - Mesa 7.2_intel-2008-q3_793c3b9 * Intel-2008-Q3-RC3 release (Mesa 7.2 + GEM code) diff --git a/MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff b/MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff new file mode 100644 index 0000000..3ef291f --- /dev/null +++ b/MesaLib-7.2_intel-2008-q3_793c3b9-46921a5.diff @@ -0,0 +1,47 @@ +commit c281d3d5caedf75eaa3c877f94656f982aad868d +Author: Xiang, Haihao +Date: Tue Oct 7 17:27:33 2008 +0800 + + i965: Fix a potential assertion failure. + (cherry picked from commit d01f9fa778cb0d230c697badaea078f6f37da743) + +diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c +index f148b10..89b7c2a 100644 +--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c ++++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c +@@ -365,8 +365,10 @@ static void brw_prepare_vertices(struct brw_context *brw) + if (i == 0) { + /* Position array not properly enabled: + */ +- if (input->glarray->StrideB == 0) +- return; ++ if (input->glarray->StrideB == 0) { ++ intel->Fallback = 1; ++ return; ++ } + + interleave = input->glarray->StrideB; + ptr = input->glarray->Ptr; +commit 46921a5ee832a3443894dcc98e065d2f535e899d +Author: Ian Romanick +Date: Fri Oct 10 11:47:43 2008 -0700 + + intel: GLSL 1.20 is broken in Mesa, so disable it in the i965 driver + (cherry picked from commit e7002694418cd0decb1cd0d9121f634480e5f0d6) + +diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c +index f394b98..4c04d08 100644 +--- a/src/mesa/drivers/dri/intel/intel_context.c ++++ b/src/mesa/drivers/dri/intel/intel_context.c +@@ -258,7 +258,11 @@ static const struct dri_extension brw_extensions[] = { + { "GL_ARB_point_sprite", NULL }, + { "GL_ARB_shader_objects", GL_ARB_shader_objects_functions }, + { "GL_ARB_shading_language_100", GL_VERSION_2_0_functions }, ++#if 0 ++ /* Support for GLSL 1.20 is currently broken in core Mesa. ++ */ + { "GL_ARB_shading_language_120", GL_VERSION_2_1_functions }, ++#endif + { "GL_ARB_shadow", NULL }, + { "GL_ARB_texture_non_power_of_two", NULL }, + { "GL_ARB_vertex_shader", GL_ARB_vertex_shader_functions },