Brian Paul [Wed, 6 Jan 2010 15:13:56 +0000 (08:13 -0700)]
configs: set INTEL_LIBS, INTEL_CFLAGS, etc
Michal Krol [Wed, 6 Jan 2010 15:07:49 +0000 (16:07 +0100)]
util: Fix format descriptor table entries.
Michal Krol [Wed, 6 Jan 2010 13:12:10 +0000 (14:12 +0100)]
pipe_sampler_state::compare_mode is not a boolean enable flag.
It's a 1-bit enum.
Michal Krol [Wed, 6 Jan 2010 13:07:12 +0000 (14:07 +0100)]
util: Handle the remaining format cases in pipe_tile_raw_to_rgba().
Michal Krol [Wed, 6 Jan 2010 10:23:43 +0000 (11:23 +0100)]
Make sure we use only signed/unsigned ints with bitfields.
Seems to be the only way to stay fully portable.
Brian Paul [Wed, 6 Jan 2010 14:17:48 +0000 (07:17 -0700)]
i965g: fix invalid assertion in emit_xpd(), again
José Fonseca [Wed, 6 Jan 2010 13:52:22 +0000 (13:52 +0000)]
Merge remote branch 'origin/mesa_7_7_branch'
Conflicts:
configs/default
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/mesa/main/version.h
José Fonseca [Sun, 3 Jan 2010 21:30:02 +0000 (21:30 +0000)]
glew: Update to version 1.5.2.
José Fonseca [Tue, 5 Jan 2010 20:41:29 +0000 (20:41 +0000)]
pipebuffer: Multi-threading fixes for fencing.
I had this patch on my hard drive for long time. It doesn't fully
address SVGA multi-threading issues, but causes no regressions, so decided
to commit while it still applies cleanly.
Attention: merging this into master will cause issues due to recent
changes in reference counting to fix strict aliasing rules violation.
Luca Barbieri [Wed, 6 Jan 2010 10:35:47 +0000 (10:35 +0000)]
gallium: remove PIPE_TEX_FILTER_ANISO
This patch removes PIPE_TEX_FILTER_ANISO.
Anisotropic filtering is enabled if and only if max_anisotropy > 1.0.
Values between 0.0 and 1.0, inclusive, of max_anisotropy are to be
considered equivalent, and meaning to turn off anisotropic filtering.
This approach has the small drawback of eliminating the possibility of
enabling anisotropic filter on either minification or magnification
separately, which Radeon hardware seems to support, is currently
support by Gallium but not exposed to OpenGL. If this is actually
useful it could be handled by splitting max_anisotropy in two values
and adding an appropriate OpenGL extension.
NOTE: some fiddling & reformatting by keithw to get this patch to
apply. Hopefully nothing broken in the process.
Brian Paul [Wed, 6 Jan 2010 04:25:56 +0000 (21:25 -0700)]
docs: added more GL3 items
Brian Paul [Wed, 6 Jan 2010 04:24:48 +0000 (21:24 -0700)]
mesa: added GL_MAJOR_VERSION and GL_MINOR_VERSION queries
New in GL 3.0.
Brian Paul [Wed, 6 Jan 2010 04:23:59 +0000 (21:23 -0700)]
mesa: call _mesa_compute_version() to set context's version info
Brian Paul [Wed, 6 Jan 2010 04:23:16 +0000 (21:23 -0700)]
mesa: added version.c to build
Brian Paul [Wed, 6 Jan 2010 04:23:01 +0000 (21:23 -0700)]
mesa: added _mesa_compute_version() in new version.c file
Brian Paul [Wed, 6 Jan 2010 04:17:55 +0000 (21:17 -0700)]
mesa: added version fields to GLcontext
Brian Paul [Wed, 6 Jan 2010 00:07:44 +0000 (17:07 -0700)]
gallium/util: replace 8 with PIPE_MAX_COLOR_BUFS
Brian Paul [Tue, 5 Jan 2010 23:55:35 +0000 (16:55 -0700)]
gallium/util: comments and whitespace fixes
Brian Paul [Tue, 5 Jan 2010 23:03:11 +0000 (16:03 -0700)]
docs: added link to wiki page about missing Mesa features
Brian Paul [Tue, 5 Jan 2010 22:53:46 +0000 (15:53 -0700)]
i965g: fix invalid assertion in emit_xpd()
Invalid assertion found by Roel Kluin <roel.kluin@gmail.com>
Brian Paul [Tue, 5 Jan 2010 22:53:01 +0000 (15:53 -0700)]
i965: fix invalid assertion in emit_xpd()
Invalid assertion found by Roel Kluin <roel.kluin@gmail.com>
Roel Kluin [Tue, 5 Jan 2010 21:40:40 +0000 (13:40 -0800)]
tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()
This can never be true.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Eric Anholt [Tue, 5 Jan 2010 19:07:54 +0000 (11:07 -0800)]
i965: Fix build after blind merge of mesa 7.7 by Brian.
Brian Paul [Tue, 5 Jan 2010 18:40:24 +0000 (11:40 -0700)]
st/mesa: fix broken translation of negative register indexes
A src register's index can be negative if we're doing indirect
addressing into the constant buffer. Ex: MOV OUT[1], CONST[ADDR[0].x-3]
This fixes the piglit vp-arl-neg-array.vpfp test.
Before this change we were going out of bounds of the t->constants[]
array and getting garbage that later triggered an assertion.
Brian Paul [Tue, 5 Jan 2010 17:56:57 +0000 (10:56 -0700)]
ARB prog parser: regenerated parser file
Brian Paul [Tue, 5 Jan 2010 17:53:44 +0000 (10:53 -0700)]
ARB prog parser: fix parameter binding type
References to program local and enviroment parameters are put into the
unified program parameters list as PROGRAM_STATE_VAR entries which point
into the local or environment arrays. So the param_binding_type field
should be PROGRAM_STATE_VAR.
This fixes the piglit vpfp-generic vp-arl-env-array.vpfp and
vp-arl-local-array.vpfp test failures.
Brian Paul [Tue, 5 Jan 2010 17:03:16 +0000 (10:03 -0700)]
ARB prog parser: regenerated parser files
Brian Paul [Tue, 5 Jan 2010 17:01:20 +0000 (10:01 -0700)]
ARB prog parser: add allowSwizzle param to initialize_symbol_from_const()
We need to disable constant consolidation when building an array of
constants which might be indexed indirectly.
Fixes regression in piglit vpfp-generic vp-arl-constant-array.vpfp
test caused by earlier constant consolidation patch.
Brian Paul [Tue, 5 Jan 2010 16:59:39 +0000 (09:59 -0700)]
mesa: whitespace changes and comments
Brian Paul [Tue, 5 Jan 2010 16:57:41 +0000 (09:57 -0700)]
mesa: change constant search behaviour in _mesa_add_unnamed_constant()
Only search for an existing, matching constant if swizzleOut is non-null.
We need to be able to disable constant consolidation when building an
array of constants which will be indexed indirectly.
Maarten Maathuis [Tue, 29 Dec 2009 22:59:08 +0000 (23:59 +0100)]
nouveau: rewrite nouveau_stateobj to use BEGIN_RING properly
- The previous solution was hacky and didn't do subchannel autobinding.
- The beheaviour should match what libdrm_nouveau does closely.
- The solution remains statically sized, but when debugging is on it will check
for abuse.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Marcin Slusarz [Mon, 28 Dec 2009 23:36:17 +0000 (00:36 +0100)]
nouveau: kill nouveau_push.h and use libdrm versions of BEGIN_RINGs, etc
Maarten Maathuis [Sun, 20 Dec 2009 11:19:19 +0000 (12:19 +0100)]
nv50: remove vtxbuf stateobject after a referenced vtxbuf is mapped
- This avoids problematic "reloc'ed while mapped" messages and
some associated corruption as well.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
José Fonseca [Tue, 5 Jan 2010 17:56:26 +0000 (17:56 +0000)]
svga: Remove stale references to delete shader results.
To ensure that a new result that happens to have the same address
of the old one will be detected as a change.
José Fonseca [Tue, 5 Jan 2010 17:32:19 +0000 (17:32 +0000)]
svga: Rebind shaders when tokens change.
Even shader ID doesn't change. Otherwise the token change is not
effective.
This reverts regression from commit
cdb445f3a9285e2d8f042a07021ade78b94e0156. Regression could be seen in
Quake3's loading screen -- the upper right corner of the screen would
be black.
Corbin Simpson [Tue, 5 Jan 2010 16:37:49 +0000 (08:37 -0800)]
Merge branch 'gallium-docs'
Chia-I Wu [Tue, 5 Jan 2010 13:39:15 +0000 (21:39 +0800)]
egl: Fix breakage from -fvisibility=hidden.
Mark EGL API and driver functions as PUBLIC.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Corbin Simpson [Tue, 5 Jan 2010 16:22:52 +0000 (08:22 -0800)]
docs: Don't check in generated docs.
Per ML discussion.
Corbin Simpson [Thu, 24 Dec 2009 09:53:48 +0000 (01:53 -0800)]
docs: Stub out list of modules in core distribution of G3D.
Brian Paul [Tue, 5 Jan 2010 16:14:48 +0000 (09:14 -0700)]
st/mesa: added PROGRAM_LOCAL_PARAM case in src_register()
Fixes piglit vpfp-generic arl.vpfp failure when using gallium.
Kristian Høgsberg [Tue, 5 Jan 2010 15:31:11 +0000 (10:31 -0500)]
Merge branch 'remove-intel-dri1'
* remove-intel-dri1:
intel: intelScreenContext() is no longer used
intel: Remove remaining dri2.enabled tests
intel: Drop more cliprect bookkeeping
intel: Remove struct intel_framebuffer
intel: Remove client-side vblank code
intel: Drop intelWindowMoved()
intel: Drop batchbuffer cliprect_mode tracking
intel: Drop DRI1 static regions
intel: Use depth buffer from ctx.DrawBuffer in copypix_src_region()
intel: Drop LOCK/UNLOCK_HARDWARE()
intel: Drop DRI1 SwapBuffer implementation
intel: Drop DRI1 CopySubBuffer implementation
intel: Drop DRI1 support
Push __driDriverExtensions out of dri_util.c and into the drivers
Remove leftover __DRI{screen,drawable,context}Private references
Check for libdrm_$chipset.pc when needed
Brian Paul [Mon, 4 Jan 2010 21:31:08 +0000 (14:31 -0700)]
mesa: bump version to 7.7.1-DEVEL
Keith Whitwell [Tue, 5 Jan 2010 14:13:40 +0000 (14:13 +0000)]
Merge commit 'origin/gallium-draw-retval'
Conflicts:
src/gallium/drivers/identity/id_context.c
Andre Maasikas [Tue, 22 Dec 2009 12:50:10 +0000 (14:50 +0200)]
r600: adjust after radeon mipmap changes in
7118db8700
R600_OUT_BATCH_RELOC doesn't really use offset so set it
in TEX_RESOURCE2
+ typo fix
Andre Maasikas [Tue, 5 Jan 2010 11:44:06 +0000 (13:44 +0200)]
r600: support depth compare functions & shadow_ambient
Michal Krol [Tue, 5 Jan 2010 10:00:07 +0000 (11:00 +0100)]
tgsi: Simplify implementation of few interpreter's instructions.
Michal Krol [Tue, 5 Jan 2010 08:09:50 +0000 (09:09 +0100)]
tgsi: Use FREE() to release MALLOC-ed() memories in sanity.
Michal Krol [Tue, 5 Jan 2010 08:06:30 +0000 (09:06 +0100)]
tgsi: Fix bogus loop condition in sanity.
Michal Krol [Sun, 3 Jan 2010 20:13:47 +0000 (21:13 +0100)]
tgsi: Treat MOV source operand as FLOAT so modifiers works as expected.
Michal Krol [Sun, 3 Jan 2010 19:44:48 +0000 (20:44 +0100)]
tgsi: Store ADDR file in interpreter as an int.
Michal Krol [Sun, 3 Jan 2010 16:59:17 +0000 (17:59 +0100)]
tgsi: Remove dead micro_umod().
Michal Krol [Sat, 2 Jan 2010 21:07:33 +0000 (22:07 +0100)]
tgsi: Make interpreter aware of float and integer data types.
Debug check for inf and nan only on float channels.
Apply absolute and negate source operand modifiers based on
opcode type.
Michal Krol [Sat, 2 Jan 2010 10:00:40 +0000 (11:00 +0100)]
gallium: Add UMOD TGSI opcode.
Either that or have UDIV have two destination operands.
Michal Krol [Fri, 1 Jan 2010 22:44:00 +0000 (23:44 +0100)]
gallium: Add SWITCH, CASE, DEFAULT and ENDSWITCH opcodes to TGSI.
Provide reference implementation of them in tgsi_exec.
Note that BREAK opcode is overloaded and can be used to break out
of either a loop or a switch-case statement.
Michal Krol [Wed, 23 Dec 2009 18:08:45 +0000 (19:08 +0100)]
tgsi/ureg: Improve immediate match & expand logic.
Do not pollute immediates with unsuccessfull attempts to expand them.
Michal Krol [Wed, 23 Dec 2009 17:33:44 +0000 (18:33 +0100)]
tgsi: Support signed/unsigned integer immediate types.
Michal Krol [Wed, 23 Dec 2009 17:17:34 +0000 (18:17 +0100)]
gallium: Add signed/unsigned int immediate data types.
Michal Krol [Wed, 23 Dec 2009 16:22:18 +0000 (17:22 +0100)]
tgsi: Cleanup interpreter code for other existing integer opcodes.
Michal Krol [Wed, 23 Dec 2009 16:02:03 +0000 (17:02 +0100)]
Remove TGSI_OPCODE_SHR, map existing usage to TGSI_OPCODE_ISHR.
This is to differentiate it from its unsigned version, TGSI_OPCODE_USHR.
Michal Krol [Wed, 23 Dec 2009 16:00:15 +0000 (17:00 +0100)]
tgsi: Implement new integer opcodes.
Update interpreter and ureg.
Also, get rid of SHR -- it's actually an alias for ISHR.
Michal Krol [Wed, 23 Dec 2009 15:51:31 +0000 (16:51 +0100)]
gallium: Add more integer TGSI opcodes.
Brian Paul [Tue, 5 Jan 2010 03:00:00 +0000 (20:00 -0700)]
mesa: added _mesa_[Get]TexParameterI[u]iv() functions
New in GL 3.0. Primarily meant for setting int/uint-valued texture
border color. Not plugged into dispatch table yet.
Brian Paul [Tue, 5 Jan 2010 02:53:28 +0000 (19:53 -0700)]
mesa: make texture BorderColor a union of float/int/uint
When we have integer-valued texture formats, the texture border color
must also store integer and uint values.
With GL 3.0, the new glTexParameterIiv() and glTexParameterIuiv() functions
can set the border color to int or uint values.
Brian Paul [Tue, 5 Jan 2010 02:20:33 +0000 (19:20 -0700)]
mesa: use get_texobj() in _mesa_GetTexParameter() funcs
Brian Paul [Tue, 5 Jan 2010 02:16:24 +0000 (19:16 -0700)]
Merge branch 'mesa_7_7_branch'
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
Brian Paul [Tue, 5 Jan 2010 02:05:31 +0000 (19:05 -0700)]
mesa: add missing _mesa_lock_texture() call
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.
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.
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.
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?
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.
Brian Paul [Mon, 4 Jan 2010 19:47:37 +0000 (12:47 -0700)]
docs: initial release notes for 7.7.1
Vinson Lee [Mon, 4 Jan 2010 20:06:04 +0000 (12:06 -0800)]
mesa: Prevent possible array out-of-bounds access by _mesa_light.
Vinson Lee [Mon, 4 Jan 2010 19:28:37 +0000 (11:28 -0800)]
i965g: Fix assert.
Vinson Lee [Mon, 4 Jan 2010 19:25:38 +0000 (11:25 -0800)]
tgsi: Fix assert.
Brian Paul [Mon, 4 Jan 2010 18:47:39 +0000 (11:47 -0700)]
Merge branch 'gallium-conditional-rendering'
Brian Paul [Mon, 4 Jan 2010 18:29:38 +0000 (11:29 -0700)]
mesa: regenerated enums.c file
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.
Brian Paul [Tue, 29 Dec 2009 17:26:28 +0000 (10:26 -0700)]
glsl: use varName variable in _slang_gen_assignment()
Brian Paul [Mon, 4 Jan 2010 18:26:56 +0000 (11:26 -0700)]
mesa: more detailed error message in extract_float_rgba()
Alan Hourihane [Mon, 4 Jan 2010 17:41:49 +0000 (17:41 +0000)]
fix overflow
Kristian Høgsberg [Sat, 2 Jan 2010 04:26:50 +0000 (23:26 -0500)]
intel: intelScreenContext() is no longer used
Kristian Høgsberg [Sat, 2 Jan 2010 04:26:03 +0000 (23:26 -0500)]
intel: Remove remaining dri2.enabled tests
Kristian Høgsberg [Sat, 2 Jan 2010 03:56:36 +0000 (22:56 -0500)]
intel: Drop more cliprect bookkeeping
Kristian Høgsberg [Sat, 2 Jan 2010 04:21:16 +0000 (23:21 -0500)]
intel: Remove struct intel_framebuffer
With the vsync fields no longer relevant and by refactoring the code
to no longer use color_rb[0-1] we can just use struct gl_framebuffer
directly.
Kristian Høgsberg [Sat, 2 Jan 2010 02:41:57 +0000 (21:41 -0500)]
intel: Remove client-side vblank code
Kristian Høgsberg [Sat, 2 Jan 2010 02:37:41 +0000 (21:37 -0500)]
intel: Drop intelWindowMoved()
Everything this functions does under DRI2 is also taken care of
by intel_draw_buffer(), which is always called where intelWindowMoved()
is called.
Kristian Høgsberg [Sat, 2 Jan 2010 01:01:08 +0000 (20:01 -0500)]
intel: Drop batchbuffer cliprect_mode tracking
Kristian Høgsberg [Sat, 2 Jan 2010 00:29:58 +0000 (19:29 -0500)]
intel: Drop DRI1 static regions
Kristian Høgsberg [Sat, 2 Jan 2010 02:15:04 +0000 (21:15 -0500)]
intel: Use depth buffer from ctx.DrawBuffer in copypix_src_region()
This function was using intel->depth_region, which is the static region
for the DRI1 depth buffer. This code has always been broken with DRI2
but I suspect it doesn't get excersized much.
Kristian Høgsberg [Fri, 1 Jan 2010 23:42:23 +0000 (18:42 -0500)]
intel: Drop LOCK/UNLOCK_HARDWARE()
Kristian Høgsberg [Fri, 1 Jan 2010 23:31:48 +0000 (18:31 -0500)]
intel: Drop DRI1 SwapBuffer implementation
Kristian Høgsberg [Fri, 1 Jan 2010 23:29:35 +0000 (18:29 -0500)]
intel: Drop DRI1 CopySubBuffer implementation
Kristian Høgsberg [Fri, 1 Jan 2010 23:16:15 +0000 (18:16 -0500)]
intel: Drop DRI1 support
The DDX driver stopped supporting DRI1 so we're dropping support for
that from the DRI driver too.
Kristian Høgsberg [Fri, 1 Jan 2010 22:56:29 +0000 (17:56 -0500)]
Push __driDriverExtensions out of dri_util.c and into the drivers
This lets the individual drivers select which extensions to advertise.
Specifically, most drivers (tdfx, sis, savage etc) don't support DRI2
but the shared extension list in dri_util.c does list the DRI2 extension.
Pushing the list into the drivers, lets us avoid listing the DRI2
extension for drivers that don't support it.
Kristian Høgsberg [Fri, 1 Jan 2010 22:09:12 +0000 (17:09 -0500)]
Remove leftover __DRI{screen,drawable,context}Private references
As part of the DRI driver interface rewrite I merged __DRIscreenPrivate
and __DRIscreen, and likewise for __DRIdrawablePrivate and
__DRIcontextPrivate. I left typedefs in place though, to avoid renaming
all the *Private use internal to the driver. That was probably a
mistake, and it turns out a one-line find+sed combo can do the mass
rename. Better late than never.
Kristian Høgsberg [Fri, 1 Jan 2010 22:03:33 +0000 (17:03 -0500)]
Check for libdrm_$chipset.pc when needed
This adds missing pkg-config lookup for intel and moves the radeon
lookup into a case...esac so it's only looked up when one or more of
the radeon drivers are enabled.
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().
Alan Hourihane [Mon, 4 Jan 2010 12:42:51 +0000 (12:42 +0000)]
silence compiler warning
Alan Hourihane [Mon, 4 Jan 2010 12:41:33 +0000 (12:41 +0000)]
Fix test