rpms/mesa/devel mesa-7.0.1-stable-branch.patch, 1.1, 1.2 mesa.spec, 1.140, 1.141 mesa-6.5.2-hush-synthetic-visual-warning.patch, 1.1, NONE mesa-7.0-i-already-defined-glapi-you-twit.patch, 1.1, NONE mesa-7.0.1-965-sampler-crash.patch, 1.1, NONE
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Fri Sep 28 02:34:14 UTC 2007
Author: airlied
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23872
Modified Files:
mesa-7.0.1-stable-branch.patch mesa.spec
Removed Files:
mesa-6.5.2-hush-synthetic-visual-warning.patch
mesa-7.0-i-already-defined-glapi-you-twit.patch
mesa-7.0.1-965-sampler-crash.patch
Log Message:
* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 7.0.1-6
- mesa-7.0.1-stable-branch.patch - Updated to close to 7.0.2-rc1
- This contains the fixes made to the upstream Mesa stable branch
including fixes for 965 vblank interrupt issues along with a fix
in the kernel - remove patches that already upstream.
- mesa-6.5.2-hush-synthetic-visual-warning.patch - dropped
- mesa-7.0-i-already-defined-glapi-you-twit.patch - dropped
- mesa-7.0.1-965-sampler-crash.patch - dropped
mesa-7.0.1-stable-branch.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 mesa-7.0.1-stable-branch.patch
Index: mesa-7.0.1-stable-branch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.0.1-stable-branch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-7.0.1-stable-branch.patch 15 Aug 2007 10:17:48 -0000 1.1
+++ mesa-7.0.1-stable-branch.patch 28 Sep 2007 02:34:11 -0000 1.2
@@ -1,4 +1,7 @@
-Brian (21):
+Adam Jackson (1):
+ Unbreak Linux builds with -fvisibility=hidden.
+
+Brian (64):
added md5 sums
fix even-sized point positioning (bug 11874)
Merge branch 'mesa_7_0_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into mesa_7_0_branch
@@ -20,18 +23,101 @@
added some temporary texobj ref counting debug output
more tex obj ref count debugging (temporary)
Added _mesa_free_attrib_data() to free anything left in the attribute stack upon context destruction.
+ copy Target in _mesa_copy_texture_object()
+ Rewrite quite a bit of the code for glPush/PopAttrib() for texture state.
+ more debug output (context destroy, fb destroy)
+ log deleting/binding of FBOs
+ Remove recent texobj refcount debug/logging code.
+ don't map buffer in _mesa_validate_DrawElements() unless needed
+ refactor bounds checking code
+ remove unneeded CallStack array
+ remove CallDepth++/-- accidentally removed in prev commit
+ new __gluInvertMatrix() function (Mesa bug 6748)
+ Fixed bugs 6748, 12141
+ s/movaps/movups/ (see bug 12216)
+ fix i965 bugs, x86-64 bugs
+ sync with trunk, fixing bug 12239
+ Use temporary matrix in __gluInvertMatrixd() to fix aliasing problem (see bugs 12269, 6748)
+ updated VC7 project files
+ clean-up (see bug 12317)
+ fix comment
+ Update depth test state when binding new framebuffer object
+ In _mesa_make_current(), don't unbind FBOs from the old context.
+ fix indirect rendering crash
+ updated with pkg-config info
+ added DSTDIR, pkg-config items
+ added .pc.in files to tarballs
+ Fix state.texgen parsing error (bug 12313).
+ added program_error2() function for better error reporting
+ fix ARB fp/vp parsing bug 12313
+ fix copypixels overlap test bug (#12417)
+ fix glCopyPixel/glPixelZoom bug 12417)
+ updated link
+ From trunk: mesa: bind VBO_ATTRIB_XXX to correct input array when executing a display list. fix #10604
+ fix bug 10604
+ Added bluegene-xlc-osmesa config (Alexander Neundorf)
+ fixes for bluegene-xlc-osmesa config
+ added bluegene-xlc-osmesa, fortran fixes
+ fix for __IBMC__
+ fix -D_BSD_SOURC
+ fix DrawRangeElements error msg
+ Restore old _TriangleCaps code to fix Blender problem (bug 12164)
+ fix blend bug 12164
+ bump versions to 7.0.2
+ for Miniglx, use git sources
+ prep for 7.0.2 release
+
+Christoph Kubisch (1):
+ updated VC7 project files
+
+Colin McDonald (1):
+ fixed problem with big glDrawArrays (see bug 12141)
+
+Dan Nicholson (2):
+ DESTDIR support.
+ pkg-config support
Dan Torop (1):
fix spantmp2 READ_RGBA inline asm (#11931)
-Michel Dänzer (1):
+Dave Airlie (1):
+ i965: fix vblank on 965gm laptops by bringing in code from i915
+
+Michel Dänzer (2):
i915tex: Make sure pitch is aligned properly for render-to-texture.
+ i915tex: Unreference texture buffers on context destruction.
+
+Roland Bär (1):
+ [i965] Bug #11812: Fix fwrite return value checks in AUB file code.
+
+Roland Scheidegger (2):
+ suppress warning about ncon visuals (bug #6689)
+ fix another occurence of movaps which might not be aligned
Wang Zhenyu (1):
i915tex: Add support for 945GME
+Xiang, Haihao (13):
+ i965: flush batch buffer when getting the maximum. This makes
+ i965: samplers group in fours in WM_STATE. fix bug#9415
+ i965: check NULL pointer. fix bug#12193
+ i965: store read drawable info in intel_context. Some OpenGL
+ i965: Take the upper limitation on LOD into account.
+ fix bug#11009
+ i965: limit on LOD Bias, fix#11987
+ i965: take the secondary color into account when drawing
+ i965: fix #11378
+ i965: fix bug#11925
+ i965: The cube map texture coordinates must be devided by the
+ i965: handle all unfilled mode in clip stage. fix bug #12453
+ mesa: make sure the gotten value isn't greater than the
+
+Zou Nan hai (2):
+ fix a bug in 965 ARB_occlusion_query,
+ fix fd.o bug #12217, recalcuate urb when clip plane size change
+
diff --git a/Makefile b/Makefile
-index 3cab262..56efa83 100644
+index 3cab262..e05e0e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
@@ -42,7 +128,15 @@
TOP = .
SUBDIRS = src progs
-@@ -156,7 +154,7 @@ sunos5-v9 \
+@@ -70,6 +68,7 @@ aix-gcc \
+ aix-static \
+ beos \
+ bluegene-osmesa \
++bluegene-xlc-osmesa \
+ darwin \
+ darwin-static \
+ darwin-static-x86ppc \
+@@ -156,7 +155,7 @@ sunos5-v9 \
sunos5-v9-static \
sunos5-v9-cc-g++ \
ultrix-gcc:
@@ -51,12 +145,207 @@
echo "Please run 'make realclean' before changing configs" ; \
exit 1 ; \
fi
+@@ -166,10 +165,10 @@ ultrix-gcc:
+
+ # Rules for making release tarballs
+
+-DIRECTORY = Mesa-7.0.1
+-LIB_NAME = MesaLib-7.0.1
+-DEMO_NAME = MesaDemos-7.0.1
+-GLUT_NAME = MesaGLUT-7.0.1
++DIRECTORY = Mesa-7.0.2-rc1
++LIB_NAME = MesaLib-7.0.2-rc1
++DEMO_NAME = MesaDemos-7.0.2-rc1
++GLUT_NAME = MesaGLUT-7.0.2-rc1
+
+ MAIN_FILES = \
+ $(DIRECTORY)/Makefile* \
+@@ -213,6 +212,7 @@ MAIN_FILES = \
+ $(DIRECTORY)/src/mesa/Makefile* \
+ $(DIRECTORY)/src/mesa/sources \
+ $(DIRECTORY)/src/mesa/descrip.mms \
++ $(DIRECTORY)/src/mesa/gl.pc.in \
+ $(DIRECTORY)/src/mesa/depend \
+ $(DIRECTORY)/src/mesa/main/*.[chS] \
+ $(DIRECTORY)/src/mesa/main/descrip.mms \
+@@ -320,6 +320,7 @@ DRI_FILES = \
+ SGI_GLU_FILES = \
+ $(DIRECTORY)/src/glu/Makefile \
+ $(DIRECTORY)/src/glu/descrip.mms \
++ $(DIRECTORY)/src/glu/glu.pc.in \
+ $(DIRECTORY)/src/glu/sgi/Makefile \
+ $(DIRECTORY)/src/glu/sgi/Makefile.mgw \
+ $(DIRECTORY)/src/glu/sgi/Makefile.win \
+@@ -396,6 +397,7 @@ GLUT_FILES = \
+ $(DIRECTORY)/include/GL/glutf90.h \
+ $(DIRECTORY)/src/glut/glx/Makefile* \
+ $(DIRECTORY)/src/glut/glx/depend \
++ $(DIRECTORY)/src/glut/glx/glut.pc.in \
+ $(DIRECTORY)/src/glut/glx/*def \
+ $(DIRECTORY)/src/glut/glx/descrip.mms \
+ $(DIRECTORY)/src/glut/glx/mms_depend \
+@@ -418,6 +420,7 @@ DEPEND_FILES = \
+ $(TOP)/src/mesa/depend \
+ $(TOP)/src/glx/x11/depend \
+ $(TOP)/src/glw/depend \
++ $(TOP)/src/glw/glw.pc.in \
+ $(TOP)/src/glut/glx/depend \
+ $(TOP)/src/glu/sgi/depend
+
+diff --git a/configs/bluegene-xlc-osmesa b/configs/bluegene-xlc-osmesa
+new file mode 100644
+index 0000000..b0c762d
+--- /dev/null
++++ b/configs/bluegene-xlc-osmesa
+@@ -0,0 +1,29 @@
++# Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
++# This doesn't really have a lot of dependencies, so it should be usable
++# on similar systems too.
++# It uses static linking and disables multithreading.
++
[...3033 lines suppressed...]
+ #include "enums.h"
+-#include "program.h"
+-#include "prog_instruction.h"
+-#include "prog_parameter.h"
+-#include "prog_print.h"
+-#include "prog_statevars.h"
++#include "shader/program.h"
++#include "shader/prog_instruction.h"
++#include "shader/prog_parameter.h"
++#include "shader/prog_print.h"
++#include "shader/prog_statevars.h"
+ #include "t_context.h" /* NOTE: very light dependency on this */
+ #include "t_vp_build.h"
+
+@@ -457,9 +457,13 @@ static void register_matrix_param5( struct tnl_program *p,
+ }
+
+
++/**
++ * Convert a ureg source register to a prog_src_register.
++ */
+ static void emit_arg( struct prog_src_register *src,
+ struct ureg reg )
+ {
++ assert(reg.file != PROGRAM_OUTPUT);
+ src->File = reg.file;
+ src->Index = reg.idx;
+ src->Swizzle = reg.swz;
+@@ -469,9 +473,18 @@ static void emit_arg( struct prog_src_register *src,
+ src->RelAddr = 0;
+ }
+
++/**
++ * Convert a ureg dest register to a prog_dst_register.
++ */
+ static void emit_dst( struct prog_dst_register *dst,
+ struct ureg reg, GLuint mask )
+ {
++ /* Check for legal output register type. UNDEFINED will occur in
++ * instruction that don't produce a result (like END).
++ */
++ assert(reg.file == PROGRAM_TEMPORARY ||
++ reg.file == PROGRAM_OUTPUT ||
++ reg.file == PROGRAM_UNDEFINED);
+ dst->File = reg.file;
+ dst->Index = reg.idx;
+ /* allow zero as a shorthand for xyzw */
+@@ -956,13 +969,19 @@ static void build_lighting( struct tnl_program *p )
+ STATE_POSITION);
+ struct ureg V = get_eye_position(p);
+ struct ureg dist = get_temp(p);
++ struct ureg tmpPpli = get_temp(p);
+
+ VPpli = get_temp(p);
+ half = get_temp(p);
+
+- /* Calulate VPpli vector
++ /* In homogeneous object coordinates
++ */
++ emit_op1(p, OPCODE_RCP, dist, 0, swizzle1(Ppli, W));
++ emit_op2(p, OPCODE_MUL, tmpPpli, 0, Ppli, dist);
++
++ /* Calculate VPpli vector
+ */
+- emit_op2(p, OPCODE_SUB, VPpli, 0, Ppli, V);
++ emit_op2(p, OPCODE_SUB, VPpli, 0, tmpPpli, V);
+
+ /* Normalize VPpli. The dist value also used in
+ * attenuation below.
+@@ -994,6 +1013,7 @@ static void build_lighting( struct tnl_program *p )
+ emit_normalize_vec3(p, half, half);
+
+ release_temp(p, dist);
++ release_temp(p, tmpPpli);
+ }
+
+ /* Calculate dot products:
+@@ -1103,7 +1123,9 @@ static void build_fog( struct tnl_program *p )
+ {
+ struct ureg fog = register_output(p, VERT_RESULT_FOGC);
+ struct ureg input;
+-
++ GLuint useabs = p->state->fog_source_is_depth && p->state->fog_mode &&
++ (p->state->fog_mode != FOG_EXP2);
++
+ if (p->state->fog_source_is_depth) {
+ input = swizzle1(get_eye_position(p), Z);
+ }
+@@ -1111,31 +1133,36 @@ static void build_fog( struct tnl_program *p )
+ input = swizzle1(register_input(p, VERT_ATTRIB_FOG), X);
+ }
+
+- if (p->state->tnl_do_vertex_fog) {
++ if (p->state->fog_mode && p->state->tnl_do_vertex_fog) {
+ struct ureg params = register_param2(p, STATE_INTERNAL,
+ STATE_FOG_PARAMS_OPTIMIZED);
+ struct ureg tmp = get_temp(p);
+
++ if (useabs) {
++ emit_op1(p, OPCODE_ABS, tmp, 0, input);
++ }
++
+ switch (p->state->fog_mode) {
+ case FOG_LINEAR: {
+ struct ureg id = get_identity_param(p);
+- emit_op3(p, OPCODE_MAD, tmp, 0, input, swizzle1(params,X), swizzle1(params,Y));
++ emit_op3(p, OPCODE_MAD, tmp, 0, useabs ? tmp : input,
++ swizzle1(params,X), swizzle1(params,Y));
+ emit_op2(p, OPCODE_MAX, tmp, 0, tmp, swizzle1(id,X)); /* saturate */
+ emit_op2(p, OPCODE_MIN, fog, WRITEMASK_X, tmp, swizzle1(id,W));
+ break;
+ }
+ case FOG_EXP:
+- emit_op1(p, OPCODE_ABS, tmp, 0, input);
+- emit_op2(p, OPCODE_MUL, tmp, 0, tmp, swizzle1(params,Z));
++ emit_op2(p, OPCODE_MUL, tmp, 0, useabs ? tmp : input,
++ swizzle1(params,Z));
+ emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
+ break;
+ case FOG_EXP2:
+ emit_op2(p, OPCODE_MUL, tmp, 0, input, swizzle1(params,W));
+- emit_op2(p, OPCODE_MUL, tmp, 0, tmp, tmp);
++ emit_op2(p, OPCODE_MUL, tmp, 0, tmp, tmp);
+ emit_op1(p, OPCODE_EX2, fog, WRITEMASK_X, negate(tmp));
+ break;
+ }
+-
++
+ release_temp(p, tmp);
+ }
+ else {
+@@ -1143,7 +1170,7 @@ static void build_fog( struct tnl_program *p )
+ *
+ * KW: Is it really necessary to do anything in this case?
+ */
+- emit_op1(p, OPCODE_MOV, fog, WRITEMASK_X, input);
++ emit_op1(p, useabs ? OPCODE_ABS : OPCODE_MOV, fog, WRITEMASK_X, input);
+ }
+ }
+
+diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
+index 8940551..697d00e 100644
+--- a/src/mesa/vbo/vbo_save_draw.c
++++ b/src/mesa/vbo/vbo_save_draw.c
+@@ -132,9 +132,11 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
+ }
+
+ for (attr = 0; attr < VBO_ATTRIB_MAX; attr++) {
+- if (node->attrsz[attr]) {
++ GLuint src = map[attr];
++
++ if (node->attrsz[src]) {
+ arrays[attr].Ptr = (const GLubyte *)data;
+- arrays[attr].Size = node->attrsz[attr];
++ arrays[attr].Size = node->attrsz[src];
+ arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat);
+ arrays[attr].Stride = node->vertex_size * sizeof(GLfloat);
+ arrays[attr].Type = GL_FLOAT;
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index e142dde..b71a935 100644
--- a/src/mesa/vbo/vbo_split_copy.c
@@ -1445,3 +4015,38 @@
dst->BufferObj = ctx->Array.NullBufferObj;
dst->_MaxElement = copy->dstbuf_size; /* may be less! */
+diff --git a/src/mesa/x86-64/xform4.S b/src/mesa/x86-64/xform4.S
+index 65328f6..f512b3a 100644
+--- a/src/mesa/x86-64/xform4.S
++++ b/src/mesa/x86-64/xform4.S
+@@ -1,10 +1,8 @@
+-/* $Id$ */
+-
+ /*
+ * Mesa 3-D graphics library
+- * Version: 3.5
++ * Version: 7.0.1
+ *
+- * Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
++ * Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+@@ -64,7 +62,7 @@ _mesa_x86_64_transform_points4_general:
+
+ p4_general_loop:
+
+- movaps (%rdx), %xmm8 /* ox | oy | oz | ow */
++ movups (%rdx), %xmm8 /* ox | oy | oz | ow */
+ prefetchw 16(%rdi)
+
+ pshufd $0x00, %xmm8, %xmm0 /* ox | ox | ox | ox */
+@@ -149,7 +147,7 @@ _mesa_x86_64_transform_points4_3d:
+
+ p4_3d_loop:
+
+- movaps (%rdx), %xmm8 /* ox | oy | oz | ow */
++ movups (%rdx), %xmm8 /* ox | oy | oz | ow */
+ prefetchw 16(%rdi)
+
+ pshufd $0x00, %xmm8, %xmm0 /* ox | ox | ox | ox */
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- mesa.spec 6 Sep 2007 18:45:11 -0000 1.140
+++ mesa.spec 28 Sep 2007 02:34:11 -0000 1.141
@@ -32,7 +32,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 7.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -46,13 +46,10 @@
Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
Patch5: mesa-6.5.2-xserver-1.1-source-compat.patch
Patch18: mesa-7.0-selinux-awareness.patch
-Patch22: mesa-6.5.2-hush-synthetic-visual-warning.patch
Patch23: mesa-6.5.2-bindcontext-paranoia.patch
-Patch24: mesa-7.0-i-already-defined-glapi-you-twit.patch
Patch25: mesa-7.0-symlinks-before-depend.patch
Patch26: mesa-7.0.1-stable-branch.patch
Patch27: mesa-7.0-use_master-r300.patch
-Patch28: mesa-7.0.1-965-sampler-crash.patch
BuildRequires: pkgconfig
%if %{with_dri}
@@ -178,13 +175,10 @@
%patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
%patch5 -p1 -b .xserver-1.1-compat
%patch18 -p1 -b .selinux-awareness
-%patch22 -p1 -b .visual-warning
%patch23 -p1 -b .bindcontext
-%patch24 -p1 -b .glapi
%patch25 -p1 -b .makej
%patch26 -p1 -b .stable
%patch27 -p1 -b .r300
-%patch28 -p1 -b .965-sampler
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
# license and are not open source/free software, so we remove them.
@@ -414,6 +408,15 @@
%{_libdir}/mesa-demos-data
%changelog
+* Fri Sep 28 2007 Dave Airlie <airlied at redhat.com> 7.0.1-6
+- mesa-7.0.1-stable-branch.patch - Updated to close to 7.0.2-rc1
+- This contains the fixes made to the upstream Mesa stable branch
+ including fixes for 965 vblank interrupt issues along with a fix
+ in the kernel - remove patches that already upstream.
+- mesa-6.5.2-hush-synthetic-visual-warning.patch - dropped
+- mesa-7.0-i-already-defined-glapi-you-twit.patch - dropped
+- mesa-7.0.1-965-sampler-crash.patch - dropped
+
* Thu Sep 06 2007 Adam Jackson <ajax at redhat.com> 7.0.1-5
- mesa-7.0.1-965-sampler-crash.patch: Fix a crash with 965 in Torcs. (#262941)
--- mesa-6.5.2-hush-synthetic-visual-warning.patch DELETED ---
--- mesa-7.0-i-already-defined-glapi-you-twit.patch DELETED ---
--- mesa-7.0.1-965-sampler-crash.patch DELETED ---
More information about the fedora-extras-commits
mailing list