bin/mklib | 20 - configs/darwin | 6 configure.ac | 3 docs/news.html | 2 docs/relnotes-7.6.1.html | 13 + progs/demos/geartrain.c | 21 + progs/demos/isosurf.c | 8 progs/demos/morph3d.c | 2 progs/demos/terrain.c | 5 progs/demos/textures.c | 2 progs/glsl/shtest.c | 2 progs/glsl/texaaline.c | 4 progs/redbook/aaindex.c | 8 progs/redbook/aapoly.c | 8 progs/redbook/aargb.c | 8 progs/redbook/accanti.c | 8 progs/redbook/accpersp.c | 14 - progs/redbook/alpha.c | 6 progs/redbook/alpha3D.c | 8 progs/redbook/anti.c | 6 progs/redbook/bezcurve.c | 8 progs/redbook/bezmesh.c | 8 progs/redbook/checker.c | 8 progs/redbook/clip.c | 8 progs/redbook/colormat.c | 10 progs/redbook/cube.c | 8 progs/redbook/depthcue.c | 6 progs/redbook/dof.c | 12 - progs/redbook/double.c | 12 - progs/redbook/drawf.c | 8 progs/redbook/feedback.c | 14 - progs/redbook/fog.c | 10 progs/redbook/fogindex.c | 6 progs/redbook/font.c | 12 - progs/redbook/hello.c | 4 progs/redbook/image.c | 12 - progs/redbook/light.c | 8 progs/redbook/lines.c | 8 progs/redbook/list.c | 6 progs/redbook/material.c | 6 progs/redbook/mipmap.c | 8 progs/redbook/model.c | 10 progs/redbook/movelight.c | 10 progs/redbook/nurbs.c | 6 progs/redbook/pickdepth.c | 12 - progs/redbook/picksquare.c | 14 - progs/redbook/plane.c | 8 progs/redbook/planet.c | 8 progs/redbook/polyoff.c | 25 -- progs/redbook/polys.c | 4 progs/redbook/quadric.c | 10 progs/redbook/robot.c | 8 progs/redbook/sccolorlight.c | 6 progs/redbook/scene.c | 6 progs/redbook/scenebamb.c | 6 progs/redbook/sceneflat.c | 6 progs/redbook/select.c | 18 - progs/redbook/smooth.c | 10 progs/redbook/stencil.c | 6 progs/redbook/stroke.c | 8 progs/redbook/surface.c | 14 - progs/redbook/teaambient.c | 6 progs/redbook/teapots.c | 8 progs/redbook/tess.c | 18 - progs/redbook/tesswind.c | 18 - progs/redbook/texbind.c | 10 progs/redbook/texgen.c | 10 progs/redbook/texprox.c | 6 progs/redbook/texsub.c | 10 progs/redbook/texturesurf.c | 8 progs/redbook/torus.c | 6 progs/redbook/trim.c | 12 - progs/redbook/unproject.c | 8 progs/redbook/varray.c | 14 - progs/redbook/wrap.c | 10 progs/tests/bug_texstore_i8.c | 2 progs/tests/crossbar.c | 2 progs/tests/cva.c | 8 progs/tests/fptest1.c | 2 progs/tests/invert.c | 2 progs/tests/packedpixels.c | 4 progs/tests/quads.c | 3 progs/tests/scissor-viewport.c | 4 progs/tests/scissor.c | 4 progs/tests/stencilwrap.c | 2 progs/tests/tex1d.c | 2 progs/tests/texcomp_image.h | 2 progs/tests/unfilledclip.c | 2 progs/tests/vpeval.c | 10 progs/trivial/clear-fbo-tex.c | 4 progs/trivial/createwin.c | 2 progs/trivial/dlist-begin-call-end.c | 2 progs/trivial/draw2arrays.c | 2 progs/trivial/drawarrays.c | 2 progs/trivial/tri-blend-max.c | 6 progs/trivial/tri-blend-min.c | 6 progs/trivial/tri-blend-revsub.c | 6 progs/trivial/tri-blend-sub.c | 6 progs/trivial/tri-blend.c | 6 progs/trivial/tri-fbo-tex.c | 3 progs/trivial/tri-fp.c | 2 progs/trivial/tri-logicop-none.c | 2 progs/trivial/tri-logicop-xor.c | 2 progs/trivial/tri-z.c | 6 progs/trivial/vbo-drawarrays.c | 2 progs/trivial/vbo-noninterleaved.c | 4 progs/util/readtex.c | 20 + progs/xdemos/corender.c | 2 progs/xdemos/glxinfo.c | 4 scons/gallium.py | 1 scons/generic.py | 1 src/gallium/auxiliary/rbug/rbug_context.h | 2 src/gallium/auxiliary/rbug/rbug_proto.h | 2 src/gallium/auxiliary/util/u_clear.h | 2 src/gallium/auxiliary/util/u_debug.c | 6 src/gallium/auxiliary/util/u_format.h | 2 src/gallium/auxiliary/util/u_network.c | 6 src/gallium/auxiliary/util/u_network.h | 2 src/gallium/auxiliary/util/u_stream_stdc.c | 2 src/gallium/drivers/i915simple/i915_state.c | 6 src/gallium/drivers/softpipe/sp_quad_blend.c | 3 src/gallium/drivers/trace/tr_dump.c | 4 src/gallium/drivers/trace/tr_rbug.c | 6 src/gallium/state_trackers/egl/egl_surface.c | 4 src/gallium/state_trackers/vega/arc.c | 6 src/gallium/state_trackers/vega/bezier.c | 7 src/gallium/state_trackers/vega/vg_context.c | 3 src/gallium/state_trackers/xorg/xorg_crtc.c | 10 src/gallium/state_trackers/xorg/xorg_driver.c | 10 src/gallium/winsys/drm/intel/gem/intel_drm_api.c | 1 src/gallium/winsys/xlib/Makefile | 8 src/gallium/winsys/xlib/xlib_brw_context.c | 4 src/glu/sgi/libnurbs/internals/arcsorter.h | 1 src/glu/sgi/libnurbs/internals/subdivider.cc | 6 src/glu/sgi/libnurbs/nurbtess/directedLine.cc | 2 src/glu/sgi/libnurbs/nurbtess/partitionY.cc | 4 src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc | 4 src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc | 4 src/glut/glx/glut_menu.c | 5 src/glx/x11/dri2.c | 4 src/glx/x11/glxext.c | 5 src/glx/x11/xf86dri.h | 4 src/mesa/drivers/dri/common/dri_util.c | 2 src/mesa/drivers/dri/ffb/ffb_tris.c | 2 src/mesa/drivers/dri/i810/i810tris.c | 3 src/mesa/drivers/dri/i915/i915_program.c | 2 src/mesa/drivers/dri/i965/brw_disasm.c | 1 src/mesa/drivers/dri/i965/brw_eu_emit.c | 2 src/mesa/drivers/dri/intel/intel_buffers.c | 11 - src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 1 src/mesa/drivers/dri/mach64/mach64_tris.c | 3 src/mesa/drivers/dri/mga/mgatris.c | 3 src/mesa/drivers/dri/r128/r128_tris.c | 3 src/mesa/drivers/dri/r200/Makefile | 2 src/mesa/drivers/dri/r200/radeon_bo.c | 1 src/mesa/drivers/dri/r200/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r200/radeon_cs.c | 1 src/mesa/drivers/dri/r200/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/r300/Makefile | 2 src/mesa/drivers/dri/r300/radeon_bo.c | 1 src/mesa/drivers/dri/r300/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r300/radeon_cs.c | 1 src/mesa/drivers/dri/r300/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/r600/Makefile | 2 src/mesa/drivers/dri/r600/r600_cmdbuf.c | 216 ++++++++++---------- src/mesa/drivers/dri/r600/r600_cmdbuf.h | 16 - src/mesa/drivers/dri/r600/r700_state.c | 13 - src/mesa/drivers/dri/r600/radeon_bo.c | 1 src/mesa/drivers/dri/r600/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r600/radeon_cs.c | 1 src/mesa/drivers/dri/r600/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/radeon/Makefile | 2 src/mesa/drivers/dri/radeon/radeon_bo.c | 110 ++++++++++ src/mesa/drivers/dri/radeon/radeon_bo_drm.h | 198 ++---------------- src/mesa/drivers/dri/radeon/radeon_bo_int_drm.h | 45 ++++ src/mesa/drivers/dri/radeon/radeon_bo_legacy.c | 83 ++++--- src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h | 3 src/mesa/drivers/dri/radeon/radeon_common_context.h | 3 src/mesa/drivers/dri/radeon/radeon_cs.c | 95 ++++++++ src/mesa/drivers/dri/radeon/radeon_cs_drm.h | 215 +++++-------------- src/mesa/drivers/dri/radeon/radeon_cs_int_drm.h | 66 ++++++ src/mesa/drivers/dri/radeon/radeon_cs_legacy.c | 72 +++--- src/mesa/drivers/dri/radeon/radeon_cs_space_drm.c | 66 +++--- src/mesa/drivers/dri/radeon/radeon_dma.c | 1 src/mesa/drivers/dri/radeon/radeon_span.c | 3 src/mesa/drivers/dri/savage/savage_xmesa.c | 4 src/mesa/drivers/dri/savage/savageioctl.c | 2 src/mesa/drivers/dri/savage/savagetris.c | 3 src/mesa/drivers/dri/sis/sis_clear.c | 1 src/mesa/drivers/dri/sis/sis_tris.c | 3 src/mesa/drivers/dri/unichrome/via_ioctl.c | 3 src/mesa/drivers/dri/unichrome/via_screen.c | 2 src/mesa/drivers/dri/unichrome/via_tris.c | 3 src/mesa/main/compiler.h | 5 src/mesa/main/dlopen.c | 14 - src/mesa/main/mtypes.h | 2 src/mesa/main/version.h | 2 src/mesa/shader/lex.yy.c | 4 src/mesa/shader/program_lexer.l | 4 src/mesa/shader/slang/slang_codegen.c | 2 src/mesa/shader/slang/slang_compile.c | 24 +- src/mesa/shader/slang/slang_compile_operation.c | 2 src/mesa/state_tracker/st_atom.c | 8 src/mesa/state_tracker/st_cb_bitmap.c | 2 src/mesa/state_tracker/st_draw.c | 4 src/mesa/state_tracker/st_gen_mipmap.c | 3 src/mesa/swrast/s_atifragshader.c | 2 src/mesa/swrast/s_triangle.c | 6 src/mesa/swrast_setup/ss_tritmp.h | 6 src/mesa/tnl_dd/t_dd_dmatmp.h | 9 src/mesa/tnl_dd/t_dd_dmatmp2.h | 11 + src/mesa/tnl_dd/t_dd_tritmp.h | 4 src/mesa/vbo/vbo_exec_array.c | 2 src/mesa/x86/rtasm/x86sse.c | 2 214 files changed, 1280 insertions(+), 1067 deletions(-)
New commits: commit da876fa3a5df77763fe106b5e0a17b2e672a506c Author: Brian Paul <[email protected]> Date: Sun Dec 27 15:14:25 2009 -0700 docs: insert 7.6.1 release date diff --git a/docs/news.html b/docs/news.html index 2abec2e..a7d834e 100644 --- a/docs/news.html +++ b/docs/news.html @@ -10,7 +10,7 @@ <H1>News</H1> -<h2>November XX, 2009</h2> +<h2>December 21, 2009</h2> <p> <a href="relnotes-7.6.1.html">Mesa 7.6.1</a> is released. This is a bug-fix release fixing issues found in the 7.6 release. diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html index 19d5404..1d0ecd2 100644 --- a/docs/relnotes-7.6.1.html +++ b/docs/relnotes-7.6.1.html @@ -8,7 +8,7 @@ <body bgcolor="#eeeeee"> -<H1>Mesa 7.6.1 Release Notes, (date tbd)</H1> +<H1>Mesa 7.6.1 Release Notes, 21 December 2009</H1> <p> Mesa 7.6.1 is a bug-fix release fixing issues since version 7.6. commit 331e910b5c4b2d2c940991e11027fa8f7dee0e8b Author: Vinson Lee <[email protected]> Date: Sat Dec 26 16:22:25 2009 -0800 gallium/util: Remove comma at end of enumerator list. diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h index 7b5b7fc..bd27f34 100644 --- a/src/gallium/auxiliary/util/u_format.h +++ b/src/gallium/auxiliary/util/u_format.h @@ -79,7 +79,7 @@ enum util_format_colorspace { UTIL_FORMAT_COLORSPACE_RGB = 0, UTIL_FORMAT_COLORSPACE_SRGB = 1, UTIL_FORMAT_COLORSPACE_YUV = 2, - UTIL_FORMAT_COLORSPACE_ZS = 3, + UTIL_FORMAT_COLORSPACE_ZS = 3 }; commit 3c2fd1bae0009ea8231cd77001595f27d6171f7b Author: Vinson Lee <[email protected]> Date: Sat Dec 26 16:18:47 2009 -0800 rbug: Remove comma at end of enumerator list. diff --git a/src/gallium/auxiliary/rbug/rbug_proto.h b/src/gallium/auxiliary/rbug/rbug_proto.h index d273be0..4f3eb75 100644 --- a/src/gallium/auxiliary/rbug/rbug_proto.h +++ b/src/gallium/auxiliary/rbug/rbug_proto.h @@ -65,7 +65,7 @@ enum rbug_opcode RBUG_OP_SHADER_DISABLE = 770, RBUG_OP_SHADER_REPLACE = 771, RBUG_OP_SHADER_LIST_REPLY = -768, - RBUG_OP_SHADER_INFO_REPLY = -769, + RBUG_OP_SHADER_INFO_REPLY = -769 }; /** commit f8ca25e02faa094218e741af041464728347574f Author: Vinson Lee <[email protected]> Date: Sat Dec 26 16:14:39 2009 -0800 rbug: Remove comma at end of enumerator list. diff --git a/src/gallium/auxiliary/rbug/rbug_context.h b/src/gallium/auxiliary/rbug/rbug_context.h index da61c23..03126d6 100644 --- a/src/gallium/auxiliary/rbug/rbug_context.h +++ b/src/gallium/auxiliary/rbug/rbug_context.h @@ -46,7 +46,7 @@ typedef enum RBUG_BLOCK_BEFORE = 1, RBUG_BLOCK_AFTER = 2, RBUG_BLOCK_RULE = 4, - RBUG_BLOCK_MASK = 7, + RBUG_BLOCK_MASK = 7 } rbug_block_t; struct rbug_proto_context_list commit fc11424bcded0b1cea0acf45936c4af1f1a4b85b Author: Vinson Lee <[email protected]> Date: Sat Dec 26 16:09:41 2009 -0800 mesa: Remove comma at end of enumerator list. diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index f8e4e41..21e3d47 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3125,7 +3125,7 @@ enum _verbose VERBOSE_LIGHTING = 0x0200, VERBOSE_PRIMS = 0x0400, VERBOSE_VERTS = 0x0800, - VERBOSE_DISASSEM = 0x1000, + VERBOSE_DISASSEM = 0x1000 }; commit 309c156bae59124be17137d0f559d2c054231f7c Author: Vinson Lee <[email protected]> Date: Sat Dec 26 15:55:38 2009 -0800 i915: Fix assert. diff --git a/src/mesa/drivers/dri/i915/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c index e87700f..ce2c975 100644 --- a/src/mesa/drivers/dri/i915/i915_program.c +++ b/src/mesa/drivers/dri/i915/i915_program.c @@ -239,7 +239,7 @@ GLuint i915_emit_texld( struct i915_fragment_program *p, } else { assert(GET_UREG_TYPE(dest) != REG_TYPE_CONST); - assert(dest = UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest))); + assert(dest == UREG(GET_UREG_TYPE(dest), GET_UREG_NR(dest))); /* Can't use unsaved temps for coords, as the phase boundary would result * in the contents becoming undefined. */ commit e81fe088f447b959b354fadf0d73fcc7ac7c468d Author: Vinson Lee <[email protected]> Date: Sat Dec 26 01:08:26 2009 -0800 progs/demos: Silence warn_unused_result warnings. diff --git a/progs/demos/geartrain.c b/progs/demos/geartrain.c index 8fe405e..e6567dd 100644 --- a/progs/demos/geartrain.c +++ b/progs/demos/geartrain.c @@ -25,6 +25,7 @@ */ +#include <assert.h> #include <math.h> #include <stdlib.h> #include <GL/glut.h> @@ -129,8 +130,10 @@ Clear_Buffers () static void LoadTriplet (TDA A) { + int result; Clear_Buffers (); - fscanf (mainfile, "%s %s %s %s", Buf1, Buf2, Buf3, Buf4); + result = fscanf (mainfile, "%s %s %s %s", Buf1, Buf2, Buf3, Buf4); + assert(result != EOF); A[0] = atof (Buf2); A[1] = atof (Buf3); A[2] = atof (Buf4); @@ -140,8 +143,10 @@ LoadTriplet (TDA A) static void LoadReal (float *a) { + int result; Clear_Buffers (); - fscanf (mainfile, "%s %s", Buf1, Buf2); + result = fscanf (mainfile, "%s %s", Buf1, Buf2); + assert(result != EOF); *a = atof (Buf2); } @@ -149,8 +154,10 @@ LoadReal (float *a) static void LoadInteger (int *a) { + int result; Clear_Buffers (); - fscanf (mainfile, "%s %s", Buf1, Buf2); + result = fscanf (mainfile, "%s %s", Buf1, Buf2); + assert(result != EOF); *a = atoi (Buf2); } @@ -158,8 +165,10 @@ LoadInteger (int *a) static void LoadText (char *a) { + int result; Clear_Buffers (); - fscanf (mainfile, "%s %s", Buf1, Buf2); + result = fscanf (mainfile, "%s %s", Buf1, Buf2); + assert(result != EOF); strcpy (a, Buf2); } @@ -177,8 +186,10 @@ getdata (char filename[]) do { + int result; Clear_Buffers (); - fscanf (mainfile, "%s", Buf1); + result = fscanf (mainfile, "%s", Buf1); + (void) result; if (ferror (mainfile)) { printf ("\nError opening file !\n"); diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c index 2e9dff1..dd56965 100644 --- a/progs/demos/isosurf.c +++ b/progs/demos/isosurf.c @@ -132,9 +132,11 @@ static void read_surface( char *filename ) numverts = 0; while (!feof(f) && numverts<maxverts) { - fscanf( f, "%f %f %f %f %f %f", - &data[numverts][0], &data[numverts][1], &data[numverts][2], - &data[numverts][3], &data[numverts][4], &data[numverts][5] ); + int result; + result = fscanf( f, "%f %f %f %f %f %f", + &data[numverts][0], &data[numverts][1], &data[numverts][2], + &data[numverts][3], &data[numverts][4], &data[numverts][5] ); + (void) result; numverts++; } numverts--; diff --git a/progs/demos/terrain.c b/progs/demos/terrain.c index be78ea4..9ba7b61 100644 --- a/progs/demos/terrain.c +++ b/progs/demos/terrain.c @@ -8,6 +8,7 @@ * based on a Mikael SkiZoWalker's (MoDEL) / France ([email protected]) demo */ +#include <assert.h> #include <stdio.h> #include <math.h> #include <stdlib.h> @@ -559,12 +560,14 @@ loadpic(void) FILE *FilePic; int i, tmp; GLenum gluerr; + size_t result; if ((FilePic = fopen("terrain.dat", "r")) == NULL) { fprintf(stderr, "Error loading terrain.dat\n"); exit(-1); } - fread(bufferter, 256 * 256, 1, FilePic); + result = fread(bufferter, 256 * 256, 1, FilePic); + assert(result == 1); fclose(FilePic); for (i = 0; i < (256 * 256); i++) { commit cdc69e34694a16e9f762aba45d7eba05e9dc8514 Author: Vinson Lee <[email protected]> Date: Fri Dec 25 23:13:50 2009 -0800 progs/util: Silence warn_unused_result warnings. diff --git a/progs/util/readtex.c b/progs/util/readtex.c index d1c50a4..f6f5114 100644 --- a/progs/util/readtex.c +++ b/progs/util/readtex.c @@ -9,6 +9,7 @@ #include <GL/gl.h> #include <GL/glu.h> +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -89,6 +90,7 @@ static rawImageRec *RawImageOpen(const char *fileName) rawImageRec *raw; GLenum swapFlag; int x; + size_t result; endianTest.testWord = 1; if (endianTest.testByte[0] == 1) { @@ -114,7 +116,8 @@ static rawImageRec *RawImageOpen(const char *fileName) } } - fread(raw, 1, 12, raw->file); + result = fread(raw, 1, 12, raw->file); + assert(result == 12); if (swapFlag) { ConvertShort(&raw->imagic, 1); @@ -162,8 +165,10 @@ static rawImageRec *RawImageOpen(const char *fileName) } raw->rleEnd = 512 + (2 * x); fseek(raw->file, 512, SEEK_SET); - fread(raw->rowStart, 1, x, raw->file); - fread(raw->rowSize, 1, x, raw->file); + result = fread(raw->rowStart, 1, x, raw->file); + assert(result == x); + result = fread(raw->rowSize, 1, x, raw->file); + assert(result == x); if (swapFlag) { ConvertLong(raw->rowStart, (long) (x/sizeof(GLuint))); ConvertLong((GLuint *)raw->rowSize, (long) (x/sizeof(GLint))); @@ -193,11 +198,13 @@ static void RawImageGetRow(rawImageRec *raw, unsigned char *buf, int y, int z) { unsigned char *iPtr, *oPtr, pixel; int count, done = 0; + size_t result; if ((raw->type & 0xFF00) == 0x0100) { fseek(raw->file, (long) raw->rowStart[y+z*raw->sizeY], SEEK_SET); - fread(raw->tmp, 1, (unsigned int)raw->rowSize[y+z*raw->sizeY], - raw->file); + result = fread(raw->tmp, 1, (unsigned int)raw->rowSize[y+z*raw->sizeY], + raw->file); + assert(result == (unsigned int)raw->rowSize[y+z*raw->sizeY]); iPtr = raw->tmp; oPtr = buf; @@ -222,7 +229,8 @@ static void RawImageGetRow(rawImageRec *raw, unsigned char *buf, int y, int z) } else { fseek(raw->file, 512+(y*raw->sizeX)+(z*raw->sizeX*raw->sizeY), SEEK_SET); - fread(buf, 1, raw->sizeX, raw->file); + result = fread(buf, 1, raw->sizeX, raw->file); + assert(result == raw->sizeX); } } commit cd59e6f553ed0585f9d1a361adab007ede9aa0f6 Author: Vinson Lee <[email protected]> Date: Fri Dec 25 22:34:35 2009 -0800 intel: Silence implicit function declaration warning. diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c index 18e6ebd..4a92410 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c @@ -32,6 +32,7 @@ #include "main/mtypes.h" #include "main/macros.h" #include "main/bufferobj.h" +#include "main/polygon.h" #include "main/pixelstore.h" #include "main/state.h" #include "main/teximage.h" commit 67a4abcc3b9daabdf873d750e689893fcc94e4d5 Author: Vinson Lee <[email protected]> Date: Fri Dec 25 14:23:10 2009 -0800 glu/sgi: Fix include recursion. arcsorter.h should not include itself. diff --git a/src/glu/sgi/libnurbs/internals/arcsorter.h b/src/glu/sgi/libnurbs/internals/arcsorter.h index d72dd1e..a55df92 100644 --- a/src/glu/sgi/libnurbs/internals/arcsorter.h +++ b/src/glu/sgi/libnurbs/internals/arcsorter.h @@ -37,7 +37,6 @@ #define __gluarcsorter_h_ #include "sorter.h" -#include "arcsorter.h" class Arc; class Subdivider; commit 2447786ed00a19466c9cc9b9efbfa084e88114eb Author: Vinson Lee <[email protected]> Date: Thu Dec 24 22:58:05 2009 -0800 i965: Fix assert. diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index 241cdc3..b346277 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c @@ -852,7 +852,7 @@ void brw_land_fwd_jump(struct brw_compile *p, jmpi = 2; assert(jmp_insn->header.opcode == BRW_OPCODE_JMPI); - assert(jmp_insn->bits1.da1.src1_reg_file = BRW_IMMEDIATE_VALUE); + assert(jmp_insn->bits1.da1.src1_reg_file == BRW_IMMEDIATE_VALUE); jmp_insn->bits3.ud = jmpi * ((landing - jmp_insn) - 1); } commit f5ad1d0d02cae06bff3ee120c75ad4ab458d2c7d Author: Vinson Lee <[email protected]> Date: Thu Dec 24 16:26:09 2009 -0800 i965: Add missing va_end. diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c index 9fef230..130bd0f 100644 --- a/src/mesa/drivers/dri/i965/brw_disasm.c +++ b/src/mesa/drivers/dri/i965/brw_disasm.c @@ -365,6 +365,7 @@ static int format (FILE *f, char *format, ...) va_start (args, format); vsnprintf (buf, sizeof (buf) - 1, format, args); + va_end (args); string (f, buf); return 0; } commit 098f10c2709a33bb5f35d52a42818ce7cbcaadb5 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 18:00:06 2009 -0800 glsl: Initialize member a_obj of struct slang_operation. diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c index be73094..3a15d9d 100644 --- a/src/mesa/shader/slang/slang_compile_operation.c +++ b/src/mesa/shader/slang/slang_compile_operation.c @@ -46,6 +46,7 @@ slang_operation_construct(slang_operation * oper) oper->literal_size = 1; oper->array_constructor = GL_FALSE; oper->a_id = SLANG_ATOM_NULL; + oper->a_obj = SLANG_ATOM_NULL; oper->locals = _slang_variable_scope_new(NULL); if (oper->locals == NULL) return GL_FALSE; commit 261c3cd530437362f906ef78459ffda7ab2b2077 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 17:50:02 2009 -0800 glu/sgi: Initialize variable in directedLine. diff --git a/src/glu/sgi/libnurbs/nurbtess/directedLine.cc b/src/glu/sgi/libnurbs/nurbtess/directedLine.cc index 7445035..5be1ae3 100644 --- a/src/glu/sgi/libnurbs/nurbtess/directedLine.cc +++ b/src/glu/sgi/libnurbs/nurbtess/directedLine.cc @@ -800,7 +800,7 @@ directedLine* readAllPolygons(char* filename) { Int nEdges; fscanf(fp, "%i", &nEdges); - Real vert[2][2]; + Real vert[2][2] = { { 0 } }; Real VV[2][2]; /*the first two vertices*/ fscanf(fp, "%f", &(vert[0][0])); commit 520955a0cd16d29ddae194ff7efc262b0d5a4fc4 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 16:22:03 2009 -0800 gallium/util: Initialize variable in util_clear. diff --git a/src/gallium/auxiliary/util/u_clear.h b/src/gallium/auxiliary/util/u_clear.h index 7c16b32..7035c68 100644 --- a/src/gallium/auxiliary/util/u_clear.h +++ b/src/gallium/auxiliary/util/u_clear.h @@ -45,7 +45,7 @@ util_clear(struct pipe_context *pipe, { if (buffers & PIPE_CLEAR_COLOR) { struct pipe_surface *ps = framebuffer->cbufs[0]; - unsigned color; + unsigned color = 0; util_pack_color(rgba, ps->format, &color); pipe->surface_fill(pipe, ps, 0, 0, ps->width, ps->height, color); commit 6138145b350d9e58725b43162680b43904497ec8 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 16:11:10 2009 -0800 glu/sgi: Silence compiler warnings. diff --git a/src/glu/sgi/libnurbs/internals/subdivider.cc b/src/glu/sgi/libnurbs/internals/subdivider.cc index cc0b514..ccddc27 100644 --- a/src/glu/sgi/libnurbs/internals/subdivider.cc +++ b/src/glu/sgi/libnurbs/internals/subdivider.cc @@ -531,16 +531,18 @@ Subdivider::nonSamplingSplit( patchlist.pspec[param].range[1] ) * 0.5; split( source, left, right, param, mid ); Patchlist subpatchlist( patchlist, param, mid ); - if( left.isnonempty() ) + if( left.isnonempty() ) { if( subpatchlist.cullCheck() == CULL_TRIVIAL_REJECT ) freejarcs( left ); else nonSamplingSplit( left, subpatchlist, subdivisions-1, param ); - if( right.isnonempty() ) + } + if( right.isnonempty() ) { if( patchlist.cullCheck() == CULL_TRIVIAL_REJECT ) freejarcs( right ); else nonSamplingSplit( right, patchlist, subdivisions-1, param ); + } } else { // make bbox calls diff --git a/src/glu/sgi/libnurbs/nurbtess/partitionY.cc b/src/glu/sgi/libnurbs/nurbtess/partitionY.cc index 297c629..e097461 100644 --- a/src/glu/sgi/libnurbs/nurbtess/partitionY.cc +++ b/src/glu/sgi/libnurbs/nurbtess/partitionY.cc @@ -111,8 +111,8 @@ Int isCusp(directedLine *v) else if(A[1] > B[1] && C[1] > B[1]) return 1; - if(isAbove(v, v) && isAbove(v, v->getPrev()) || - isBelow(v, v) && isBelow(v, v->getPrev())) + if((isAbove(v, v) && isAbove(v, v->getPrev())) || + (isBelow(v, v) && isBelow(v, v->getPrev()))) return 1; else return 0; commit 51dcea2aac08ed68b713de0a741c782d51a5b916 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 15:19:45 2009 -0800 util: Ensure debug_dump_flags generates a null-terminated string. diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c index 96d400c..be5eb87 100644 --- a/src/gallium/auxiliary/util/u_debug.c +++ b/src/gallium/auxiliary/util/u_debug.c @@ -452,7 +452,8 @@ debug_dump_flags(const struct debug_named_value *names, util_strncat(output, "|", sizeof(output)); else first = 0; - util_strncat(output, names->name, sizeof(output)); + util_strncat(output, names->name, sizeof(output) - 1); + output[sizeof(output) - 1] = '\0'; value &= ~names->value; } ++names; @@ -465,7 +466,8 @@ debug_dump_flags(const struct debug_named_value *names, first = 0; util_snprintf(rest, sizeof(rest), "0x%08lx", value); - util_strncat(output, rest, sizeof(output)); + util_strncat(output, rest, sizeof(output) - 1); + output[sizeof(output) - 1] = '\0'; } if(first) commit 2ea061509ddab9054514ad87f28de950fb30dba1 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 14:52:06 2009 -0800 st/xorg: Use C-style comments. diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c index 67fe29a..669bb54 100644 --- a/src/gallium/state_trackers/xorg/xorg_crtc.c +++ b/src/gallium/state_trackers/xorg/xorg_crtc.c @@ -64,7 +64,7 @@ struct crtc_private static void crtc_dpms(xf86CrtcPtr crtc, int mode) { - //ScrnInfoPtr pScrn = crtc->scrn; + /* ScrnInfoPtr pScrn = crtc->scrn; */ switch (mode) { case DPMSModeOn: @@ -141,7 +141,7 @@ crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, static void crtc_load_lut(xf86CrtcPtr crtc) { - //ScrnInfoPtr pScrn = crtc->scrn; + /* ScrnInfoPtr pScrn = crtc->scrn; */ } #endif @@ -154,7 +154,7 @@ crtc_gamma_set(xf86CrtcPtr crtc, CARD16 * red, CARD16 * green, CARD16 * blue, static void * crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height) { - //ScrnInfoPtr pScrn = crtc->scrn; + /* ScrnInfoPtr pScrn = crtc->scrn; */ return NULL; } @@ -162,7 +162,7 @@ crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height) static PixmapPtr crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) { - //ScrnInfoPtr pScrn = crtc->scrn; + /* ScrnInfoPtr pScrn = crtc->scrn; */ return NULL; } @@ -170,7 +170,7 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height) static void crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data) { - //ScrnInfoPtr pScrn = crtc->scrn; + /* ScrnInfoPtr pScrn = crtc->scrn; */ } static void diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c index 643b6b3..05f1473 100644 --- a/src/gallium/state_trackers/xorg/xorg_driver.c +++ b/src/gallium/state_trackers/xorg/xorg_driver.c @@ -179,10 +179,12 @@ static Bool crtc_resize(ScrnInfoPtr pScrn, int width, int height) { modesettingPtr ms = modesettingPTR(pScrn); - //ScreenPtr pScreen = pScrn->pScreen; - //PixmapPtr rootPixmap = pScreen->GetScreenPixmap(pScreen); - //Bool fbAccessDisabled; - //CARD8 *fbstart; + /* + ScreenPtr pScreen = pScrn->pScreen; + PixmapPtr rootPixmap = pScreen->GetScreenPixmap(pScreen); + Bool fbAccessDisabled; + CARD8 *fbstart; + */ if (width == pScrn->virtualX && height == pScrn->virtualY) return TRUE; commit 15ecd0337e4e4d9d33449bdff014a634e368c7d6 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 14:43:53 2009 -0800 st/vega: Move declaration outside for loop. diff --git a/src/gallium/state_trackers/vega/arc.c b/src/gallium/state_trackers/vega/arc.c index e74c7f0..36cde7a 100644 --- a/src/gallium/state_trackers/vega/arc.c +++ b/src/gallium/state_trackers/vega/arc.c @@ -537,8 +537,9 @@ static INLINE int num_beziers_needed(struct arc *arc) double d_eta = (max_eta - min_eta) / n; if (d_eta <= 0.5 * M_PI) { double eta_b = min_eta; + int i; found = VG_TRUE; - for (int i = 0; found && (i < n); ++i) { + for (i = 0; found && (i < n); ++i) { double etaA = eta_b; eta_b += d_eta; found = (estimate_error(arc, etaA, eta_b) <= threshold); @@ -559,6 +560,7 @@ static void arc_to_beziers(struct arc *arc, sin_eta_b, a_cos_eta_b, b_sin_eta_b, a_sin_eta_b, b_cos_eta_b, x_b, y_b, x_b_dot, y_b_dot, lx, ly; double t, alpha; + int i; { /* always move to the start of the arc */ VGfloat x = arc->x1; @@ -607,7 +609,7 @@ static void arc_to_beziers(struct arc *arc, t = tan(0.5 * d_eta); alpha = sin(d_eta) * (sqrt(4 + 3 * t * t) - 1) / 3; - for (int i = 0; i < n; ++i) { + for (i = 0; i < n; ++i) { struct bezier bezier; double xA = x_b; double yA = y_b; diff --git a/src/gallium/state_trackers/vega/bezier.c b/src/gallium/state_trackers/vega/bezier.c index 39a7ade..d1ee41a 100644 --- a/src/gallium/state_trackers/vega/bezier.c +++ b/src/gallium/state_trackers/vega/bezier.c @@ -255,7 +255,8 @@ static enum shift_result good_offset(const struct bezier *b1, const float max_dist_line = threshold*offset*offset; const float max_dist_normal = threshold*offset; const float spacing = 0.25; - for (float i = spacing; i < 0.99; i += spacing) { + float i; + for (i = spacing; i < 0.99; i += spacing) { float p1[2],p2[2], d, l; float normal[2]; bezier_point_at(b1, i, p1); @@ -341,6 +342,8 @@ static enum shift_result shift(const struct bezier *orig, float points_shifted[4][2]; float prev_normal[2]; + int i; + points[np][0] = orig->x1; points[np][1] = orig->y1; map[0] = 0; @@ -404,7 +407,7 @@ static enum shift_result shift(const struct bezier *orig, points_shifted[0][0] = points[0][0] + offset * prev_normal[0]; points_shifted[0][1] = points[0][1] + offset * prev_normal[1]; - for (int i = 1; i < np - 1; ++i) { + for (i = 1; i < np - 1; ++i) { float normal_sum[2], r; float next_normal[2]; compute_pt_normal(points[i], points[i + 1], next_normal); diff --git a/src/gallium/state_trackers/vega/vg_context.c b/src/gallium/state_trackers/vega/vg_context.c index e0ff02f..1572c9f 100644 --- a/src/gallium/state_trackers/vega/vg_context.c +++ b/src/gallium/state_trackers/vega/vg_context.c @@ -231,6 +231,7 @@ static void update_clip_state(struct vg_context *ctx) if (state->scissoring) { struct pipe_blend_state *blend = &ctx->state.g3d.blend; struct pipe_framebuffer_state *fb = &ctx->state.g3d.fb; + int i; dsa->depth.writemask = 1;/*glDepthMask(TRUE);*/ dsa->depth.func = PIPE_FUNC_ALWAYS; dsa->depth.enabled = 1; @@ -254,7 +255,7 @@ static void update_clip_state(struct vg_context *ctx) cso_set_blend(ctx->cso_context, blend); /* enable scissoring */ - for (int i = 0; i < state->scissor_rects_num; ++i) { + for (i = 0; i < state->scissor_rects_num; ++i) { const float x = state->scissor_rects[i * 4 + 0].f; const float y = state->scissor_rects[i * 4 + 1].f; const float width = state->scissor_rects[i * 4 + 2].f; commit 1b0ab3e3c9bd1a57069657bf5126ade2d8d44d30 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 14:18:11 2009 -0800 st/egl: Use C-style comments. diff --git a/src/gallium/state_trackers/egl/egl_surface.c b/src/gallium/state_trackers/egl/egl_surface.c index 69e2d6b..277ad9d 100644 --- a/src/gallium/state_trackers/egl/egl_surface.c +++ b/src/gallium/state_trackers/egl/egl_surface.c @@ -141,9 +141,9 @@ drm_takedown_shown_screen(_EGLDisplay *dpy, struct drm_screen *screen) drmModeSetCrtc( dev->drmFD, screen->crtcID, - 0, // FD + 0, /* FD */ 0, 0, - NULL, 0, // List of output ids + NULL, 0, /* List of output ids */ NULL); drmModeRmFB(dev->drmFD, screen->fbID); commit 6c8c1ce78b59f76c4a4e0c354f74e6dfb5615e8a Author: Vinson Lee <[email protected]> Date: Wed Dec 23 14:09:36 2009 -0800 glx: Add XF86DRI[Open|Close]FullScreen prototypes to xf86dri.h. diff --git a/src/glx/x11/xf86dri.h b/src/glx/x11/xf86dri.h index f2d0dd5..ba26600 100644 --- a/src/glx/x11/xf86dri.h +++ b/src/glx/x11/xf86dri.h @@ -115,6 +115,10 @@ Bool XF86DRIGetDeviceInfo(Display * dpy, int screen, int *fbSize, int *fbStride, int *devPrivateSize, void **pDevPrivate); +Bool XF86DRIOpenFullScreen(Display * dpy, int screen, Drawable drawable); + +Bool XF86DRICloseFullScreen(Display * dpy, int screen, Drawable drawable); + _XFUNCPROTOEND #endif /* _XF86DRI_SERVER_ */ #endif /* _XF86DRI_H_ */ commit cf3bb0cf315a761210a0b3bf426aa6f30024fac3 Author: Vinson Lee <[email protected]> Date: Wed Dec 23 12:42:38 2009 -0800 glx: Move declaration outside for loop. diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c index e5553cb..5633a3e 100644 --- a/src/glx/x11/glxext.c +++ b/src/glx/x11/glxext.c @@ -150,8 +150,9 @@ FreeScreenConfigs(__GLXdisplayPrivate * priv) #ifdef GLX_DIRECT_RENDERING if (psc->driver_configs) { - for (unsigned int i = 0; psc->driver_configs[i]; i++) - free((__DRIconfig *) psc->driver_configs[i]); + unsigned int j; + for (j = 0; psc->driver_configs[j]; j++) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
