packages: Mesa/Mesa.spec, Mesa/Mesa-git.patch - rel 2; fixes from git
arekm
arekm at pld-linux.org
Thu Oct 8 20:30:13 CEST 2009
Author: arekm Date: Thu Oct 8 18:30:13 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; fixes from git
---- Files affected:
packages/Mesa:
Mesa.spec (1.221 -> 1.222) , Mesa-git.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.221 packages/Mesa/Mesa.spec:1.222
--- packages/Mesa/Mesa.spec:1.221 Tue Sep 29 09:12:42 2009
+++ packages/Mesa/Mesa.spec Thu Oct 8 20:30:07 2009
@@ -23,7 +23,7 @@
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
Version: 7.6
-Release: 1%{?with_multigl:.mgl}
+Release: 2%{?with_multigl:.mgl}
License: MIT (core), SGI (GLU,libGLw) and others - see license.html file
Group: X11/Libraries
Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
@@ -33,7 +33,8 @@
Source2: http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
# Source2-md5: 6ae05158e678f4594343f32c2ca50515
Patch0: %{name}-realclean.patch
-Patch2: %{name}-sparc64.patch
+Patch1: %{name}-sparc64.patch
+Patch2: %{name}-git.patch
URL: http://www.mesa3d.org/
BuildRequires: expat-devel
%{?with_demos:BuildRequires: glew-devel}
@@ -614,6 +615,7 @@
%prep
%setup -q -b1 -a2
%patch0 -p0
+%patch1 -p1
%patch2 -p1
# fix demos
@@ -957,6 +959,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.222 2009/10/08 18:30:07 arekm
+- rel 2; fixes from git
+
Revision 1.221 2009/09/29 07:12:42 arekm
- up to 7.6
================================================================
Index: packages/Mesa/Mesa-git.patch
diff -u /dev/null packages/Mesa/Mesa-git.patch:1.5
--- /dev/null Thu Oct 8 20:30:13 2009
+++ packages/Mesa/Mesa-git.patch Thu Oct 8 20:30:07 2009
@@ -0,0 +1,1973 @@
+diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h
+index 54147f7..59f6149 100644
+--- a/include/GL/gl_mangle.h
++++ b/include/GL/gl_mangle.h
+@@ -108,12 +108,20 @@
+ #define glBlendColorEXT MANGLE(BlendColorEXT)
+ #define glBlendColor MANGLE(BlendColor)
+ #define glBlendEquationEXT MANGLE(BlendEquationEXT)
++#define glBlendEquationi MANGLE(BlendEquationi)
++#define glBlendEquationIndexedAMD MANGLE(BlendEquationIndexedAMD)
+ #define glBlendEquation MANGLE(BlendEquation)
+ #define glBlendEquationSeparateATI MANGLE(BlendEquationSeparateATI)
+ #define glBlendEquationSeparateEXT MANGLE(BlendEquationSeparateEXT)
++#define glBlendEquationSeparatei MANGLE(BlendEquationSeparatei)
++#define glBlendEquationSeparateIndexedAMD MANGLE(BlendEquationSeparateIndexedAMD)
+ #define glBlendEquationSeparate MANGLE(BlendEquationSeparate)
++#define glBlendFunci MANGLE(BlendFunci)
++#define glBlendFuncIndexedAMD MANGLE(BlendFuncIndexedAMD)
+ #define glBlendFunc MANGLE(BlendFunc)
+ #define glBlendFuncSeparateEXT MANGLE(BlendFuncSeparateEXT)
++#define glBlendFuncSeparatei MANGLE(BlendFuncSeparatei)
++#define glBlendFuncSeparateIndexedAMD MANGLE(BlendFuncSeparateIndexedAMD)
+ #define glBlendFuncSeparateINGR MANGLE(BlendFuncSeparateINGR)
+ #define glBlendFuncSeparate MANGLE(BlendFuncSeparate)
+ #define glBlitFramebufferEXT MANGLE(BlitFramebufferEXT)
+@@ -148,6 +156,7 @@
+ #define glClientActiveTexture MANGLE(ClientActiveTexture)
+ #define glClientActiveVertexStreamATI MANGLE(ClientActiveVertexStreamATI)
+ #define glClientAttribDefaultEXT MANGLE(ClientAttribDefaultEXT)
++#define glClientWaitSync MANGLE(ClientWaitSync)
+ #define glClipPlane MANGLE(ClipPlane)
+ #define glColor3b MANGLE(Color3b)
+ #define glColor3bv MANGLE(Color3bv)
+@@ -320,6 +329,7 @@
+ #define glDeleteRenderbuffersEXT MANGLE(DeleteRenderbuffersEXT)
+ #define glDeleteRenderbuffers MANGLE(DeleteRenderbuffers)
+ #define glDeleteShader MANGLE(DeleteShader)
++#define glDeleteSync MANGLE(DeleteSync)
+ #define glDeleteTexturesEXT MANGLE(DeleteTexturesEXT)
+ #define glDeleteTextures MANGLE(DeleteTextures)
+ #define glDeleteTransformFeedbacksNV MANGLE(DeleteTransformFeedbacksNV)
+@@ -341,6 +351,7 @@
+ #define glDisableIndexedEXT MANGLE(DisableIndexedEXT)
+ #define glDisable MANGLE(Disable)
+ #define glDisableVariantClientStateEXT MANGLE(DisableVariantClientStateEXT)
++#define glDisableVertexAttribAPPLE MANGLE(DisableVertexAttribAPPLE)
+ #define glDisableVertexAttribArrayARB MANGLE(DisableVertexAttribArrayARB)
+ #define glDisableVertexAttribArray MANGLE(DisableVertexAttribArray)
+ #define glDrawArraysEXT MANGLE(DrawArraysEXT)
+@@ -354,7 +365,9 @@
+ #define glDrawBuffers MANGLE(DrawBuffers)
+ #define glDrawElementArrayAPPLE MANGLE(DrawElementArrayAPPLE)
+ #define glDrawElementArrayATI MANGLE(DrawElementArrayATI)
++#define glDrawElementsBaseVertex MANGLE(DrawElementsBaseVertex)
+ #define glDrawElementsInstancedARB MANGLE(DrawElementsInstancedARB)
++#define glDrawElementsInstancedBaseVertex MANGLE(DrawElementsInstancedBaseVertex)
+ #define glDrawElementsInstancedEXT MANGLE(DrawElementsInstancedEXT)
+ #define glDrawElementsInstanced MANGLE(DrawElementsInstanced)
+ #define glDrawElements MANGLE(DrawElements)
+@@ -362,6 +375,7 @@
+ #define glDrawPixels MANGLE(DrawPixels)
+ #define glDrawRangeElementArrayAPPLE MANGLE(DrawRangeElementArrayAPPLE)
+ #define glDrawRangeElementArrayATI MANGLE(DrawRangeElementArrayATI)
++#define glDrawRangeElementsBaseVertex MANGLE(DrawRangeElementsBaseVertex)
+ #define glDrawRangeElementsEXT MANGLE(DrawRangeElementsEXT)
+ #define glDrawRangeElements MANGLE(DrawRangeElements)
+ #define glDrawTransformFeedbackNV MANGLE(DrawTransformFeedbackNV)
+@@ -378,6 +392,7 @@
+ #define glEnableIndexedEXT MANGLE(EnableIndexedEXT)
+ #define glEnable MANGLE(Enable)
+ #define glEnableVariantClientStateEXT MANGLE(EnableVariantClientStateEXT)
++#define glEnableVertexAttribAPPLE MANGLE(EnableVertexAttribAPPLE)
+ #define glEnableVertexAttribArrayARB MANGLE(EnableVertexAttribArrayARB)
+ #define glEnableVertexAttribArray MANGLE(EnableVertexAttribArray)
+ #define glEndConditionalRender MANGLE(EndConditionalRender)
+@@ -409,6 +424,7 @@
+ #define glExecuteProgramNV MANGLE(ExecuteProgramNV)
+ #define glExtractComponentEXT MANGLE(ExtractComponentEXT)
+ #define glFeedbackBuffer MANGLE(FeedbackBuffer)
++#define glFenceSync MANGLE(FenceSync)
+ #define glFinalCombinerInputNV MANGLE(FinalCombinerInputNV)
+ #define glFinishAsyncSGIX MANGLE(FinishAsyncSGIX)
+ #define glFinishFenceAPPLE MANGLE(FinishFenceAPPLE)
+@@ -469,9 +485,11 @@
+ #define glFramebufferTextureEXT MANGLE(FramebufferTextureEXT)
+ #define glFramebufferTextureFaceARB MANGLE(FramebufferTextureFaceARB)
+ #define glFramebufferTextureFaceEXT MANGLE(FramebufferTextureFaceEXT)
++#define glFramebufferTextureFace MANGLE(FramebufferTextureFace)
+ #define glFramebufferTextureLayerARB MANGLE(FramebufferTextureLayerARB)
+ #define glFramebufferTextureLayerEXT MANGLE(FramebufferTextureLayerEXT)
+ #define glFramebufferTextureLayer MANGLE(FramebufferTextureLayer)
++#define glFramebufferTexture MANGLE(FramebufferTexture)
+ #define glFrameTerminatorGREMEDY MANGLE(FrameTerminatorGREMEDY)
+ #define glFrameZoomSGIX MANGLE(FrameZoomSGIX)
+ #define glFreeObjectBufferATI MANGLE(FreeObjectBufferATI)
+@@ -523,6 +541,7 @@
+ #define glGetBooleanIndexedvEXT MANGLE(GetBooleanIndexedvEXT)
+ #define glGetBooleani_v MANGLE(GetBooleani_v)
+ #define glGetBooleanv MANGLE(GetBooleanv)
++#define glGetBufferParameteri64v MANGLE(GetBufferParameteri64v)
+ #define glGetBufferParameterivARB MANGLE(GetBufferParameterivARB)
+ #define glGetBufferParameteriv MANGLE(GetBufferParameteriv)
+ #define glGetBufferPointervARB MANGLE(GetBufferPointervARB)
+@@ -586,6 +605,8 @@
+ #define glGetImageTransformParameterivHP MANGLE(GetImageTransformParameterivHP)
+ #define glGetInfoLogARB MANGLE(GetInfoLogARB)
+ #define glGetInstrumentsSGIX MANGLE(GetInstrumentsSGIX)
++#define glGetInteger64i_v MANGLE(GetInteger64i_v)
++#define glGetInteger64v MANGLE(GetInteger64v)
+ #define glGetIntegerIndexedvEXT MANGLE(GetIntegerIndexedvEXT)
+ #define glGetIntegeri_v MANGLE(GetIntegeri_v)
+ #define glGetIntegerv MANGLE(GetIntegerv)
+@@ -615,6 +636,7 @@
+ #define glGetMinmaxParameterfv MANGLE(GetMinmaxParameterfv)
+ #define glGetMinmaxParameterivEXT MANGLE(GetMinmaxParameterivEXT)
+ #define glGetMinmaxParameteriv MANGLE(GetMinmaxParameteriv)
++#define glGetMultisamplefv MANGLE(GetMultisamplefv)
+ #define glGetMultisamplefvNV MANGLE(GetMultisamplefvNV)
+ #define glGetMultiTexEnvfvEXT MANGLE(GetMultiTexEnvfvEXT)
+ #define glGetMultiTexEnvivEXT MANGLE(GetMultiTexEnvivEXT)
+@@ -642,6 +664,7 @@
+ #define glGetObjectBufferfvATI MANGLE(GetObjectBufferfvATI)
+ #define glGetObjectBufferivATI MANGLE(GetObjectBufferivATI)
+ #define glGetObjectParameterfvARB MANGLE(GetObjectParameterfvARB)
++#define glGetObjectParameterivAPPLE MANGLE(GetObjectParameterivAPPLE)
+ #define glGetObjectParameterivARB MANGLE(GetObjectParameterivARB)
+ #define glGetOcclusionQueryivNV MANGLE(GetOcclusionQueryivNV)
+ #define glGetOcclusionQueryuivNV MANGLE(GetOcclusionQueryuivNV)
+@@ -698,6 +721,7 @@
+ #define glGetSharpenTexFuncSGIS MANGLE(GetSharpenTexFuncSGIS)
+ #define glGetStringi MANGLE(GetStringi)
+ #define glGetString MANGLE(GetString)
++#define glGetSynciv MANGLE(GetSynciv)
+ #define glGetTexBumpParameterfvATI MANGLE(GetTexBumpParameterfvATI)
+ #define glGetTexBumpParameterivATI MANGLE(GetTexBumpParameterivATI)
+ #define glGetTexEnvfv MANGLE(GetTexEnvfv)
+@@ -715,6 +739,7 @@
+ #define glGetTexParameterIuivEXT MANGLE(GetTexParameterIuivEXT)
+ #define glGetTexParameterIuiv MANGLE(GetTexParameterIuiv)
+ #define glGetTexParameteriv MANGLE(GetTexParameteriv)
++#define glGetTexParameterPointervAPPLE MANGLE(GetTexParameterPointervAPPLE)
+ #define glGetTextureImageEXT MANGLE(GetTextureImageEXT)
+ #define glGetTextureLevelParameterfvEXT MANGLE(GetTextureLevelParameterfvEXT)
+ #define glGetTextureLevelParameterivEXT MANGLE(GetTextureLevelParameterivEXT)
+@@ -825,12 +850,14 @@
+ #define glIsRenderbufferEXT MANGLE(IsRenderbufferEXT)
+ #define glIsRenderbuffer MANGLE(IsRenderbuffer)
+ #define glIsShader MANGLE(IsShader)
++#define glIsSync MANGLE(IsSync)
+ #define glIsTextureEXT MANGLE(IsTextureEXT)
+ #define glIsTexture MANGLE(IsTexture)
+ #define glIsTransformFeedbackNV MANGLE(IsTransformFeedbackNV)
+ #define glIsVariantEnabledEXT MANGLE(IsVariantEnabledEXT)
+ #define glIsVertexArrayAPPLE MANGLE(IsVertexArrayAPPLE)
+ #define glIsVertexArray MANGLE(IsVertexArray)
++#define glIsVertexAttribEnabledAPPLE MANGLE(IsVertexAttribEnabledAPPLE)
+ #define glLightEnviSGIX MANGLE(LightEnviSGIX)
+ #define glLightf MANGLE(Lightf)
+ #define glLightfv MANGLE(Lightfv)
+@@ -877,6 +904,10 @@
+ #define glMapObjectBufferATI MANGLE(MapObjectBufferATI)
+ #define glMapParameterfvNV MANGLE(MapParameterfvNV)
+ #define glMapParameterivNV MANGLE(MapParameterivNV)
++#define glMapVertexAttrib1dAPPLE MANGLE(MapVertexAttrib1dAPPLE)
++#define glMapVertexAttrib1fAPPLE MANGLE(MapVertexAttrib1fAPPLE)
++#define glMapVertexAttrib2dAPPLE MANGLE(MapVertexAttrib2dAPPLE)
++#define glMapVertexAttrib2fAPPLE MANGLE(MapVertexAttrib2fAPPLE)
+ #define glMaterialf MANGLE(Materialf)
+ #define glMaterialfv MANGLE(Materialfv)
+ #define glMateriali MANGLE(Materiali)
+@@ -907,9 +938,11 @@
+ #define glMatrixTranslatefEXT MANGLE(MatrixTranslatefEXT)
+ #define glMinmaxEXT MANGLE(MinmaxEXT)
+ #define glMinmax MANGLE(Minmax)
++#define glMinSampleShading MANGLE(MinSampleShading)
+ #define glMultiDrawArraysEXT MANGLE(MultiDrawArraysEXT)
+ #define glMultiDrawArrays MANGLE(MultiDrawArrays)
+ #define glMultiDrawElementArrayAPPLE MANGLE(MultiDrawElementArrayAPPLE)
++#define glMultiDrawElementsBaseVertex MANGLE(MultiDrawElementsBaseVertex)
+ #define glMultiDrawElementsEXT MANGLE(MultiDrawElementsEXT)
+ #define glMultiDrawElements MANGLE(MultiDrawElements)
+ #define glMultiDrawRangeElementArrayAPPLE MANGLE(MultiDrawRangeElementArrayAPPLE)
+@@ -1072,6 +1105,8 @@
+ #define glNormalStream3ivATI MANGLE(NormalStream3ivATI)
+ #define glNormalStream3sATI MANGLE(NormalStream3sATI)
+ #define glNormalStream3svATI MANGLE(NormalStream3svATI)
++#define glObjectPurgeableAPPLE MANGLE(ObjectPurgeableAPPLE)
++#define glObjectUnpurgeableAPPLE MANGLE(ObjectUnpurgeableAPPLE)
+ #define glOrtho MANGLE(Ortho)
+ #define glPassTexCoordATI MANGLE(PassTexCoordATI)
+ #define glPassThrough MANGLE(PassThrough)
+@@ -1162,6 +1197,7 @@
+ #define glProgramParameter4fvNV MANGLE(ProgramParameter4fvNV)
+ #define glProgramParameteriARB MANGLE(ProgramParameteriARB)
+ #define glProgramParameteriEXT MANGLE(ProgramParameteriEXT)
++#define glProgramParameteri MANGLE(ProgramParameteri)
+ #define glProgramParameters4dvNV MANGLE(ProgramParameters4dvNV)
+ #define glProgramParameters4fvNV MANGLE(ProgramParameters4fvNV)
+ #define glProgramStringARB MANGLE(ProgramStringARB)
+@@ -1200,6 +1236,7 @@
+ #define glProgramUniformMatrix4x3fvEXT MANGLE(ProgramUniformMatrix4x3fvEXT)
+ #define glProgramVertexLimitNV MANGLE(ProgramVertexLimitNV)
+ #define glProvokingVertexEXT MANGLE(ProvokingVertexEXT)
++#define glProvokingVertex MANGLE(ProvokingVertex)
+ #define glPushAttrib MANGLE(PushAttrib)
+ #define glPushClientAttribDefaultEXT MANGLE(PushClientAttribDefaultEXT)
+ #define glPushClientAttrib MANGLE(PushClientAttrib)
+@@ -1283,6 +1320,7 @@
+ #define glSampleCoverage MANGLE(SampleCoverage)
+ #define glSampleMapATI MANGLE(SampleMapATI)
+ #define glSampleMaskEXT MANGLE(SampleMaskEXT)
++#define glSampleMaski MANGLE(SampleMaski)
+ #define glSampleMaskIndexedNV MANGLE(SampleMaskIndexedNV)
+ #define glSampleMaskSGIS MANGLE(SampleMaskSGIS)
+ #define glSamplePatternEXT MANGLE(SamplePatternEXT)
+@@ -1454,8 +1492,10 @@
+ #define glTexGeniv MANGLE(TexGeniv)
+ #define glTexImage1D MANGLE(TexImage1D)
+ #define glTexImage2D MANGLE(TexImage2D)
++#define glTexImage2DMultisample MANGLE(TexImage2DMultisample)
+ #define glTexImage3DEXT MANGLE(TexImage3DEXT)
+ #define glTexImage3D MANGLE(TexImage3D)
++#define glTexImage3DMultisample MANGLE(TexImage3DMultisample)
+ #define glTexImage4DSGIS MANGLE(TexImage4DSGIS)
+ #define glTexParameterf MANGLE(TexParameterf)
+ #define glTexParameterfv MANGLE(TexParameterfv)
+@@ -1487,6 +1527,7 @@
+ #define glTextureParameterIivEXT MANGLE(TextureParameterIivEXT)
+ #define glTextureParameterIuivEXT MANGLE(TextureParameterIuivEXT)
+ #define glTextureParameterivEXT MANGLE(TextureParameterivEXT)
++#define glTextureRangeAPPLE MANGLE(TextureRangeAPPLE)
+ #define glTextureRenderbufferEXT MANGLE(TextureRenderbufferEXT)
+ #define glTextureSubImage1DEXT MANGLE(TextureSubImage1DEXT)
+ #define glTextureSubImage2DEXT MANGLE(TextureSubImage2DEXT)
+@@ -1828,6 +1869,7 @@
+ #define glVertexWeighthvNV MANGLE(VertexWeighthvNV)
+ #define glVertexWeightPointerEXT MANGLE(VertexWeightPointerEXT)
+ #define glViewport MANGLE(Viewport)
++#define glWaitSync MANGLE(WaitSync)
+ #define glWeightbvARB MANGLE(WeightbvARB)
+ #define glWeightdvARB MANGLE(WeightdvARB)
+ #define glWeightfvARB MANGLE(WeightfvARB)
+diff --git a/progs/glsl/skinning.c b/progs/glsl/skinning.c
+index 65ba983..2b96f31 100644
+--- a/progs/glsl/skinning.c
++++ b/progs/glsl/skinning.c
+@@ -16,6 +16,9 @@
+ #include <GL/glut.h>
+ #include "shaderutil.h"
+
++#ifndef M_PI
++#define M_PI 3.1415926535
++#endif
+
+ static char *FragProgFile = "skinning.frag";
+ static char *VertProgFile = "skinning.vert";
+diff --git a/progs/glsl/texaaline.c b/progs/glsl/texaaline.c
+index 7a5ac40..2e4f932 100644
+--- a/progs/glsl/texaaline.c
++++ b/progs/glsl/texaaline.c
+@@ -14,6 +14,9 @@
+ #include <GL/glew.h>
+ #include <GL/glut.h>
+
++#ifndef M_PI
++#define M_PI 3.1415926535
++#endif
+
+ static GLint WinWidth = 300, WinHeight = 300;
+ static GLint win = 0;
+diff --git a/progs/glsl/twoside.c b/progs/glsl/twoside.c
+index a57484f..ce155d6 100644
+--- a/progs/glsl/twoside.c
++++ b/progs/glsl/twoside.c
+@@ -16,6 +16,9 @@
+ #include <GL/glut.h>
+ #include "shaderutil.h"
+
++#ifndef M_PI
++#define M_PI 3.1415926535
++#endif
+
+ static GLint WinWidth = 300, WinHeight = 300;
+ static char *FragProgFile = NULL;
+diff --git a/progs/xdemos/pbdemo.c b/progs/xdemos/pbdemo.c
+index 7db0017..2573209 100644
+--- a/progs/xdemos/pbdemo.c
++++ b/progs/xdemos/pbdemo.c
+@@ -143,7 +143,7 @@ MakePbuffer( Display *dpy, int screen, int width, int height )
+
+ /* Create the pbuffer using first fbConfig in the list that works. */
+ for (i=0;i<nConfigs;i++) {
+- pBuffer = CreatePbuffer(dpy, screen, fbConfigs[i], width, height, preserve, largest);
++ pBuffer = CreatePbuffer(dpy, screen, fbConfigs[i], width, height, largest, preserve);
+ if (pBuffer) {
+ gFBconfig = fbConfigs[i];
+ gWidth = width;
+@@ -210,6 +210,21 @@ Setup(int width, int height)
+ return 0;
+ }
+
++ /* Test drawable queries */
++ {
++ unsigned int v;
++ glXQueryDrawable( gDpy, gPBuffer, GLX_WIDTH, &v);
++ printf("GLX_WIDTH = %u\n", v);
++ glXQueryDrawable( gDpy, gPBuffer, GLX_HEIGHT, &v);
++ printf("GLX_HEIGHT = %u\n", v);
++ glXQueryDrawable( gDpy, gPBuffer, GLX_PRESERVED_CONTENTS, &v);
++ printf("GLX_PRESERVED_CONTENTS = %u\n", v);
++ glXQueryDrawable( gDpy, gPBuffer, GLX_LARGEST_PBUFFER, &v);
++ printf("GLX_LARGEST_PBUFFER = %u\n", v);
++ glXQueryDrawable( gDpy, gPBuffer, GLX_FBCONFIG_ID, &v);
++ printf("GLX_FBCONFIG_ID = %u\n", v);
++ }
++
+ /* Get corresponding XVisualInfo */
+ visInfo = GetVisualFromFBConfig(gDpy, gScreen, gFBconfig);
+ if (!visInfo) {
+diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
+index 36c882a..4f13b3e 100644
+--- a/src/gallium/auxiliary/cso_cache/cso_context.c
++++ b/src/gallium/auxiliary/cso_cache/cso_context.c
+@@ -268,7 +268,7 @@ void cso_release_all( struct cso_context *ctx )
+ void cso_destroy_context( struct cso_context *ctx )
+ {
+ if (ctx) {
+- //cso_release_all( ctx );
++ /*cso_release_all( ctx );*/
+ FREE( ctx );
+ }
+ }
+diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c
+index 44147ae..734c05f 100644
+--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c
++++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_emit.c
+@@ -212,17 +212,10 @@ static void fse_prepare( struct draw_pt_middle_end *middle,
+ struct draw_vertex_shader *vs = draw->vs.vertex_shader;
+ vs->prepare(vs, draw);
+ }
+-
+-
+- //return TRUE;
+ }
+
+
+
+-
+-
+-
+-
+ static void fse_run_linear( struct draw_pt_middle_end *middle,
+ unsigned start,
+ unsigned count )
+diff --git a/src/gallium/auxiliary/draw/draw_pt_post_vs.c b/src/gallium/auxiliary/draw/draw_pt_post_vs.c
+index 00d7197..78953bc 100644
+--- a/src/gallium/auxiliary/draw/draw_pt_post_vs.c
++++ b/src/gallium/auxiliary/draw/draw_pt_post_vs.c
+@@ -210,7 +210,7 @@ void draw_pt_post_vs_prepare( struct pt_post_vs *pvs,
+ pvs->run = post_vs_viewport;
+ }
+ else {
+- //if (opengl)
++ /* if (opengl) */
+ pvs->run = post_vs_cliptest_viewport_gl;
+ }
+ }
+diff --git a/src/gallium/auxiliary/draw/draw_vs_aos.c b/src/gallium/auxiliary/draw/draw_vs_aos.c
+index 62e04a6..645d7cc 100644
+--- a/src/gallium/auxiliary/draw/draw_vs_aos.c
++++ b/src/gallium/auxiliary/draw/draw_vs_aos.c
+@@ -891,7 +891,7 @@ static void x87_emit_ex2( struct aos_compilation *cp )
+ struct x86_reg st1 = x86_make_reg(file_x87, 1);
+ int stack = cp->func->x87_stack;
+
+-// set_fpu_round_neg_inf( cp );
++ /* set_fpu_round_neg_inf( cp ); */
+
+ x87_fld(cp->func, st0); /* a a */
+ x87_fprndint( cp->func ); /* int(a) a*/
+@@ -1759,14 +1759,14 @@ emit_instruction( struct aos_compilation *cp,
+ return emit_SUB(cp, inst);
+
+ case TGSI_OPCODE_LRP:
+-// return emit_LERP(cp, inst);
++ /*return emit_LERP(cp, inst);*/
+ return FALSE;
+
+ case TGSI_OPCODE_FRC:
+ return emit_FRC(cp, inst);
+
+ case TGSI_OPCODE_CLAMP:
+-// return emit_CLAMP(cp, inst);
++ /*return emit_CLAMP(cp, inst);*/
+ return FALSE;
+
+ case TGSI_OPCODE_FLR:
+diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+index 109ac7c..0d30363 100644
+--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
++++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+@@ -584,7 +584,7 @@ fenced_buffer_list_destroy(struct fenced_buffer_list *fenced_list)
+ }
+
+ #ifdef DEBUG
+- //assert(!fenced_list->numUnfenced);
++ /*assert(!fenced_list->numUnfenced);*/
+ #endif
+
+ pipe_mutex_unlock(fenced_list->mutex);
+diff --git a/src/gallium/auxiliary/translate/translate_generic.c b/src/gallium/auxiliary/translate/translate_generic.c
+index 8d39b64..266e7ee 100644
+--- a/src/gallium/auxiliary/translate/translate_generic.c
++++ b/src/gallium/auxiliary/translate/translate_generic.c
+@@ -217,7 +217,7 @@ ATTRIB( R8G8_SNORM, 2, char, FROM_8_SNORM, TO_8_SNORM )
+ ATTRIB( R8_SNORM, 1, char, FROM_8_SNORM, TO_8_SNORM )
+
+ ATTRIB( A8R8G8B8_UNORM, 4, ubyte, FROM_8_UNORM, TO_8_UNORM )
+-//ATTRIB( R8G8B8A8_UNORM, 4, ubyte, FROM_8_UNORM, TO_8_UNORM )
++/*ATTRIB( R8G8B8A8_UNORM, 4, ubyte, FROM_8_UNORM, TO_8_UNORM )*/
+
+ ATTRIB( R32G32B32A32_FIXED, 4, int, FROM_32_FIXED, TO_32_FIXED )
+ ATTRIB( R32G32B32_FIXED, 3, int, FROM_32_FIXED, TO_32_FIXED )
+diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c b/src/gallium/auxiliary/util/u_cpu_detect.c
+index d9f2f8f..f78706f 100644
+--- a/src/gallium/auxiliary/util/u_cpu_detect.c
++++ b/src/gallium/auxiliary/util/u_cpu_detect.c
+@@ -268,7 +268,7 @@ static void check_os_katmai_support(void)
+ * and therefore to be safe I'm going to leave this test in here.
+ */
+ if (__cpu_detect_caps.hasSSE) {
+- // test_os_katmai_exception_support();
++ /* test_os_katmai_exception_support(); */
+ }
+
+ /* Restore the original signal handlers.
+diff --git a/src/gallium/auxiliary/util/u_debug_profile.c b/src/gallium/auxiliary/util/u_debug_profile.c
+index 6d8b244..d765b50 100644
+--- a/src/gallium/auxiliary/util/u_debug_profile.c
++++ b/src/gallium/auxiliary/util/u_debug_profile.c
+@@ -254,7 +254,7 @@ debug_profile_start(void)
+ {
+ WCHAR *p;
+
+- // increment starting from the less significant digit
++ /* increment starting from the less significant digit */
+ p = &wFileName[14];
+ while(1) {
+ if(*p == '9') {
+diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c
+index 811931f..417d0cf 100644
+--- a/src/gallium/auxiliary/util/u_debug_symbol.c
++++ b/src/gallium/auxiliary/util/u_debug_symbol.c
+@@ -214,7 +214,7 @@ debug_symbol_print_imagehlp(const void *addr)
+ HANDLE hProcess;
+ BYTE symbolBuffer[1024];
+ PIMAGEHLP_SYMBOL pSymbol = (PIMAGEHLP_SYMBOL) symbolBuffer;
+- DWORD dwDisplacement = 0; // Displacement of the input address, relative to the start of the symbol
++ DWORD dwDisplacement = 0; /* Displacement of the input address, relative to the start of the symbol */
+
+ hProcess = GetCurrentProcess();
+
+diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
+index 4e3d35f..aa823aa 100644
+--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
++++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
+@@ -1427,6 +1427,7 @@ set_vertex_data(struct gen_mipmap_state *ctx,
+ rz = -1.0f;
+ break;
+ default:
++ rx = ry = rz = 0.0f;
+ assert(0);
+ }
+
+diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
+index 86df320..b4650c0 100644
+--- a/src/gallium/drivers/softpipe/sp_context.c
++++ b/src/gallium/drivers/softpipe/sp_context.c
+@@ -105,12 +105,17 @@ static void softpipe_destroy( struct pipe_context *pipe )
+ softpipe->quad[i].output->destroy( softpipe->quad[i].output );
+ }
+
+- for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++)
++ for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
+ sp_destroy_tile_cache(softpipe->cbuf_cache[i]);
++ pipe_surface_reference(&softpipe->framebuffer.cbufs[i], NULL);
++ }
+ sp_destroy_tile_cache(softpipe->zsbuf_cache);
++ pipe_surface_reference(&softpipe->framebuffer.zsbuf, NULL);
+
+- for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
++ for (i = 0; i < PIPE_MAX_SAMPLERS; i++) {
+ sp_destroy_tile_cache(softpipe->tex_cache[i]);
++ pipe_texture_reference(&softpipe->texture[i], NULL);
++ }
+
+ for (i = 0; i < Elements(softpipe->constants); i++) {
+ if (softpipe->constants[i].buffer) {
+diff --git a/src/gallium/drivers/softpipe/sp_fs_sse.c b/src/gallium/drivers/softpipe/sp_fs_sse.c
+index f4fa090..31ccc3b 100644
+--- a/src/gallium/drivers/softpipe/sp_fs_sse.c
++++ b/src/gallium/drivers/softpipe/sp_fs_sse.c
+@@ -101,7 +101,7 @@ fs_sse_run( const struct sp_fragment_shader *base,
+ machine->Consts,
+ (const float (*)[4])shader->immediates,
+ machine->InterpCoefs
+- // , &machine->QuadPos
++ /*, &machine->QuadPos*/
+ );
+
+ return ~(machine->Temps[TGSI_EXEC_TEMP_KILMASK_I].xyzw[TGSI_EXEC_TEMP_KILMASK_C].u[0]);
+diff --git a/src/gallium/drivers/softpipe/sp_state_surface.c b/src/gallium/drivers/softpipe/sp_state_surface.c
+index 7c06d86..181bff8 100644
+--- a/src/gallium/drivers/softpipe/sp_state_surface.c
++++ b/src/gallium/drivers/softpipe/sp_state_surface.c
+@@ -56,7 +56,7 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
+ sp_flush_tile_cache(sp, sp->cbuf_cache[i]);
+
+ /* assign new */
+- sp->framebuffer.cbufs[i] = fb->cbufs[i];
++ pipe_surface_reference(&sp->framebuffer.cbufs[i], fb->cbufs[i]);
+
+ /* update cache */
+ sp_tile_cache_set_surface(sp->cbuf_cache[i], fb->cbufs[i]);
+@@ -71,7 +71,7 @@ softpipe_set_framebuffer_state(struct pipe_context *pipe,
+ sp_flush_tile_cache(sp, sp->zsbuf_cache);
+
+ /* assign new */
+- sp->framebuffer.zsbuf = fb->zsbuf;
++ pipe_surface_reference(&sp->framebuffer.zsbuf, fb->zsbuf);
+
+ /* update cache */
+ sp_tile_cache_set_surface(sp->zsbuf_cache, fb->zsbuf);
+diff --git a/src/gallium/drivers/softpipe/sp_tile_cache.c b/src/gallium/drivers/softpipe/sp_tile_cache.c
+index 461cbb9..5f7864e 100644
+--- a/src/gallium/drivers/softpipe/sp_tile_cache.c
++++ b/src/gallium/drivers/softpipe/sp_tile_cache.c
+@@ -130,6 +130,11 @@ sp_create_tile_cache( struct pipe_screen *screen )
+ tc->entries[pos].x =
+ tc->entries[pos].y = -1;
+ }
++
++#if TILE_CLEAR_OPTIMIZATION
++ /* set flags to indicate all the tiles are cleared */
++ memset(tc->clear_flags, 255, sizeof(tc->clear_flags));
++#endif
+ }
+ return tc;
+ }
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.221&r2=1.222&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa-git.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list