rpms/mesa/F-8 mesa-7.0.2-stable-branch.patch, NONE, 1.1 mesa.spec, 1.143, 1.144 mesa-7.0.1-stable-branch.patch, 1.3, NONE

Dave Airlie (airlied) fedora-extras-commits at redhat.com
Tue Jan 1 06:37:20 UTC 2008 

Author: airlied

Update of /cvs/pkgs/rpms/mesa/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv882

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.0.2-stable-branch.patch 
Removed Files:
	mesa-7.0.1-stable-branch.patch 
Log Message:
* Tue Jan 01 2008 Dave Airlie <airlied at redhat.com> 7.0.2-2
- mesa-7.0.2-stable-branch.patch: add in mesa 7.0.2 stable patches so far


mesa-7.0.2-stable-branch.patch:

--- NEW FILE mesa-7.0.2-stable-branch.patch ---
commit c1eb78f7ff9a6d80a6db06727a521b5aa3871a3d
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Sat Dec 22 18:49:42 2007 +0100

    fix GL_LINE_LOOP with drivers using own render pipeline stage (#12410, #13527)
    
    primitive needs to include the begin/end flags (broken since vbo-0.2). Should
    fix missing first/last line segment on gamma, i810, i915, mga, r200, radeon,
    s3v, savage, unichrome (r300 already correct). Tested on r200, fixes #13527.

commit 8aa0fd6b206930ababb1bae2acc629e2a945c0c0
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Dec 20 09:07:57 2007 -0700

    glGetActiveUniform fix

commit a1b3a908f557502fc1e5bf4e6357014538778ed8
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Dec 20 09:05:37 2007 -0700

    return correct size from glGetActiveUniform (bug 13751)

commit f9e70d951a3047a2af87ee43ca6c1045a187ef08
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Wed Dec 19 10:44:00 2007 +0800

    i965: allocate GRF registers before building subroutines,
    it ensures there are sufficient registers for all subroutines.

commit 41ed6be1da92fe8b48f106e7b540bd6a8ad2446a
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Wed Dec 19 10:36:56 2007 +0800

    i965: restore the flag after building the subroutine of the
    GS thread. fix #13240

commit 27de28fc3ec46cd5cac1e6de52d27922aabe340e
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 18 17:07:11 2007 -0700

    Remove -I$(TOP)/src/mesa/transform

commit dd2f01c229e9a9692fb0c424cb3c587419d04f83
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 18 16:12:34 2007 -0700

    simplify update two-side lighting test (follow-on to previous front/back-face changes)

commit deb5c56c77d385786d0b4fceed01cdee82f5355d
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 18 16:10:06 2007 -0700

    fix NEED_SECONDARY_COLOR for vert/frag progs

commit 0107acded03c510df2093b0b98bca52b5734dd5b
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Mon Dec 17 12:20:56 2007 +0100

    i915tex: Fix issues with glDrawBuffer(GL_NONE).
    
    Don't dereference NULL renderbuffer pointer, and make sure the software
    fallback sticks.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=13694 .

commit 2ac5e08d1d41377dc873b31875701f59e74242ec
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Fri Dec 14 14:33:53 2007 -0700

    fix polygon cull regression

commit 1837b8c214a362ccecc441f7b6880f623e70b8d6
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Wed Oct 31 17:12:07 2007 -0700

    configs: Fix linking with static libGL and --as-needed
    
    Linking of the programs breaks when using a static libGL and the GNU ld
    option --as-needed. This is because libXext is needed for the XShm
    functions.
    (cherry picked from commit 6aaf9bdd418e11d5ccb76a6ab85a8df36b0c8804)

commit 03d2bc1774e3612edca4be48c5aeafaafa2a52b1
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 4 14:06:26 2007 -0700

    fix gl_FrontFacing

commit 385bddbde04ca3ec2a159e8c8a50d9009da25b63
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 4 14:06:01 2007 -0700

    fix span->facing computation and gl_FrontFacing initialization

commit c13542626729a6fe3e4dfbc71f3569119255b668
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Tue Dec 4 14:05:11 2007 -0700

    Fix gl_FrontFacing compilation problem

commit 4be0c981205b5530366a10eb96e06b93a2439391
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue Dec 4 10:46:45 2007 +0100

    Use -Bsymbolic for linking all shared objects.
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=10132 .
    
    Also remove comment about SONAME, as SONAME only applies to shared libraries.
    (cherry picked from commit fc7ddea8535f1a9c196bf30f7864414e4ac18b8a)

commit e760aebd5aaecc220c6789fe925897909a876acd
Author: Brian <brian at i915.localnet.net>
Date:   Mon Dec 3 14:11:46 2007 -0700

    fix two-side lighting bug/crash

commit 1f6e7d9c297aba2e936352d6ae8a4198b5c64af5
Author: Brian <brian at i915.localnet.net>
Date:   Mon Dec 3 14:11:26 2007 -0700

    fix DD_TRI_LIGHT_TWOSIDE bug (#13368)

commit c6d421af05ccdd377df5cade301c5c25814ddf0c
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Mon Dec 3 11:57:14 2007 -0800

    Fix the library name in glw.pc
    
    Fix a copy and paste error s/GLU/GLw/ in glw.pc.
    (cherry picked from commit 2dc85e8078bed67cb5d8bc3e16484f56c61c61ca)

commit 952df5e493198de91b329983dae5366102eb0a25
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Dec 3 11:59:40 2007 -0700

    fix two-sided stencil

commit 45acb8b058fc0f61a1c2687897c5d4042b534760
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Mon Dec 3 11:58:16 2007 -0700

    added missing quote char

commit e8997c0183dbdb59884cc02af81d2faab1beaba1
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Fri Nov 30 11:40:06 2007 +0100

    i915tex: Fix up state changes for i8xx.
    
    (cherry picked from commit 2af613e0b8e6f89cc7528ff5a969e18f077e61fc)

commit 169e62f563c4eb7dfa9c456a1ee03168af6b546a
Author: Brian <brian at i915.localnet.net>
Date:   Fri Nov 30 15:52:41 2007 -0700

    fix-build: remove ctx->_Facing assignment

commit 1b43babfb126c6318d2f2468ec81b93ee1923774
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Fri Nov 30 13:01:42 2007 -0700

    fix broken two-sided stencil

commit 43e902f774f8c3cd58310eeb44eec9d3f8f81746
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Fri Nov 30 09:08:11 2007 -0700

    better front-plane clip test

commit b0a800e249990de0cbc577f8b48a1a301a3b9361
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Fri Nov 30 11:50:08 2007 +0800

    i965: use uncompressed instruction to ensure only
    Pixel Mask Copy is modified as the pixel shader thread
    turns off pixels based on kill instructions.

commit 73d5f232ad5905e6566ddd22f2cbceaac48bd4ad
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Nov 29 08:12:33 2007 -0700

    New ctx->Driver.Map/UnmapTexture() functions for accessing textures from t_vb_program.c

commit f7209541e44c35e64bc9cd4fd8342ee7743b7774
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Thu Nov 29 08:17:37 2007 -0700

    cleanups, comments
    
    Conflicts:
    
    	src/mesa/tnl/t_vb_program.c

commit 397a32dca7b58b1120874b304e0f39fc314dbb3b
Author: Brian <brian.paul at tungstengraphics.com>
Date:   Wed Nov 28 15:19:46 2007 -0700

    Move _mesa_load_tracked_matrices() from TNL module to prog_statevars.c
[...3041 lines suppressed...]
-         /* no matrix is tracked, but we leave the register values as-is */
-         assert(ctx->VertexProgram.TrackMatrix[i] == GL_NONE);
-         continue;
-      }
+   if (!ctx->Driver.MapTexture)
+      return;
 
-      /* load the matrix values into sequential registers */
-      if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_IDENTITY_NV) {
-         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);
-      }
-      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_INVERSE_NV) {
-         _math_matrix_analyse(mat); /* update the inverse */
-         ASSERT(!_math_matrix_is_dirty(mat));
-         load_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);
-      }
-      else if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_TRANSPOSE_NV) {
-         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->m);
-      }
-      else {
-         assert(ctx->VertexProgram.TrackMatrixTransform[i]
-                == GL_INVERSE_TRANSPOSE_NV);
-         _math_matrix_analyse(mat); /* update the inverse */
-         ASSERT(!_math_matrix_is_dirty(mat));
-         load_transpose_matrix(ctx->VertexProgram.Parameters, i*4, mat->inv);
+   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
+      if (vp->Base.TexturesUsed[u]) {
+         /* Note: _Current *should* correspond to the target indicated
+          * in TexturesUsed[u].
+          */
+         ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[u]._Current);
       }
    }
 }
@@ -259,6 +316,7 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
       _mesa_load_state_parameters(ctx, program->Base.Parameters);
    }
 
+   /* make list of outputs to save some time below */
    numOutputs = 0;
    for (i = 0; i < VERT_RESULT_MAX; i++) {
       if (program->Base.OutputsWritten & (1 << i)) {
@@ -266,6 +324,8 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
       }
    }
 
+   map_textures(ctx, program);
+
    for (i = 0; i < VB->Count; i++) {
       GLuint attr;
 
@@ -317,6 +377,8 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
 #endif
    }
 
+   unmap_textures(ctx, program);
+
    /* Fixup fog and point size results if needed */
    if (program->IsNVProgram) {
       if (ctx->Fog.Enabled &&
@@ -334,12 +396,39 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
       }
    }
 
-   /* Setup the VB pointers so that the next pipeline stages get
-    * their data from the right place (the program output arrays).
-    */
-   VB->ClipPtr = &store->results[VERT_RESULT_HPOS];
-   VB->ClipPtr->size = 4;
-   VB->ClipPtr->count = VB->Count;
+   if (program->IsPositionInvariant) {
+      /* We need the exact same transform as in the fixed function path here
+       * to guarantee invariance, depending on compiler optimization flags
+       * results could be different otherwise.
+       */
+      VB->ClipPtr = TransformRaw( &store->results[0],
+				  &ctx->_ModelProjectMatrix,
+				  VB->AttribPtr[0] );
+
+      /* Drivers expect this to be clean to element 4...
+       */
+      switch (VB->ClipPtr->size) {
+      case 1:
+	 /* impossible */
+      case 2:
+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );
+	 /* fall-through */
+      case 3:
+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );
+	 /* fall-through */
+      case 4:
+	 break;
+      }
+   }
+   else {
+      /* Setup the VB pointers so that the next pipeline stages get
+       * their data from the right place (the program output arrays).
+       */
+      VB->ClipPtr = &store->results[VERT_RESULT_HPOS];
+      VB->ClipPtr->size = 4;
+      VB->ClipPtr->count = VB->Count;
+   }
+
    VB->ColorPtr[0] = &store->results[VERT_RESULT_COL0];
    VB->ColorPtr[1] = &store->results[VERT_RESULT_BFC0];
    VB->SecondaryColorPtr[0] = &store->results[VERT_RESULT_COL1];
@@ -365,41 +454,10 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
       }
    }
 
-   /* Cliptest and perspective divide.  Clip functions must clear
-    * the clipmask.
-    */
-   store->ormask = 0;
-   store->andmask = CLIP_FRUSTUM_BITS;
-
-   if (tnl->NeedNdcCoords) {
-      VB->NdcPtr =
-         _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,
-                                            &store->ndcCoords,
-                                            store->clipmask,
-                                            &store->ormask,
-                                            &store->andmask );
-   }
-   else {
-      VB->NdcPtr = NULL;
-      _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,
-                                            NULL,
-                                            store->clipmask,
-                                            &store->ormask,
-                                            &store->andmask );
-   }
-
-   if (store->andmask)  /* All vertices are outside the frustum */
-      return GL_FALSE;
 
-
-   /* This is where we'd do clip testing against the user-defined
-    * clipping planes, but they're not supported by vertex programs.
+   /* Perform NDC and cliptest operations:
     */
-
-   VB->ClipOrMask = store->ormask;
-   VB->ClipMask = store->clipmask;
-
-   return GL_TRUE;
+   return do_ndc_cliptest(ctx, store);
 }
 
 
diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index 20bed55..c8c0093 100644
--- a/src/mesa/tnl/tnl.h
+++ b/src/mesa/tnl/tnl.h
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.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"),
@@ -82,7 +81,4 @@ _tnl_draw_prims( GLcontext *ctx,
 		 GLuint min_index,
 		 GLuint max_index);
 
-extern void
-_mesa_load_tracked_matrices(GLcontext *ctx);
-
 #endif
diff --git a/src/mesa/tnl_dd/t_dd_tritmp.h b/src/mesa/tnl_dd/t_dd_tritmp.h
index 0bf32ff..6c2378f 100644
--- a/src/mesa/tnl_dd/t_dd_tritmp.h
+++ b/src/mesa/tnl_dd/t_dd_tritmp.h
@@ -155,10 +155,6 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
       {
 	 facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit;
 
-         if (DO_TWOSTENCIL && ctx->Stencil.TestTwoSide) {
-            ctx->_Facing = facing; /* mixed mode rendering: for 2-sided stencil test */
-         }
-
 	 if (DO_UNFILLED) {
 	    if (facing) {
 	       mode = ctx->Polygon.BackMode;
@@ -421,10 +417,6 @@ static void TAG(quad)( GLcontext *ctx,
       {
 	 facing = AREA_IS_CCW( cc ) ^ ctx->Polygon._FrontBit;
 
-         if (DO_TWOSTENCIL && ctx->Stencil.TestTwoSide) {
-            ctx->_Facing = facing; /* mixed mode rendering: for 2-sided stencil test */
-         }
-
 	 if (DO_UNFILLED) {
 	    if (facing) {
 	       mode = ctx->Polygon.BackMode;


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/F-8/mesa.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- mesa.spec	1 Jan 2008 05:46:09 -0000	1.143
+++ mesa.spec	1 Jan 2008 06:36:16 -0000	1.144
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -42,7 +42,8 @@
 Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
 Source2: %{manpages}.tar.bz2
 
-Patch0: mesa-7.0-build-config.patch
+Patch0: mesa-7.0.2-stable-branch.patch
+Patch1: mesa-7.0-build-config.patch
 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
@@ -175,7 +176,8 @@
 %setup -q -n Mesa-%{version} -b1 -b2
 chmod a-x progs/demos/glslnoise.c
 
-%patch0 -p1 -b .build-config
+%patch0 -p1 -b .stable
+%patch1 -p1 -b .build-config
 %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
 %patch5 -p1 -b .xserver-1.1-compat
 %patch18 -p1 -b .selinux-awareness
@@ -414,6 +416,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Jan 01 2008 Dave Airlie <airlied at redhat.com> 7.0.2-2
+- mesa-7.0.2-stable-branch.patch: add in mesa 7.0.2 stable patches so far
+
 * Tue Jan 01 2008 Dave Airlie <airlied at redhat.com> 7.0.2-1
 - update to Mesa 7.0.2 final
 - mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch - fixes for maniadrive


--- mesa-7.0.1-stable-branch.patch DELETED ---

More information about the fedora-extras-commits mailing list