mesa: Changes to 'upstream-experimental'
Makefile | 2
configs/autoconf.in | 3
configs/default | 5
configs/linux-dri | 2
configs/linux-llvm | 2
configure.ac | 14
docs/envvars.html | 102
docs/news.html | 13
docs/relnotes-7.10.1.html | 375 +
docs/relnotes-7.10.html | 13
docs/relnotes-7.9.1.html | 6
docs/relnotes.html | 3
docs/shading.html | 2
docs/sourcetree.html | 1
include/GL/gl_mangle.h | 332 +
src/SConscript | 1
src/gallium/auxiliary/cso_cache/cso_context.c | 2
src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h | 3
src/gallium/auxiliary/gallivm/lp_bld_const.h | 18
src/gallium/auxiliary/gallivm/lp_bld_format_aos.c | 54
src/gallium/drivers/llvmpipe/lp_setup.c | 4
src/gallium/drivers/nv50/nv50_tgsi_to_nc.c | 2
src/gallium/drivers/softpipe/sp_setup.c | 2
src/gallium/state_trackers/dri/common/dri_context.c | 10
src/gallium/state_trackers/dri/common/dri_drawable.c | 1
src/gallium/state_trackers/dri/common/dri_drawable.h | 3
src/gallium/state_trackers/dri/drm/dri2.c | 2
src/gallium/targets/SConscript.dri | 1
src/gallium/targets/libgl-gdi/SConscript | 1
src/gallium/targets/libgl-xlib/SConscript | 1
src/gallium/winsys/radeon/drm/radeon_r300.c | 2
src/glsl/Makefile | 5
src/glsl/SConscript | 7
src/glsl/ast.h | 21
src/glsl/ast_expr.cpp | 4
src/glsl/ast_function.cpp | 129
src/glsl/ast_to_hir.cpp | 230 -
src/glsl/ast_type.cpp | 5
src/glsl/builtin_function.cpp | 8
src/glsl/builtin_types.h | 3
src/glsl/builtins/tools/generate_builtins.py | 10
src/glsl/glcpp/glcpp-lex.c | 22
src/glsl/glcpp/glcpp-lex.l | 14
src/glsl/glcpp/glcpp-parse.c | 412 -
src/glsl/glcpp/glcpp-parse.y | 200
src/glsl/glcpp/glcpp.c | 10
src/glsl/glcpp/glcpp.h | 4
src/glsl/glcpp/pp.c | 30
src/glsl/glsl_lexer.cpp | 1983 ++++----
src/glsl/glsl_lexer.lpp | 23
src/glsl/glsl_parser.cpp | 3067 +++++++------
src/glsl/glsl_parser.h | 237 -
src/glsl/glsl_parser.ypp | 210
src/glsl/glsl_parser_extras.cpp | 52
src/glsl/glsl_parser_extras.h | 46
src/glsl/glsl_symbol_table.cpp | 19
src/glsl/glsl_symbol_table.h | 20
src/glsl/glsl_types.cpp | 30
src/glsl/glsl_types.h | 26
src/glsl/ir.cpp | 19
src/glsl/ir.h | 20
src/glsl/ir_clone.cpp | 2
src/glsl/ir_constant_expression.cpp | 34
src/glsl/ir_expression_flattening.cpp | 2
src/glsl/ir_import_prototypes.cpp | 4
src/glsl/ir_reader.cpp | 24
src/glsl/ir_validate.cpp | 4
src/glsl/ir_variable_refcount.h | 4
src/glsl/link_functions.cpp | 22
src/glsl/linker.cpp | 94
src/glsl/list.h | 28
src/glsl/loop_analysis.cpp | 14
src/glsl/loop_controls.cpp | 6
src/glsl/loop_unroll.cpp | 4
src/glsl/lower_discard.cpp | 2
src/glsl/lower_if_to_cond_assign.cpp | 2
src/glsl/lower_mat_op_to_vec.cpp | 2
src/glsl/lower_noise.cpp | 2
src/glsl/lower_texture_projection.cpp | 2
src/glsl/lower_variable_index_to_cond_assign.cpp | 58
src/glsl/lower_vec_index_to_cond_assign.cpp | 4
src/glsl/lower_vec_index_to_swizzle.cpp | 2
src/glsl/lower_vector.cpp | 2
src/glsl/main.cpp | 34
src/glsl/opt_algebraic.cpp | 2
src/glsl/opt_constant_propagation.cpp | 6
src/glsl/opt_copy_propagation.cpp | 6
src/glsl/opt_dead_code_local.cpp | 4
src/glsl/opt_dead_functions.cpp | 4
src/glsl/opt_function_inlining.cpp | 6
src/glsl/opt_structure_splitting.cpp | 16
src/glsl/ralloc.c | 442 +
src/glsl/ralloc.h | 345 +
src/glsl/s_expression.cpp | 8
src/glsl/s_expression.h | 2
src/glx/glx_pbuffer.c | 11
src/glx/glxcmds.c | 8
src/glx/glxext.c | 2
src/mapi/glapi/gen/ARB_ES2_compatibility.xml | 58
src/mapi/glapi/gen/Makefile | 1
src/mapi/glapi/gen/gl_API.xml | 2
src/mapi/glapi/gen/gl_x86-64_asm.py | 3
src/mapi/glapi/gen/gl_x86_asm.py | 2
src/mapi/glapi/glapi_sparc.S | 609 +-
src/mapi/glapi/glapi_x86-64.S | 2788 ++++++------
src/mapi/glapi/glapi_x86.S | 913 ++--
src/mapi/glapi/glapitable.h | 567 +-
src/mapi/glapi/glapitemp.h | 244 -
src/mapi/glapi/glprocs.h | 1416 +++---
src/mesa/Makefile | 6
src/mesa/SConscript | 1
src/mesa/drivers/dri/common/dri_util.c | 3
src/mesa/drivers/dri/i915/i915_context.c | 28
src/mesa/drivers/dri/i915/i915_fragprog.c | 36
src/mesa/drivers/dri/i965/brw_context.c | 9
src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp | 2
src/mesa/drivers/dri/i965/brw_fs.cpp | 190
src/mesa/drivers/dri/i965/brw_fs.h | 37
src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 2
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 9
src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 14
src/mesa/drivers/dri/i965/brw_program.c | 4
src/mesa/drivers/dri/i965/brw_vs_emit.c | 8
src/mesa/drivers/dri/i965/gen6_clip_state.c | 2
src/mesa/drivers/dri/i965/gen6_sf_state.c | 4
src/mesa/drivers/dri/intel/intel_context.c | 6
src/mesa/drivers/dri/intel/intel_extensions_es2.c | 13
src/mesa/drivers/dri/intel/intel_fbo.c | 13
src/mesa/drivers/dri/r200/r200_state_init.c | 2
src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c | 2
src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c | 6
src/mesa/drivers/dri/r600/r700_assembler.c | 83
src/mesa/drivers/dri/radeon/radeon_span.c | 8
src/mesa/drivers/dri/radeon/radeon_state.c | 3
src/mesa/drivers/dri/radeon/radeon_state_init.c | 2
src/mesa/drivers/dri/radeon/radeon_texstate.c | 28
src/mesa/drivers/osmesa/Makefile | 2
src/mesa/main/APIspec.xml | 2
src/mesa/main/api_exec.c | 4
src/mesa/main/arrayobj.c | 2
src/mesa/main/context.c | 10
src/mesa/main/depth.c | 6
src/mesa/main/depth.h | 3
src/mesa/main/enums.c | 4
src/mesa/main/extensions.c | 910 +---
src/mesa/main/fbobject.c | 7
src/mesa/main/formats.c | 15
src/mesa/main/get.c | 28
src/mesa/main/glapidispatch.h | 1158 ++---
src/mesa/main/imports.c | 2
src/mesa/main/mipmap.c | 2
src/mesa/main/mtypes.h | 19
src/mesa/main/remap_helper.h | 3166 +++++++-------
src/mesa/main/shaderapi.c | 65
src/mesa/main/shaderobj.c | 12
src/mesa/main/texenvprogram.c | 4
src/mesa/main/uniforms.c | 55
src/mesa/main/varray.c | 68
src/mesa/main/version.h | 4
src/mesa/main/viewport.c | 6
src/mesa/main/viewport.h | 3
src/mesa/program/ir_to_mesa.cpp | 38
src/mesa/program/register_allocate.c | 27
src/mesa/program/sampler.cpp | 22
src/mesa/state_tracker/st_atom_sampler.c | 46
src/mesa/state_tracker/st_cb_clear.c | 18
src/mesa/state_tracker/st_cb_drawpixels.c | 7
src/mesa/state_tracker/st_cb_fbo.c | 2
src/mesa/state_tracker/st_cb_texture.c | 3
src/mesa/state_tracker/st_format.c | 59
src/mesa/state_tracker/st_format.h | 6
src/mesa/state_tracker/st_mesa_to_tgsi.c | 10
src/mesa/tnl/t_draw.c | 40
src/mesa/x86-64/xform4.S | 14
src/mesa/x86/read_rgba_span_x86.S | 2
src/talloc/SConscript | 20
src/talloc/gpl-3.0.txt | 674 --
src/talloc/lgpl-3.0.txt | 165
src/talloc/talloc.c | 2034 --------
src/talloc/talloc.def | 63
src/talloc/talloc.h | 202
src/talloc/talloc_guide.txt | 757 ---
182 files changed, 12533 insertions(+), 13419 deletions(-)
New commits:
commit 565caabf40b872d2817c4181c2831ac7a917b51d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Mar 2 13:54:20 2011 -0800
docs: Add change log to 7.10.1 release notes
diff --git a/docs/relnotes-7.10.1.html b/docs/relnotes-7.10.1.html
index 5b2fc78..75f325e 100644
--- a/docs/relnotes-7.10.1.html
+++ b/docs/relnotes-7.10.1.html
@@ -123,9 +123,252 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
<p>The full set of changes can be viewed by using the following GIT command:</p>
<pre>
- git log mesa-7.10..origin/7.10
+ git log mesa-7.10..mesa-7.10.1
</pre>
+<p>Alberto Milone (1):
+<ul>
+ <li>r600c: add evergreen ARL support.</li>
+</ul></p>
+
+<p>Brian Paul (21):
+<ul>
+ <li>draw: Fix an off-by-one bug in a vsplit assertion.</li>
+ <li>docs: add links to 7.9.1 and 7.10 release notes</li>
+ <li>docs: added news item for 7.9.1 and 7.10 release</li>
+ <li>gallivm: work around LLVM 2.6 bug when calling C functions</li>
+ <li>gallivm: fix copy&paste error from previous commit</li>
+ <li>mesa: fix a few format table mistakes, assertions</li>
+ <li>mesa: fix num_draw_buffers==0 in fixed-function fragment program generation</li>
+ <li>mesa: don't assert in GetIntegerIndexed, etc</li>
+ <li>mesa: check for dummy renderbuffer in _mesa_FramebufferRenderbufferEXT()</li>
+ <li>llvmpipe: make sure binning is active when we begin/end a query</li>
+ <li>st/mesa: fix incorrect fragcoord.x translation</li>
+ <li>softpipe: fix off-by-one error in setup_fragcoord_coeff()</li>
+ <li>cso: fix loop bound in cso_set_vertex_samplers()</li>
+ <li>st/mesa: fix incorrect glCopyPixels position on fallback path</li>
+ <li>st/mesa: set renderbuffer _BaseFormat in a few places</li>
+ <li>st/mesa: fix the default case in st_format_datatype()</li>
+ <li>st/mesa: need to translate clear color according to surface's base format</li>
+ <li>docs: update 7.9.2 release notes with Brian's cherry-picks</li>
+ <li>docs: add link to 7.10.1 release notes</li>
+ <li>mesa: implement glGetShaderPrecisionFormat()</li>
+ <li>docs: updated environment variable list</li>
+</ul></p>
+
+<p>Bryce Harrington (1):
+<ul>
+ <li>r300g: Null pointer check for buffer deref in gallium winsys</li>
+</ul></p>
+
+<p>Chad Versace (20):
+<ul>
+ <li>glsl: At link-time, check that globals have matching centroid qualifiers</li>
+ <li>glcpp: Fix segfault when validating macro redefinitions</li>
+ <li>glsl: Fix parser rule for type_specifier</li>
+ <li>glsl: Change default value of ast_type_specifier::precision</li>
+ <li>glsl: Add semantic checks for precision qualifiers</li>
+ <li>glsl: Add support for default precision statements</li>
+ <li>glsl: Remove redundant semantic check in parser</li>
+ <li>glsl: Fix semantic checks on precision qualifiers</li>
+ <li>glsl: Fix segfault due to missing printf argument</li>
+ <li>glsl: Mark 'in' variables at global scope as read-only</li>
+ <li>mesa: Refactor handling of extension strings</li>
+ <li>mesa: Add/remove extensions in extension string</li>
+ <li>mesa: Change dependencies of some OES extension strings</li>
+ <li>mesa: Change OES_point_sprite to depend on ARB_point_sprite</li>
+ <li>mesa: Change OES_standard_derivatives to be stand-alone extension</li>
+ <li>i915: Disable extension OES_standard_derivatives</li>
+ <li>glcpp: Raise error when modulus is zero</li>
+ <li>glsl: Set operators '%' and '%=' to be reserved when GLSL < 1.30</li>
+ <li>glsl: Reinstate constant-folding for division by zero</li>
+ <li>tnl: Add support for datatype GL_FIXED in vertex arrays</li>
+</ul></p>
+
+<p>Chia-I Wu (1):
+<ul>
+ <li>mesa: Add glDepthRangef and glClearDepthf to APIspec.xml.</li>
+</ul></p>
+
+<p>Christoph Bumiller (1):
+<ul>
+ <li>nv50,nvc0: do not forget to apply sign mode to saved TGSI inputs</li>
+</ul></p>
+
+<p>Cyril Brulebois (1):
+<ul>
+ <li>Point to bugs.freedesktop.org rather than bugzilla.freedesktop.org</li>
+</ul></p>
+
+<p>Dave Airlie (3):
+<ul>
+ <li>radeon/r200: fix fbo-clearmipmap + gen-teximage</li>
+ <li>radeon: calculate complete texture state inside TFP function</li>
+ <li>radeon: avoid segfault on 3D textures.</li>
+</ul></p>
+
+<p>Dimitry Andric (4):
+<ul>
+ <li>mesa: s/movzx/movzbl/</li>
+ <li>mesa: s/movzxw/movzwl/ in read_rgba_span_x86.S</li>
+ <li>glapi: adding @ char before type specifier in glapi_x86.S</li>
+ <li>glapi: add @GOTPCREL relocation type</li>
+</ul></p>
+
+<p>Eric Anholt (16):
+<ul>
+ <li>glsl: Fix the lowering of variable array indexing to not lose write_masks.</li>
+ <li>i965/fs: When producing ir_unop_abs of an operand, strip negate.</li>
+ <li>i965/vs: When MOVing to produce ABS, strip negate of the operand.</li>
+ <li>i965/fs: Do flat shading when appropriate.</li>
+ <li>i965: Avoid double-negation of immediate values in the VS.</li>
+ <li>intel: Make renderbuffer tiling choice match texture tiling choice.</li>
+ <li>i965: Fix dead pointers to fp->Parameters->ParameterValues[] after realloc.</li>
+ <li>docs: Add a relnote for the Civ IV on i965.</li>
+ <li>glapi: Add entrypoints and enums for GL_ARB_ES2_compatibility.</li>
+ <li>mesa: Add extension enable bit for GL_ARB_ES2_compatibility.</li>
+ <li>mesa: Add actual support for glReleaseShaderCompiler from ES2.</li>
+ <li>mesa: Add support for glDepthRangef and glClearDepthf.</li>
+ <li>mesa: Add getters for ARB_ES2_compatibility MAX_*_VECTORS.</li>
+ <li>mesa: Add getter for GL_SHADER_COMPILER with ARB_ES2_compatibility.</li>
+ <li>i965: Fix a bug in i965 compute-to-MRF.</li>
+ <li>i965/fs: Add a helper function for detecting math opcodes.</li>
+</ul></p>
+
+<p>Fredrik Höglund (1):
+<ul>
+ <li>st/mesa: fix a regression from cae2bb76</li>
+</ul></p>
+
+<p>Ian Romanick (42):
+<ul>
+ <li>docs: Add 7.10 md5sums</li>
+ <li>glsl: Support the 'invariant(all)' pragma</li>
+ <li>glcpp: Generate an error for division by zero</li>
+ <li>glsl: Add version_string containing properly formatted GLSL version</li>
+ <li>glsl & glcpp: Refresh autogenerated lexer and parser files.</li>
+ <li>glsl: Disallow 'in' and 'out' on globals in GLSL 1.20</li>
+ <li>glsl: Track variable usage, use that to enforce semantics</li>
+ <li>glsl: Allow 'in' and 'out' when 'layout' is also available</li>
+ <li>docs: Initial bits of 7.10.1 release notes</li>
+ <li>mesa: bump version to 7.10.1-devel</li>
+ <li>doc: Update 7.10.1 release notes</li>
+ <li>glsl: Emit errors or warnings when 'layout' is used with 'attribute' or 'varying'</li>
+ <li>docs: Update 7.10.1 release notes</li>
+ <li>glsl: Refresh autogenerated lexer and parser files.</li>
+ <li>glsl: Don't assert when the value returned by a function has no rvalue</li>
+ <li>linker: Set sizes for non-global arrays as well</li>
+ <li>linker: Propagate max_array_access while linking functions</li>
+ <li>docs: Update 7.10.1 release notes</li>
+ <li>mesa: glGetUniform only returns a single element of an array</li>
+ <li>linker: Generate link errors when ES shaders are missing stages</li>
+ <li>mesa: Fix error checks in GetVertexAttrib functions</li>
+ <li>Use C-style system headers in C++ code to avoid issues with std:: namespace</li>
+ <li>docs: Update 7.10.1 release notes</li>
+ <li>glapi: Regenerate for GL_ARB_ES2_compatibility.</li>
+ <li>mesa: Connect glGetShaderPrecisionFormat into the dispatch table</li>
+ <li>i965: Set correct values for range/precision of fragment shader types</li>
+ <li>i915: Set correct values for range/precision of fragment shader types</li>
+ <li>intel: Fix typeos from 3d028024 and 790ff232</li>
+ <li>glsl: Ensure that all GLSL versions are supported in the stand-alone compiler</li>
+ <li>glsl: Reject shader versions not supported by the implementation</li>
+ <li>mesa: Initial size for secondary color array is 3</li>
+ <li>glsl: Finish out the reduce/reduce error fixes</li>
+ <li>glsl: Regenerate compiler and glcpp files from cherry picks</li>
+ <li>linker: Fix off-by-one error implicit array sizing</li>
+ <li>docs: update 7.10.1 release notes with Ian's recent cherry picks</li>
+ <li>i915: Only mark a register as available if all components are written</li>
+ <li>i915: Calculate partial result to temp register first</li>
+ <li>i915: Force lowering of all types of indirect array accesses in the FS</li>
+ <li>docs: Update 7.10.1 with (hopefully) the last of the cherry picks</li>
+ <li>docs: Clean up bug fixes list</li>
+ <li>intel: Remove driver date and related bits from renderer string</li>
+ <li>mesa: set version string to 7.10.1 (final)</li>
+</ul></p>
+
+<p>Jian Zhao (1):
+<ul>
+ <li>mesa: fix an error in uniform arrays in row calculating.</li>
+</ul></p>
+
+<p>Julien Cristau (3):
+<ul>
+ <li>glx: fix request lengths</li>
+ <li>glx: fix GLXChangeDrawableAttributesSGIX request</li>
+ <li>glx: fix length of GLXGetFBConfigsSGIX</li>
+</ul></p>
+
+<p>Keith Packard (1):
+<ul>
+ <li>glsl: Eliminate reduce/reduce conflicts in glsl grammar</li>
+</ul></p>
+
+<p>Kenneth Graunke (20):
+<ul>
+ <li>glsl: Expose a public glsl_type::void_type const pointer.</li>
+ <li>glsl: Don't bother unsetting a destructor that was never set.</li>
+ <li>glsl, i965: Remove unnecessary talloc includes.</li>
+ <li>glcpp: Remove use of talloc reference counting.</li>
+ <li>ralloc: Add a fake implementation of ralloc based on talloc.</li>
+ <li>Convert everything from the talloc API to the ralloc API.</li>
+ <li>ralloc: a new MIT-licensed recursive memory allocator.</li>
+ <li>Remove talloc from the make and automake build systems.</li>
+ <li>Remove talloc from the SCons build system.</li>
+ <li>Remove the talloc sources from the Mesa repository.</li>
+ <li>glsl: Fix use of uninitialized values in _mesa_glsl_parse_state ctor.</li>
+ <li>i965/fs: Apply source modifier workarounds to POW as well.</li>
+ <li>i965: Fix shaders that write to gl_PointSize on Sandybridge.</li>
+ <li>i965/fs: Avoid register coalescing away gen6 MATH workarounds.</li>
+ <li>i965/fs: Correctly set up gl_FragCoord.w on Sandybridge.</li>
+ <li>i965: Increase Sandybridge point size clamp.</li>
+ <li>i965/fs: Refactor control flow stack handling.</li>
+ <li>i965: Increase Sandybridge point size clamp in the clip state.</li>
+ <li>glsl: Use reralloc instead of plain realloc.</li>
+ <li>Revert "i965/fs: Correctly set up gl_FragCoord.w on Sandybridge."</li>
+</ul></p>
+
+<p>Marek Olšák (4):
+<ul>
+ <li>docs: fix messed up names with special characters in relnotes-7.10</li>
+ <li>docs: fix messed up names with special characters in relnotes-7.9.1</li>
+ <li>mesa: fix texture3D mipmap generation for UNSIGNED_BYTE_3_3_2</li>
+ <li>st/dri: Track drawable context bindings</li>
+</ul></p>
+
+<p>Paulo Zanoni (1):
+<ul>
+ <li>dri_util: fail driCreateNewScreen if InitScreen is NULL</li>
+</ul></p>
+
+<p>Sam Hocevar (2):
+<ul>
+ <li>docs: add glsl info</li>
+ <li>docs: fix glsl_compiler name</li>
+</ul></p>
+
+<p>Tom Fogal (1):
+<ul>
+ <li>Regenerate gl_mangle.h.</li>
+</ul></p>
+
+<p>Tom Stellard (2):
+<ul>
+ <li>r300/compiler: Disable register rename pass on r500</li>
+ <li>r300/compiler: Don't erase sources when converting RGB->Alpha</li>
+</ul></p>
+
+<p>Vinson Lee (3):
+<ul>
+ <li>ralloc: Add missing va_end following va_copy.</li>
+ <li>mesa: Move declaration before code in extensions.c.</li>
+ <li>mesa: Move loop variable declarations outside for loop in extensions.c.</li>
+</ul></p>
+
+<p>nobled (1):
+<ul>
+ <li>glx: Put null check before use</li>
+</ul></p>
+
</p>
</body>
commit e4fefc3c328f26d0e50d32224df01aed16c3c77c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Mar 2 13:49:17 2011 -0800
mesa: set version string to 7.10.1 (final)
diff --git a/Makefile b/Makefile
index 32a5f2f..ee16a2b 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ ultrix-gcc:
# Rules for making release tarballs
-VERSION=7.10.1-devel
+VERSION=7.10.1
DIRECTORY = Mesa-$(VERSION)
LIB_NAME = MesaLib-$(VERSION)
GLUT_NAME = MesaGLUT-$(VERSION)
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 6e10c83..8d54169 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -35,7 +35,7 @@ struct gl_context;
#define MESA_MAJOR 7
#define MESA_MINOR 10
#define MESA_PATCH 1
-#define MESA_VERSION_STRING "7.10.1-devel"
+#define MESA_VERSION_STRING "7.10.1"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit b0a7492aebeb4517346f0da2362d6991a7385b59
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Mar 1 13:35:39 2011 -0800
intel: Remove driver date and related bits from renderer string
Not only did this contain lies, it contained lies that wouldn't be
useful even if true.
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index d183d27..f6f0b03 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -62,10 +62,6 @@ int INTEL_DEBUG = (0);
#endif
-#define DRIVER_DATE "20100330 DEVELOPMENT"
-#define DRIVER_DATE_GEM "GEM " DRIVER_DATE
-
-
static const GLubyte *
intelGetString(struct gl_context * ctx, GLenum name)
{
@@ -182,7 +178,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
break;
}
- (void) driGetRendererString(buffer, chipset, DRIVER_DATE_GEM, 0);
+ (void) driGetRendererString(buffer, chipset, "", 0);
return (GLubyte *) buffer;
default:
commit 8aabb1bc9951e168719cc94dd80b2f55fb764512
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Mar 1 13:19:58 2011 -0800
docs: Clean up bug fixes list
All the unnumbered bugs are first. These are followed by numbered
bugs sorted by bug number.
diff --git a/docs/relnotes-7.10.1.html b/docs/relnotes-7.10.1.html
index 66aafcb..5b2fc78 100644
--- a/docs/relnotes-7.10.1.html
+++ b/docs/relnotes-7.10.1.html
@@ -46,6 +46,14 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
<li>Fix numerous issues handling precision qualifiers in GLSL ES.</li>
+<li>Fixed a few GLX protocol encoder bugs (Julien Cristau)</li>
+
+<li>Assorted Gallium llvmpipe driver bug fixes</li>
+
+<li>Assorted Mesa/Gallium state tracker bug fixes</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=26795";>Bug 26795</a> - gl_FragCoord off by one in Gallium drivers.</li>
+
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29164";>Bug 29164</a> - [GLSL 1.20] invariant variable shouldn't be used before declaration</li>
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29823";>Bug 29823</a> - GetUniform[if]v busted</li>
@@ -62,6 +70,8 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32375";>Bug 32375</a> - [gl gles2] Not able to get the attribute by function glGetVertexAttribfv</li>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32541";>Bug 32541</a> - Segmentation Fault while running an HDR (high dynamic range) rendering demo</li>
+
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32569";>Bug 32569</a> - [gles2] glGetShaderPrecisionFormat not implemented yet</li>
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32695";>Bug 32695</a> - [glsl] SIGSEGV glcpp/glcpp-parse.y:833</li>
@@ -78,6 +88,12 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33316";>Bug 33316</a> - uniform array will be allocate one line more and initialize it when it was freed will abort</li>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33386";>Bug 33386</a> - Dubious assembler in read_rgba_span_x86.S</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33388";>Bug 33388</a> - Dubious assembler in xform4.S</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33433";>Bug 33433</a> - Error in x86-64 API dispatch code.</li>
+
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33507";>Bug 33507</a> - [glsl] GLSL preprocessor modulus by zero crash</li>
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33508";>Bug 33508</a> - [glsl] GLSL compiler modulus by zero crash</li>
@@ -100,19 +116,6 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=";>Bug </a> - </li> -->
-<li>Fixed a few GLX protocol encoder bugs (Julien Cristau)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=26795";>Bug 26795</a> - gl_FragCoord off by one in Gallium drivers.</li>
-
-<li><a href="http://bugs.freedesktop.org/show_bug.cgi?id=33433";>Bug 33433</a> - Error in x86-64 API dispatch code.</li>
-
-<li><a href="http://bugs.freedesktop.org/show_bug.cgi?id=33386";>Bug 33386</a> and <a href="http://bugs.freedesktop.org/show_bug.cgi?id=33388";>Bug 33388</a> - bad assembly code in vertex transfomration code.</li>
-
-<li>Assorted Gallium llvmpipe driver bug fixes</li>
-
-<li>Assorted Mesa/Gallium state tracker bug fixes</li>
-
-
</ul>
commit a67a0a0589b0a5a86df8753c795fc0eca0ec7e92
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Mar 1 13:03:47 2011 -0800
docs: Update 7.10.1 with (hopefully) the last of the cherry picks
diff --git a/docs/relnotes-7.10.1.html b/docs/relnotes-7.10.1.html
index a46bfa0..66aafcb 100644
--- a/docs/relnotes-7.10.1.html
+++ b/docs/relnotes-7.10.1.html
@@ -86,6 +86,8 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34030";>Bug 34030</a> - [bisected] Starcraft 2: some effects are corrupted or too big</li>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34047";>Bug 34047</a> - Assert in _tnl_import_array() when using GLfixed vertex datatypes with GLESv2</li>
+
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34114";>Bug 34114</a> - Sun Studio build fails due to standard library functions not being in global namespace</li>
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34179";>Bug 34179</a> - Nouveau 3D driver: nv50_pc_emit.c:863 assertion error kills Compiz</li>
@@ -94,6 +96,8 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
<li><a href="https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/691653";>Ubuntu bug 691653</a> - compiz crashes when using alt-tab (the radeon driver kills it) </li>
+<li><a href="https://bugs.meego.com/show_bug.cgi?id=13005";>Meego bug 13005</a> - Graphics GLSL issue lead to camera preview fail on Pinetrail</li>
+
<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=";>Bug </a> - </li> -->
<li>Fixed a few GLX protocol encoder bugs (Julien Cristau)</li>
commit a6263f2738c914c76cdcde32604932cbe3b36398
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 18 00:10:28 2011 -0800
Point to bugs.freedesktop.org rather than bugzilla.freedesktop.org
Suggested by a freedesktop.org admin.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
(cherry picked from commit d252db7af1370246c76b46f4b9e66b352879bd9b)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index cefbf4d..643740d 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -941,7 +941,7 @@ _mesa_problem( const struct gl_context *ctx, const char *fmtString, ... )
va_end( args );
fprintf(stderr, "Mesa %s implementation error: %s\n", MESA_VERSION_STRING, str);
- fprintf(stderr, "Please report at bugzilla.freedesktop.org\n");
+ fprintf(stderr, "Please report at bugs.freedesktop.org\n");
}
commit 7e158e85bd2e2311b589b0a09103b16f0fe438cd
Author: Brian Paul <brianp@vmware.com>
Date: Thu Feb 17 07:29:20 2011 -0700
docs: updated environment variable list
(cherry picked from commit 1bf9954bb44e47670c8805078f78b5444e97c18d)
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
diff --git a/docs/envvars.html b/docs/envvars.html
index fd1700a..cdd158c 100644
--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -9,16 +9,38 @@
<H1>Environment Variables</H1>
<p>
-Mesa supports the following environment variables:
+Normally, no environment variables need to be set. Most of the environment
+variables used by Mesa/Gallium are for debugging purposes, but they can
+sometimes be useful for debugging end-user issues.
</p>
+
+
+<H2>LibGL environment variables</H2>
+
+<ul>
+<li>LIBGL_DEBUG - If defined debug information will be printed to stderr.
+ If set to 'verbose' additional information will be printed.
+<li>LIBGL_DRIVERS_PATH - colon-separated list of paths to search for DRI drivers
+<li>LIBGL_ALWAYS_INDIRECT - forces an indirect rendering context/connection.
+<li>LIBGL_ALWAYS_SOFTWARE - if set, always use software rendering
+<li>LIBGL_NO_DRAWARRAYS - if set do not use DrawArrays GLX protocol (for debugging)
+</ul>
+
+
+
+<H2>Core Mesa environment variables</H2>
+
<ul>
<li>MESA_NO_ASM - if set, disables all assembly language optimizations
<li>MESA_NO_MMX - if set, disables Intel MMX optimizations
<li>MESA_NO_3DNOW - if set, disables AMD 3DNow! optimizations
<li>MESA_NO_SSE - if set, disables Intel SSE optimizations
-<li>MESA_DEBUG - if set, error messages are printed to stderr.
-If the value of MESA_DEBUG is "FP" floating point arithmetic errors will
-generate exceptions.
+<li>MESA_DEBUG - if set, error messages are printed to stderr. For example,
+ if the application generates a GL_INVALID_ENUM error, a corresponding error
+ message indicating where the error occured, and possibly why, will be
+ printed to stderr.<br>
+ If the value of MESA_DEBUG is 'FP' floating point arithmetic errors will
+ generate exceptions.
<li>MESA_NO_DITHER - if set, disables dithering, overriding glEnable(GL_DITHER)
<li>MESA_TEX_PROG - if set, implement conventional texture env modes with
fragment programs (intended for developers only)
@@ -28,11 +50,14 @@ Setting this variable automatically sets the MESA_TEX_PROG variable as well.
<li>MESA_EXTENSION_OVERRIDE - can be used to enable/disable extensions.
A value such as "GL_EXT_foo -GL_EXT_bar" will enable the GL_EXT_foo extension
and disable the GL_EXT_bar extension.
-<li>MESA_GLSL - <a href="shading.html#envvars">shading language options</a>
+<li>MESA_GLSL - <a href="shading.html#envvars">shading language compiler options</a>
</ul>
+
+<H2>Mesa Xlib driver environment variables</H2>
+
<p>
-The following are only applicable to the Xlib software driver.
+The following are only applicable to the Mesa Xlib software driver.
See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details.
</p>
<ul>
@@ -51,9 +76,8 @@ See the <A HREF="xlibdriver.html">Xlib software driver page</A> for details.
</ul>
-<p>
-These environment variables are for the Intel i945/i965 drivers:
-</p>
+<h2>i945/i965 driver environment variables (non-Gallium)</h2>
+
<ul>
<li>INTEL_STRICT_CONFORMANCE - if set to 1, enable sw fallbacks to improve
OpenGL conformance. If set to 2, always use software rendering.
@@ -62,17 +86,71 @@ These environment variables are for the Intel i945/i965 drivers:
</ul>
-<p>
-These environment variables are for the Radeon R300 driver:
-</p>
+<h2>Radeon R300 driver environment variables (non-Gallium)</h2>
+
<ul>
<li>R300_NO_TCL - if set, disable hardware-accelerated Transform/Clip/Lighting.
</ul>
+
+<h2>EGL environment variables</h2>
+
<p>
Mesa EGL supports different sets of environment variables. See the
<a href="egl.html">Mesa EGL</a> page for the details.
</p>
+
+<h2>Gallium environment variables</h2>
+
+<ul>
+<li>GALLIUM_PRINT_OPTIONS - if non-zero, print all the Gallium environment
+ variables which are used, and their current values.
+<li>GALLIUM_NOSSE - if non-zero, do not use SSE runtime code generation for
+ shader execution
+<li>GALLIUM_NOPPC - if non-zero, do not use PPC runtime code generation for
+ shader execution
+<li>GALLIUM_DUMP_CPU - if non-zero, print information about the CPU on start-up
+<li>TGSI_PRINT_SANITY - if set, do extra sanity checking on TGSI shaders and
+ print any errors to stderr.
+<LI>DRAW_FSE - ???
+<LI>DRAW_NO_FSE - ???
+<li>DRAW_USE_LLVM - if set to zero, the draw module will not use LLVM to execute
+ shaders, vertex fetch, etc.
+</ul>
+
+<h3>Softpipe driver environment variables</h3>
+<ul>
+<li>SOFTPIPE_DUMP_FS - if set, the softpipe driver will print fragment shaders
+ to stderr
+<li>SOFTPIPE_DUMP_GS - if set, the softpipe driver will print geometry shaders
+ to stderr
+<li>SOFTPIPE_NO_RAST - if set, rasterization is no-op'd. For profiling purposes.
+</ul>
+
+
+<h3>LLVMpipe driver environment variables</h3>
+<ul>
+<li>LP_NO_RAST - if set LLVMpipe will no-op rasterization
+<li>LP_DEBUG - a comma-separated list of debug options is acceptec. See the
+ source code for details.
+<li>LP_PERF - a comma-separated list of options to selectively no-op various
+ parts of the driver. See the source code for details.
+<li>LP_NUM_THREADS - an integer indicating how many threads to use for rendering.
+ Zero turns of threading completely. The default value is the number of CPU
+ cores present.
+</ul>
+
+
+<p>
+Other Gallium drivers have their own environment variables. These may change
+frequently so the source code should be consulted for details.
+</p>
+
+
+<br>
+<br>
+
+
</BODY>
</HTML>
commit 2fc2553261a25a0fdee3882dae54eb870e5788a3
Author: Sam Hocevar <sam@hocevar.net>
Date: Wed Feb 16 17:04:03 2011 -0700
docs: fix glsl_compiler name
(cherry picked from commit fde49436881e64cc9fd838761cea3d6718832449)
diff --git a/docs/shading.html b/docs/shading.html
index c41d4a9..aba3959 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -167,7 +167,7 @@ Here's an example of using the compiler to compile a vertex shader and
emit GL_ARB_vertex_program-style instructions:
</p>
<pre>
- src/glsl/glslcompiler --dump-ast myshader.vert
+ src/glsl/glsl_compiler --dump-ast myshader.vert
</pre>
Options include
commit 355601812aa586c22b17017b2f9d3321c88d6465
Author: Sam Hocevar <sam@hocevar.net>
Date: Wed Feb 16 17:04:20 2011 -0700
docs: add glsl info
(cherry picked from commit 3e8fb54fb8940d015dcc4631cb84255228b1ad9e)
diff --git a/docs/sourcetree.html b/docs/sourcetree.html
index 00dc4e7..08a9a50 100644
--- a/docs/sourcetree.html
+++ b/docs/sourcetree.html
@@ -23,6 +23,7 @@ each directory.
<ul>
<li><b>docs</b> - EGL documentation
<li><b>drivers</b> - EGL drivers
+ <li><b>glsl</b> - the GLSL compiler
<li><b>main</b> - main EGL library implementation. This is where all
the EGL API functions are implemented, like eglCreateContext().
</ul>
commit 8a27f9845b79112b670ec4ade77973dde3b4e283
Author: Chad Versace <chad.versace@intel.com>
Date: Tue Feb 15 15:30:05 2011 -0800
tnl: Add support for datatype GL_FIXED in vertex arrays
Before populating the vertex buffer attribute pointer (VB->AttribPtr[]),
convert vertex data in GL_FIXED format to GL_FLOAT.
Fixes bug: http://bugs.freedesktop.org/show_bug.cgi?id=34047
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit a231ac23f41a38cf9bde80bab4cb6aa8821d4895)
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index 30f1bf3..ccf8943 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -125,6 +125,43 @@ convert_half_to_float(const struct gl_client_array *input,
}
}
+/**
+ * \brief Convert fixed-point to floating-point.
+ *
+ * In OpenGL, a fixed-point number is a "signed 2's complement 16.16 scaled
+ * integer" (Table 2.2 of the OpenGL ES 2.0 spec).
+ *
+ * If the buffer has the \c normalized flag set, the formula
+ * \code normalize(x) := (2*x + 1) / (2^16 - 1) \endcode
+ * is used to map the fixed-point numbers into the range [-1, 1].
+ */
+static void
+convert_fixed_to_float(const struct gl_client_array *input,
+ const GLubyte *ptr, GLfloat *fptr,
+ GLuint count)
+{
+ GLuint i, j;
+ const GLint size = input->Size;
+
+ if (input->Normalized) {
+ for (i = 0; i < count; ++i) {
+ const GLfixed *in = (GLfixed *) ptr;
+ for (j = 0; j < size; ++j) {
+ *fptr++ = (GLfloat) (2 * in[j] + 1) / (GLfloat) ((1 << 16) - 1);
+ }
+ ptr += input->StrideB;
+ }
+ } else {
+ for (i = 0; i < count; ++i) {
+ const GLfixed *in = (GLfixed *) ptr;
+ for (j = 0; j < size; ++j) {
+ *fptr++ = in[j] / (GLfloat) (1 << 16);
+ }
+ ptr += input->StrideB;
+ }
+ }
+}
+
/* Adjust pointer to point at first requested element, convert to
* floating point, populate VB->AttribPtr[].
*/
@@ -174,6 +211,9 @@ static void _tnl_import_array( struct gl_context *ctx,
case GL_HALF_FLOAT:
convert_half_to_float(input, ptr, fptr, count, sz);
break;
+ case GL_FIXED:
+ convert_fixed_to_float(input, ptr, fptr, count);
+ break;
default:
assert(0);
break;
commit e160c815c243e1482963a8a7bdf3661cda18d78c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Feb 10 11:51:28 2011 -0800
i915: Force lowering of all types of indirect array accesses in the FS
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 4c1dc1c4d772b06578567f14419fdd4f27843825)
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 474252b..7389a1d 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -188,9 +188,17 @@ i915CreateContext(int api,
* FINISHME: vertex shaders?
*/
ctx->ShaderCompilerOptions[MESA_SHADER_VERTEX].EmitCondCodes = GL_TRUE;
- ctx->ShaderCompilerOptions[MESA_SHADER_FRAGMENT].EmitNoIfs = GL_TRUE;
- ctx->ShaderCompilerOptions[MESA_SHADER_FRAGMENT].EmitNoNoise = GL_TRUE;
- ctx->ShaderCompilerOptions[MESA_SHADER_FRAGMENT].EmitNoPow = GL_TRUE;
+
+ struct gl_shader_compiler_options *const fs_options =
+ & ctx->ShaderCompilerOptions[MESA_SHADER_FRAGMENT];
+ fs_options->EmitNoIfs = GL_TRUE;
+ fs_options->EmitNoNoise = GL_TRUE;
+ fs_options->EmitNoPow = GL_TRUE;
+ fs_options->EmitNoMainReturn = GL_TRUE;
+ fs_options->EmitNoIndirectInput = GL_TRUE;
+ fs_options->EmitNoIndirectOutput = GL_TRUE;
+ fs_options->EmitNoIndirectUniform = GL_TRUE;
+ fs_options->EmitNoIndirectTemp = GL_TRUE;
ctx->Const.MaxDrawBuffers = 1;
commit a9d3cce8f37b18e5221f8a668a217858eeb2dd44
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Feb 10 11:48:59 2011 -0800
i915: Calculate partial result to temp register first
Previously the SNE and SEQ instructions would calculate the partial
result to the destination register. This would cause problems if the
destination register was also one of the source registers.
Fixes piglit tests glsl-fs-any, glsl-fs-struct-equal,
glsl-fs-struct-notequal, glsl-fs-vec4-operator-equal,
glsl-fs-vec4-operator-notequal.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 53b8b6884355da3737d1ff714f1fadc69d1745e4)
diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c
index aadad4f..0e5dcdd 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -809,18 +809,18 @@ upload_program(struct i915_fragment_program *p)
flags = get_result_flags(inst);
dst = get_result_vector(p, inst);
- /* dst = src1 >= src2 */
+ /* tmp = src1 >= src2 */
i915_emit_arith(p,
A0_SGE,
- dst,
+ tmp,
flags, 0,
src_vector(p, &inst->SrcReg[0], program),
src_vector(p, &inst->SrcReg[1], program),
0);
- /* tmp = src1 <= src2 */
+ /* dst = src1 <= src2 */
i915_emit_arith(p,
A0_SGE,
- tmp,
+ dst,
flags, 0,
negate(src_vector(p, &inst->SrcReg[0], program),
1, 1, 1, 1),
@@ -958,18 +958,18 @@ upload_program(struct i915_fragment_program *p)
flags = get_result_flags(inst);
dst = get_result_vector(p, inst);
Reply to: