mesa.git
14 years agomesa: add missing _mesa_lock_texture() call
Brian Paul [Tue, 5 Jan 2010 02:05:31 +0000 (19:05 -0700)]
mesa: add missing _mesa_lock_texture() call

14 years agoi915: Use _MaxLevel on principle in texture setup.
Eric Anholt [Tue, 29 Dec 2009 23:55:34 +0000 (15:55 -0800)]
i915: Use _MaxLevel on principle in texture setup.

It was OK before because we proceed to clamp the value to hardware
limits, but given that other use of MaxLevel has been a trap, let's
avoid it.

14 years agointel: Fix CopyTexImage from tiled mipmap levels > 0.
Eric Anholt [Mon, 4 Jan 2010 17:39:07 +0000 (09:39 -0800)]
intel: Fix CopyTexImage from tiled mipmap levels > 0.

Fixes piglit fbo-copyteximage.

14 years agoi965: Fix the surface offset calculation for tiled buffers.
Eric Anholt [Mon, 4 Jan 2010 16:47:01 +0000 (08:47 -0800)]
i965: Fix the surface offset calculation for tiled buffers.

If we ever had a non-tile-aligned tiled renderbuffer, the math was all
off.  Use the existing x,y coordinates instead of trying to
reconstruct them from an incorrectly-calculated offset value.

14 years agor600: support vertex_array_bgra
Andre Maasikas [Tue, 29 Dec 2009 12:47:01 +0000 (14:47 +0200)]
r600: support vertex_array_bgra

Use vertex program key mechanism and swizzle during vertex fetch - is there
a better way?

14 years agomesa: added GL_DU8DV8_ATI in extract_float_rgba()
Brian Paul [Mon, 4 Jan 2010 20:59:43 +0000 (13:59 -0700)]
mesa: added GL_DU8DV8_ATI in extract_float_rgba()

Fixes warning seen with Shadowgrounds.  See bug 24016.

14 years agodocs: initial release notes for 7.7.1
Brian Paul [Mon, 4 Jan 2010 19:47:37 +0000 (12:47 -0700)]
docs: initial release notes for 7.7.1

14 years agomesa: Prevent possible array out-of-bounds access by _mesa_light.
Vinson Lee [Mon, 4 Jan 2010 20:06:04 +0000 (12:06 -0800)]
mesa: Prevent possible array out-of-bounds access by _mesa_light.

14 years agomesa: regenerated enums.c file
Brian Paul [Mon, 4 Jan 2010 18:29:38 +0000 (11:29 -0700)]
mesa: regenerated enums.c file

14 years agoglapi: comment-out TIMEOUT_IGNORED
Brian Paul [Mon, 4 Jan 2010 18:29:09 +0000 (11:29 -0700)]
glapi: comment-out TIMEOUT_IGNORED

This is not really a GLenum value.

14 years agoglsl: use varName variable in _slang_gen_assignment()
Brian Paul [Tue, 29 Dec 2009 17:26:28 +0000 (10:26 -0700)]
glsl: use varName variable in _slang_gen_assignment()

14 years agost/mesa: Only call st_texture_image_unmap() if texImage->Data is non-NULL.
Michel Dänzer [Mon, 4 Jan 2010 15:54:29 +0000 (16:54 +0100)]
st/mesa: Only call st_texture_image_unmap() if texImage->Data is non-NULL.

This was already done in st_TexImage() but was missed between incremental
changes to st_TexSubimage().

14 years agosvga: Fix debug build crash when rendering to depth/stencil renderbuffer only.
Michel Dänzer [Mon, 4 Jan 2010 12:05:43 +0000 (13:05 +0100)]
svga: Fix debug build crash when rendering to depth/stencil renderbuffer only.

14 years agost/xorg: Proper calculation of screen pitch.
Michel Dänzer [Mon, 4 Jan 2010 12:04:05 +0000 (13:04 +0100)]
st/xorg: Proper calculation of screen pitch.

14 years agovmware/xorg: Fix SCons build.
Michel Dänzer [Mon, 4 Jan 2010 12:02:40 +0000 (13:02 +0100)]
vmware/xorg: Fix SCons build.

14 years agor300: Use C-style comments.
Vinson Lee [Mon, 4 Jan 2010 07:33:32 +0000 (23:33 -0800)]
r300: Use C-style comments.

14 years agoprogs/egl: Silence uninitialized variable warnings.
Vinson Lee [Mon, 4 Jan 2010 05:39:20 +0000 (21:39 -0800)]
progs/egl: Silence uninitialized variable warnings.

14 years agoprogs/samples: Silence compiler warnings.
Vinson Lee [Mon, 4 Jan 2010 05:29:33 +0000 (21:29 -0800)]
progs/samples: Silence compiler warnings.

14 years agor300: Silence 'mixed declarations and code' warnings.
Vinson Lee [Mon, 4 Jan 2010 04:51:23 +0000 (20:51 -0800)]
r300: Silence 'mixed declarations and code' warnings.

14 years agor300: Silence 'mixed declarations and code' warning.
Vinson Lee [Mon, 4 Jan 2010 04:16:59 +0000 (20:16 -0800)]
r300: Silence 'mixed declarations and code' warning.

14 years agor300: Silence 'mixed declarations and code' warning.
Vinson Lee [Mon, 4 Jan 2010 02:32:07 +0000 (18:32 -0800)]
r300: Silence 'mixed declarations and code' warning.

14 years agor300g: Silence 'mixed declarations and code' warning.
Vinson Lee [Mon, 4 Jan 2010 02:05:12 +0000 (18:05 -0800)]
r300g: Silence 'mixed declarations and code' warning.

14 years agor300g: Remove comma at end of enumerator list.
Vinson Lee [Sun, 3 Jan 2010 23:07:35 +0000 (15:07 -0800)]
r300g: Remove comma at end of enumerator list.

14 years agollvmpipe: Remove comma at end of enumerator list.
Vinson Lee [Sun, 3 Jan 2010 22:42:36 +0000 (14:42 -0800)]
llvmpipe: Remove comma at end of enumerator list.

14 years agomesa: Cope with the degenerate case of zero length ranges.
José Fonseca [Sun, 3 Jan 2010 19:58:54 +0000 (19:58 +0000)]
mesa: Cope with the degenerate case of zero length ranges.

Fixes assertion failures on glean's bufferObject test.

14 years agogdi: Don't generate import libraries for opengl32.dll.
José Fonseca [Fri, 1 Jan 2010 21:54:01 +0000 (21:54 +0000)]
gdi: Don't generate import libraries for opengl32.dll.

Both MinGW and MSVC include opengl32 import libraries, and its safer to
always use those.

14 years agoapple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSX
Jeremy Huddleston [Thu, 24 Dec 2009 16:47:29 +0000 (08:47 -0800)]
apple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSX

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
14 years agoglxcmds: Fix comment about __DRI_ALLOCATE
Jeremy Huddleston [Thu, 24 Dec 2009 17:20:33 +0000 (09:20 -0800)]
glxcmds: Fix comment about __DRI_ALLOCATE

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
14 years agotrace: Remove comma at end of enumerator list.
Vinson Lee [Sun, 3 Jan 2010 11:06:33 +0000 (03:06 -0800)]
trace: Remove comma at end of enumerator list.

14 years agortasm: Play nicely with Windows's Data Execution Prevention.
José Fonseca [Sun, 3 Jan 2010 11:02:12 +0000 (11:02 +0000)]
rtasm: Play nicely with Windows's Data Execution Prevention.

14 years agoprogs/vp: Ensure null-terminated byte string.
Vinson Lee [Sun, 3 Jan 2010 10:38:22 +0000 (02:38 -0800)]
progs/vp: Ensure null-terminated byte string.

14 years agoprogs/tests: Silence uninitialized variable warning.
Vinson Lee [Sun, 3 Jan 2010 05:58:40 +0000 (21:58 -0800)]
progs/tests: Silence uninitialized variable warning.

14 years agoprogs/tests: Silence warn_unused_result warning.
Vinson Lee [Sun, 3 Jan 2010 05:52:51 +0000 (21:52 -0800)]
progs/tests: Silence warn_unused_result warning.

14 years agoi810: Fix include recursion.
Vinson Lee [Sun, 3 Jan 2010 05:05:06 +0000 (21:05 -0800)]
i810: Fix include recursion.

14 years agosis: ifdef out unused variable.
Vinson Lee [Sun, 3 Jan 2010 04:47:15 +0000 (20:47 -0800)]
sis: ifdef out unused variable.

Silences GCC warning.

14 years agost/xorg: Ensure null-terminated byte string.
Vinson Lee [Sun, 3 Jan 2010 04:39:04 +0000 (20:39 -0800)]
st/xorg: Ensure null-terminated byte string.

14 years agor300g: Use C-style comments.
Vinson Lee [Sun, 3 Jan 2010 04:17:43 +0000 (20:17 -0800)]
r300g: Use C-style comments.

14 years agoglu/sgi: Initialize members of struct O_curve.
Vinson Lee [Sun, 3 Jan 2010 04:04:00 +0000 (20:04 -0800)]
glu/sgi: Initialize members of struct O_curve.

14 years agosvga: Use a shader id as low as possible.
José Fonseca [Sun, 3 Jan 2010 00:47:30 +0000 (00:47 +0000)]
svga: Use a shader id as low as possible.

14 years agoutil: Minor enhancements/corrections to the bitmask logic.
José Fonseca [Sun, 3 Jan 2010 00:41:01 +0000 (00:41 +0000)]
util: Minor enhancements/corrections to the bitmask logic.

14 years agosvga: Rename error labels.
José Fonseca [Sat, 2 Jan 2010 21:46:42 +0000 (21:46 +0000)]
svga: Rename error labels.

Make it easier to insert/remove error branches.

14 years agoglu/sgi: Initialize members of struct O_surface.
Vinson Lee [Sat, 2 Jan 2010 23:46:11 +0000 (15:46 -0800)]
glu/sgi: Initialize members of struct O_surface.

14 years agoglu/sgi: Initialize member of struct O_trim.
Vinson Lee [Sat, 2 Jan 2010 23:29:25 +0000 (15:29 -0800)]
glu/sgi: Initialize member of struct O_trim.

14 years agoglu/sgi: Initialize member of struct Property.
Vinson Lee [Sat, 2 Jan 2010 07:01:03 +0000 (23:01 -0800)]
glu/sgi: Initialize member of struct Property.

14 years agoprogs/samples: 'Silence no previous prototype' warnings.
Vinson Lee [Sat, 2 Jan 2010 01:54:11 +0000 (17:54 -0800)]
progs/samples: 'Silence no previous prototype' warnings.

14 years agoglu/sgi: Initialize member of struct Dlnode.
Vinson Lee [Sat, 2 Jan 2010 01:25:16 +0000 (17:25 -0800)]
glu/sgi: Initialize member of struct Dlnode.

14 years agoglu/sgi: Initialize members of struct O_nurbscurve.
Vinson Lee [Sat, 2 Jan 2010 01:19:27 +0000 (17:19 -0800)]
glu/sgi: Initialize members of struct O_nurbscurve.

14 years agox86: Silence printf format warnings.
Vinson Lee [Sat, 2 Jan 2010 01:06:16 +0000 (17:06 -0800)]
x86: Silence printf format warnings.

14 years agoprogs/rbug: s/wait/rbug_wait/
Vinson Lee [Sat, 2 Jan 2010 00:25:37 +0000 (16:25 -0800)]
progs/rbug: s/wait/rbug_wait/

wait conflicts with wait in /usr/include/sys/wait.h.

14 years agollvmpipe: Silence uninitialized variable warning.
Vinson Lee [Sat, 2 Jan 2010 00:03:53 +0000 (16:03 -0800)]
llvmpipe: Silence uninitialized variable warning.

14 years agollvmpipe: Use C-style comment.
Vinson Lee [Fri, 1 Jan 2010 23:38:19 +0000 (15:38 -0800)]
llvmpipe: Use C-style comment.

14 years agogallium/util: Silence format warnings.
Vinson Lee [Fri, 1 Jan 2010 23:32:52 +0000 (15:32 -0800)]
gallium/util: Silence format warnings.

14 years agoARB prog parser: Silence unused variable warnings.
Vinson Lee [Fri, 1 Jan 2010 23:12:58 +0000 (15:12 -0800)]
ARB prog parser: Silence unused variable warnings.

14 years agogallium/util: Replace h_addr with h_addr_list[0].
Vinson Lee [Fri, 1 Jan 2010 23:01:22 +0000 (15:01 -0800)]
gallium/util: Replace h_addr with h_addr_list[0].

Fixes compilation error on Mac OS.

14 years agoglu/sgi: Initialize members of class Knotvector.
Vinson Lee [Fri, 1 Jan 2010 22:46:11 +0000 (14:46 -0800)]
glu/sgi: Initialize members of class Knotvector.

14 years agoglu/sgi: Initialize member of struct Property.
Vinson Lee [Fri, 1 Jan 2010 22:39:16 +0000 (14:39 -0800)]
glu/sgi: Initialize member of struct Property.

14 years agoswrast: use different temp array in _swrast_get_dest_rgba()
Brian Paul [Thu, 31 Dec 2009 15:44:24 +0000 (08:44 -0700)]
swrast: use different temp array in _swrast_get_dest_rgba()

When using multiple color drawbuffers with blending/logicop/masking we
were overwriting color values which we still needed.

14 years agomesa: Silence unused variable warning.
Vinson Lee [Thu, 31 Dec 2009 08:07:47 +0000 (00:07 -0800)]
mesa: Silence unused variable warning.

14 years agoprogs/glsl: Provide a better fix for fgets warning.
Vinson Lee [Wed, 30 Dec 2009 20:38:21 +0000 (12:38 -0800)]
progs/glsl: Provide a better fix for fgets warning.

14 years agost/mesa: add PIPE_FORMAT_Z24S8_UNORM in st_get_format_info()
Brian Paul [Wed, 30 Dec 2009 06:24:04 +0000 (23:24 -0700)]
st/mesa: add PIPE_FORMAT_Z24S8_UNORM in st_get_format_info()

Fixes progs/demos/fbotexture on Nouveau.
Patch submitted by Luca Barbieri <luca@luca-barbieri.com>.

14 years agoglu/sgi: Initialize members of struct O_nurbssurface.
Vinson Lee [Wed, 30 Dec 2009 06:29:53 +0000 (22:29 -0800)]
glu/sgi: Initialize members of struct O_nurbssurface.

14 years agotdfx: Silence uninitialized variable warning.
Vinson Lee [Wed, 30 Dec 2009 05:34:06 +0000 (21:34 -0800)]
tdfx: Silence uninitialized variable warning.

14 years agoprogs/glsl: Silence compiler warnings.
Vinson Lee [Wed, 30 Dec 2009 05:11:37 +0000 (21:11 -0800)]
progs/glsl: Silence compiler warnings.

14 years agoglu/sgi: Silence warn_unused_result warnings.
Vinson Lee [Wed, 30 Dec 2009 05:03:23 +0000 (21:03 -0800)]
glu/sgi: Silence warn_unused_result warnings.

14 years agost/xorg: Use C-style comments.
Vinson Lee [Wed, 30 Dec 2009 04:56:47 +0000 (20:56 -0800)]
st/xorg: Use C-style comments.

14 years agoglu/sgi: Initialize member of struct GridVertex.
Vinson Lee [Wed, 30 Dec 2009 04:45:24 +0000 (20:45 -0800)]
glu/sgi: Initialize member of struct GridVertex.

14 years agost/xorg: Fix warning and add a TODO comment
Jakob Bornecrantz [Wed, 30 Dec 2009 04:08:09 +0000 (05:08 +0100)]
st/xorg: Fix warning and add a TODO comment

14 years agost/xorg: On close wait on fences and then destroy the screen
Jakob Bornecrantz [Wed, 30 Dec 2009 03:46:12 +0000 (04:46 +0100)]
st/xorg: On close wait on fences and then destroy the screen

14 years agost/xorg: Be proper with pipe pointers on close in exa
Jakob Bornecrantz [Wed, 30 Dec 2009 03:58:25 +0000 (04:58 +0100)]
st/xorg: Be proper with pipe pointers on close in exa

14 years agost/xorg: Make sure we don't overrun the fence array in block handler
Jakob Bornecrantz [Wed, 30 Dec 2009 03:22:12 +0000 (04:22 +0100)]
st/xorg: Make sure we don't overrun the fence array in block handler

14 years agoglu/sgi: Initialize member variables in class Varray.
Vinson Lee [Wed, 30 Dec 2009 01:46:42 +0000 (17:46 -0800)]
glu/sgi: Initialize member variables in class Varray.

14 years agoglu/sgi: Initialize member of class monoChain.
Vinson Lee [Wed, 30 Dec 2009 01:35:22 +0000 (17:35 -0800)]
glu/sgi: Initialize member of class monoChain.

14 years agoglu/sgi: Initialize members of class sampledLine.
Vinson Lee [Wed, 30 Dec 2009 01:22:11 +0000 (17:22 -0800)]
glu/sgi: Initialize members of class sampledLine.

14 years agoglu/sgi: Initialize members of class directedLine.
Vinson Lee [Tue, 29 Dec 2009 22:28:33 +0000 (14:28 -0800)]
glu/sgi: Initialize members of class directedLine.

14 years agomesa: Initialize variable in get_tex_color_index.
Vinson Lee [Tue, 29 Dec 2009 21:38:02 +0000 (13:38 -0800)]
mesa: Initialize variable in get_tex_color_index.

14 years agoglsl: added uniform initializer check
Brian Paul [Tue, 29 Dec 2009 17:11:26 +0000 (10:11 -0700)]
glsl: added uniform initializer check

GLSL 1.10 disallows initializers for uniforms but GLSL 1.20 and later
allows them.  This patch uses the #version directive to allow/disallow
uniform initializers.

This addresses bug 25807, but piglit also needs to be fixed to specify
the GLSL version in the shader.

14 years agoARB prog parser: use _mesa_add_unnamed_constant() to use fewer constant slots
Brian Paul [Tue, 29 Dec 2009 16:06:00 +0000 (09:06 -0700)]
ARB prog parser: use _mesa_add_unnamed_constant() to use fewer constant slots

This function will search the constant parameters in an effort to re-use
constant slots.  For example, {1,2,3,4} and {4,1,1,2} can be stored in
one constant slot and accessed with different swizzles.  The swizzle info
must be propogated though the parsing code in a few places.

Fixes Piglit "vpfp-generic tests/shaders/generic/big-param.vpfp" failure.

14 years agost/egl: Move declaration before code.
Vinson Lee [Tue, 29 Dec 2009 03:09:33 +0000 (19:09 -0800)]
st/egl: Move declaration before code.

14 years agointel: Silence compiler warnings.
Vinson Lee [Tue, 29 Dec 2009 02:46:15 +0000 (18:46 -0800)]
intel: Silence compiler warnings.

14 years agollvmpipe: Fix assert.
Vinson Lee [Tue, 29 Dec 2009 02:07:09 +0000 (18:07 -0800)]
llvmpipe: Fix assert.

14 years agollvmpipe: Silence compiler warnings.
Vinson Lee [Tue, 29 Dec 2009 02:05:30 +0000 (18:05 -0800)]
llvmpipe: Silence compiler warnings.

14 years agoutil: better fix for unused variable warnings with asserts
Keith Whitwell [Mon, 28 Dec 2009 11:05:06 +0000 (11:05 +0000)]
util: better fix for unused variable warnings with asserts

Modify the non-debug (ie disabled) version of assert to expose the
value in the expression to the compiler (avoiding the unused variable
messages) while still expanding to a noop.

14 years agollvmpipe: Silence compiler warnings.
Vinson Lee [Mon, 28 Dec 2009 08:44:30 +0000 (00:44 -0800)]
llvmpipe: Silence compiler warnings.

14 years agost/xorg: Silence unused variable warnings.
Vinson Lee [Mon, 28 Dec 2009 07:02:55 +0000 (23:02 -0800)]
st/xorg: Silence unused variable warnings.

14 years agog3dvl: Silence compiler warnings.
Vinson Lee [Mon, 28 Dec 2009 06:49:49 +0000 (22:49 -0800)]
g3dvl: Silence compiler warnings.

14 years agost/vega: Silence compiler warnings.
Vinson Lee [Mon, 28 Dec 2009 06:39:31 +0000 (22:39 -0800)]
st/vega: Silence compiler warnings.

14 years agogallium/xlib: Silence unused variable warning.
Vinson Lee [Mon, 28 Dec 2009 06:18:18 +0000 (22:18 -0800)]
gallium/xlib: Silence unused variable warning.

14 years agotrace: Silence unused variable warnings.
Vinson Lee [Mon, 28 Dec 2009 02:12:58 +0000 (18:12 -0800)]
trace: Silence unused variable warnings.

14 years agoi915g: Silence unused variable warning.
Vinson Lee [Mon, 28 Dec 2009 02:09:58 +0000 (18:09 -0800)]
i915g: Silence unused variable warning.

14 years agosoftpipe: Silence unintialized variable warnings.
Vinson Lee [Mon, 28 Dec 2009 02:06:02 +0000 (18:06 -0800)]
softpipe: Silence unintialized variable warnings.

14 years agosoftpipe: Silence unused variable warning.
Vinson Lee [Mon, 28 Dec 2009 01:52:47 +0000 (17:52 -0800)]
softpipe: Silence unused variable warning.

14 years agotgsi/ureg: Silence uninitialized variable warnings.
Vinson Lee [Mon, 28 Dec 2009 01:40:48 +0000 (17:40 -0800)]
tgsi/ureg: Silence uninitialized variable warnings.

14 years agodocs: insert 7.7 release date
Brian Paul [Sun, 27 Dec 2009 22:33:25 +0000 (15:33 -0700)]
docs: insert 7.7 release date

14 years agoMerge branch 'mesa_7_6_branch' into mesa_7_7_branch
Brian Paul [Sun, 27 Dec 2009 22:31:08 +0000 (15:31 -0700)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h

14 years agodocs: insert 7.6.1 release date
Brian Paul [Sun, 27 Dec 2009 22:14:25 +0000 (15:14 -0700)]
docs: insert 7.6.1 release date

14 years agost/mesa: add missing case for PIPE_FORMAT_B8G8R8A8_UNORM
Brian Paul [Sun, 27 Dec 2009 17:09:24 +0000 (10:09 -0700)]
st/mesa: add missing case for PIPE_FORMAT_B8G8R8A8_UNORM

14 years agogallium/util: Remove comma at end of enumerator list.
Vinson Lee [Sun, 27 Dec 2009 00:22:25 +0000 (16:22 -0800)]
gallium/util: Remove comma at end of enumerator list.

14 years agorbug: Remove comma at end of enumerator list.
Vinson Lee [Sun, 27 Dec 2009 00:18:47 +0000 (16:18 -0800)]
rbug: Remove comma at end of enumerator list.

14 years agorbug: Remove comma at end of enumerator list.
Vinson Lee [Sun, 27 Dec 2009 00:14:39 +0000 (16:14 -0800)]
rbug: Remove comma at end of enumerator list.

14 years agomesa: Remove comma at end of enumerator list.
Vinson Lee [Sun, 27 Dec 2009 00:09:41 +0000 (16:09 -0800)]
mesa: Remove comma at end of enumerator list.