OSDN Git Service
Brian Paul [Thu, 10 Sep 2009 18:44:28 +0000 (12:44 -0600)]
tgsi: use new tgsi_call_record to handle execution mask stacks
This fixes some issues when "return"ing from nested loops/conditionals.
Brian Paul [Thu, 10 Sep 2009 16:17:07 +0000 (10:17 -0600)]
mesa: need to set all stencil bits to 0 before setting the 1 bits
Plus, check for pixel transfer stencil index/offset.
Ian Romanick [Thu, 10 Sep 2009 18:24:56 +0000 (11:24 -0700)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
src/mesa/drivers/dri/intel/intel_context.c
Eric Anholt [Wed, 9 Sep 2009 19:35:30 +0000 (12:35 -0700)]
i965: Fix relocation delta for WM surfaces.
This was a regression in
0f328c90dbc893e15005f2ab441d309c1c176245.
Bug #23688
Bug #23254
(cherry picked from commit
5604b27b9326ac542069a49ed9650c4b0d3e939a)
Zhenyu Wang [Mon, 7 Sep 2009 08:18:57 +0000 (16:18 +0800)]
intel: add B43 chipset support
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Hopefully this will be one of the last cherry-picks.
(cherry picked from commit
ca246dd186f9590f6d67038832faceb522138c20)
Brian Paul [Thu, 10 Sep 2009 14:41:12 +0000 (08:41 -0600)]
mesa: in texenvprogram code, only do saturation when really needed.
For some env modes (like modulate or replace) we don't have to clamp
because we know the results will be in [0,1].
Vinson Lee [Thu, 10 Sep 2009 14:39:26 +0000 (08:39 -0600)]
gallium: Add PIPE_OS_APPLE back to auxiliary/util/u_time.h.
Fixes typo from commit
c6c44bf48124dd5b4661014a8d58482c5a54557f.
Pauli Nieminen [Thu, 10 Sep 2009 13:41:59 +0000 (16:41 +0300)]
radeon: Change debugging code to use macros instead of inline functions.
Variadic functions can't be inlined which makes debugging to have quite large
function overead. Only aleternative method is to use variadic macros which are
inlined so compiler can optimize debugging to minimize overhead.
Brian Paul [Wed, 9 Sep 2009 18:01:28 +0000 (12:01 -0600)]
mesa: include new u_format.csv file in tarballs
Pauli Nieminen [Wed, 9 Sep 2009 15:31:52 +0000 (18:31 +0300)]
radeon: Add more verbose error message for failed command buffer.
Brian Paul [Wed, 9 Sep 2009 14:33:39 +0000 (08:33 -0600)]
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
Makefile
configs/default
progs/glsl/Makefile
src/gallium/auxiliary/util/u_simple_shaders.c
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_pixel.c
src/mesa/drivers/dri/intel/intel_pixel_read.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
aljen [Sat, 5 Sep 2009 21:06:53 +0000 (23:06 +0200)]
gallium: Added HaikuOS platform
Brian Paul [Wed, 9 Sep 2009 14:23:11 +0000 (08:23 -0600)]
mesa: disable GL_LUMINANCE case in _mesa_meta_draw_pixels()
Works around a bug found on i965. See bug 23670.
Vinson Lee [Wed, 9 Sep 2009 14:21:05 +0000 (08:21 -0600)]
scons: Set default_dri to no for Mac OS.
Mac OS does not have libdrm.
Brian Paul [Tue, 8 Sep 2009 20:45:24 +0000 (14:45 -0600)]
mesa: bump version to 7.5.2
I'm not 100% sure there'll be a 7.5.2 release, but just in case.
Brian Paul [Tue, 8 Sep 2009 18:21:42 +0000 (12:21 -0600)]
i965: fix incorrect test for vertex position attribute
Brian Paul [Tue, 8 Sep 2009 15:20:39 +0000 (09:20 -0600)]
egl: also use X types for building on Apple/MacOS X
See bug 20413.
Peter Hutterer [Mon, 7 Sep 2009 00:49:31 +0000 (10:49 +1000)]
prog/glsl: fix Makefile for samplers_array.
The rule added in
488b3c4d1bc3d830477180759a42dbaf8f5801b0 does not use the
right INCDIR, breaking the build when GL isn't installed in the default include
paths.
7.5 branch only fix, already fixed in master by rewriting the Makefile
(
ceb9459ed5e63207defa5d715958c2757933272f)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Eric Anholt [Mon, 22 Jun 2009 15:52:52 +0000 (08:52 -0700)]
i965: Fix warnings in intel_pixel_read.c.
(cherry picked from commit
c80ce5ac90b1e0ac7a72cd41c314aa2000bfecf5)
Eric Anholt [Sat, 20 Jun 2009 05:12:52 +0000 (22:12 -0700)]
intel: Also get the DRI2 front buffer when doing front buffer reading.
(cherry picked from commit
df70d3049a396af3601d2a1747770635a74120bb)
Eric Anholt [Sat, 20 Jun 2009 05:03:37 +0000 (22:03 -0700)]
intel: Update Mesa state before span setup in glReadPixels.
We could have mapped the wrong set of draw buffers. Noticed while looking
into a DRI2 glean ReadPixels issue.
(cherry picked from commit
afc981ee46791838f3cb83e11eb33938aa3efc83)
Eric Anholt [Sat, 20 Jun 2009 04:43:22 +0000 (21:43 -0700)]
intel: Move intel_pixel_read.c to shared for use with i965.
(cherry picked from commit
dcfe0d66bfff9a55741aee298b7ffb051a48f0d3)
Eric Anholt [Thu, 16 Jul 2009 22:57:22 +0000 (15:57 -0700)]
i965: Add missing state dependency of sf_unit on _NEW_BUFFERS.
(cherry picked from commit
99174e7630676307f618c252755a20ba61ad9158)
Eric Anholt [Wed, 19 Aug 2009 01:48:54 +0000 (18:48 -0700)]
intel: Align cubemap texture height to its padding requirements.
(cherry picked from commit
a70e1315846cd5e8d6f2b622821ff8262fe7179d)
(cherry picked from commit
29e51c3872531366570d032147abad50f8a3c1af)
Eric Anholt [Sat, 8 Aug 2009 01:09:31 +0000 (18:09 -0700)]
intel: Align untiled region height to 2 according to 965 docs.
This may or may not be required pre-965, but it doesn't seem unlikely, and
I'd rather be safe.
(cherry picked from commit
b053474378633249be0e9f24010650ffb816229a)
Eric Anholt [Thu, 6 Aug 2009 03:12:15 +0000 (20:12 -0700)]
i965: Fix source depth reg setting for FSes reading and writing to depth.
For some IZ setups, we'd forget to account for the source depth register
being present, so we'd both read the wrong reg, and write output depth to
the wrong reg.
Bug #22603.
(cherry picked from commit
f44916414ecd2b888c8a680d56b7467ccdff6886)
Eric Anholt [Wed, 5 Aug 2009 01:02:31 +0000 (18:02 -0700)]
i965: Respect CondSwizzle in OPCODE_IF.
Fixes piglit glsl-vs-if-bool and progs/glsl/twoside, and will likely be
useful for the looping code.
Bug #18992
(cherry picked from commit
78c022acd0b37bf8b32f04313d76255255e769c1)
(cherry picked from commit
63d7a2f53fb38e170f4e55f2b599e918edf2c512)
Brian Paul [Thu, 18 Jun 2009 15:23:58 +0000 (09:23 -0600)]
i965: asst clean-ups, etc in brw_vs_emit()
(cherry picked from commit
fd7d764514c540987549c3ea88a2d669b0f0ea58)
Eric Anholt [Tue, 4 Aug 2009 21:13:27 +0000 (14:13 -0700)]
i965: Emit conditional code updates as required for GLSL VS if statements.
Previously, we'd be branching based on whatever condition code happened to be
laying around.
(cherry picked from commit
7007f8b352763af89805f287153cb7972bff0523)
Eric Anholt [Tue, 4 Aug 2009 20:42:30 +0000 (13:42 -0700)]
i965: Spell "conditional" correctly.
Eric Anholt [Tue, 4 Aug 2009 19:39:22 +0000 (12:39 -0700)]
i965: Fix RECT shadow sampling by not losing the other texcoords.
Bug #20821
(cherry picked from commit
191e028de20b2f954621b652aa77b06d0e93652a)
Eric Anholt [Tue, 4 Aug 2009 00:55:14 +0000 (17:55 -0700)]
i965: Assert that the offset in the VBO is below the VBO size.
This avoids sending a bad buffer address to the GPU due to programmer error,
and is permitted by the ARB_vbo spec. Note that we still have the opportunity
to dereference past the end of the GPU, because we aren't clipping to a
correct _MaxElement, but that appears to be harder than it should be. This
gets us the 90% solution.
Bug #19911.
(cherry picked from commit
d7430d942f6c7950a92367aeb13b80cf76ccad78)
Eric Anholt [Tue, 4 Aug 2009 00:12:43 +0000 (17:12 -0700)]
i965: Even if no VS inputs are set, still load some amount of URB as required.
See comment on Vertex URB Entry Read Length for VS_STATE.
This, combined with the previous three commits, fixes #22945.
(cherry picked from commit
e340d4f9866db4bae391288e83a630a310b0dd2b)
Eric Anholt [Mon, 3 Aug 2009 22:24:02 +0000 (15:24 -0700)]
i965: Make sure the VS URB size is big enough to fit a VF VUE.
This fix is just from code and docs inspection, but it may fix hangs on
some applications.
(cherry picked from commit
e93848e595176ae0bad3bfe64e0ca63fd089bb72)
Eric Anholt [Thu, 30 Jul 2009 20:40:29 +0000 (13:40 -0700)]
i965: Don't emit bad packets when no VBs are referenced.
It appears that sometimes Mesa (and I suppose a VS could as well) emits
a program which references no vertex data, and thus we end up with
nr_enabled == 0 even though some VBs are enabled. We'd end up emitting
VB/VE packet headers of 0xffffffff in that case, leading to GPU hangs.
Bug #22945 (wine with an uncompiled VS)
(cherry picked from commit
d1fbfd0f962347e4153db3852292d44de5aea863)
Eric Anholt [Mon, 3 Aug 2009 21:46:18 +0000 (14:46 -0700)]
i965: Calculate enabled[] and nr_enabled once and re-use the values.
The code duplication bothered me.
(cherry picked from commit
9b9cb30d128fc5f1ba77287696ecd508e640efde)
Eric Anholt [Wed, 24 Jun 2009 02:30:25 +0000 (19:30 -0700)]
i965: Set the max index buffer address correctly according to the docs.
It's the last addressable byte, not the byte after the end of the buffer.
(cherry picked from commit
b72dea5441e8e9226dabf1826fa3bc129c7bc281)
Brian Paul [Fri, 15 May 2009 15:14:24 +0000 (09:14 -0600)]
i965: rename var: s/tmp/vs_inputs/
(cherry picked from commit
840c09fc71542fdfc71edd2a2802925d467567bb)
José Fonseca [Fri, 4 Sep 2009 18:38:35 +0000 (19:38 +0100)]
scons: Used wrong exception class.
José Fonseca [Fri, 4 Sep 2009 18:33:41 +0000 (19:33 +0100)]
scons: Don't use scons internal functions.
Alex Deucher [Fri, 4 Sep 2009 18:03:51 +0000 (14:03 -0400)]
r600: fix Elts handling
Patch from taiu on IRC. fixes bug 23585
Brian Paul [Fri, 4 Sep 2009 15:15:35 +0000 (09:15 -0600)]
ARB prog: replace 'unsigned' with 'gl_state_index'
Fixes compilation warnings with MSVC.
Brian Paul [Fri, 4 Sep 2009 15:06:40 +0000 (09:06 -0600)]
ARB prog: rename POINT, SIZE to POINT_TOK, SIZE_TOK
Fixes symbol collisions with typedefs in Microsoft headers.
Perhaps we should prefix/suffix all the lexer tokens to avoid this.
Brian Paul [Thu, 3 Sep 2009 23:16:19 +0000 (17:16 -0600)]
gallium/xlib: minor clean-ups
Jakob Bornecrantz [Fri, 4 Sep 2009 09:27:17 +0000 (10:27 +0100)]
i915g: Fix warnings in scons build by using byte pointers
scons build complained about void pointer math
Michal Krol [Fri, 4 Sep 2009 07:31:22 +0000 (09:31 +0200)]
tgsi: Document differencies between vs_1_1 and vs_2_0 for EXPP and LOGP.
Brian Paul [Thu, 3 Sep 2009 21:49:10 +0000 (15:49 -0600)]
docs: 7.5.1 md5 sums
Brian Paul [Thu, 3 Sep 2009 21:44:49 +0000 (15:44 -0600)]
docs: point to fd.o for downloads instead of SourceForge
Brian Paul [Thu, 3 Sep 2009 21:44:22 +0000 (15:44 -0600)]
gallium/xlib: silence unitialized var warning
Brian Paul [Thu, 3 Sep 2009 21:23:15 +0000 (15:23 -0600)]
gallium/xlib: silence uninitialized var warning
Brian Paul [Thu, 3 Sep 2009 21:04:49 +0000 (15:04 -0600)]
st/mesa: silence uninitialized var warnings
Brian Paul [Thu, 3 Sep 2009 20:57:30 +0000 (14:57 -0600)]
docs: prep for 7.5.1 release
Brian Paul [Thu, 3 Sep 2009 20:57:16 +0000 (14:57 -0600)]
docs: added news entry for 7.5.1
Brian Paul [Thu, 3 Sep 2009 20:57:04 +0000 (14:57 -0600)]
docs: update precompiled libs info
Brian Paul [Thu, 3 Sep 2009 20:56:50 +0000 (14:56 -0600)]
docs: move SGI GLU link
Brian Paul [Thu, 3 Sep 2009 20:39:53 +0000 (14:39 -0600)]
st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted position
If the renderbuffer orientation is Y=0=TOP we need to invert the dstY
position.
Keith Whitwell [Wed, 2 Sep 2009 17:30:11 +0000 (18:30 +0100)]
st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardware
State tracker currently backs GL_RGB textures with RGBA almost always.
This means we need to maintain A==1 in these textures to give correct GL_RGB
sampling results.
This change offloads the RGBA->RGB copy to hardware using the new writemask
version of u_blit_pixels.
More src/dstLogical/dstActual triples could be shifted to hardware by
this technique in future patches.
Keith Whitwell [Wed, 2 Sep 2009 16:58:52 +0000 (17:58 +0100)]
util: add version of u_blit_pixels which takes a writemask
Values outside the writemask are set in the destination to {0,0,0,1}
Brian Paul [Tue, 1 Sep 2009 14:53:31 +0000 (08:53 -0600)]
progs/tests: re-enable exit() call
See bug 21267.
Brian Paul [Mon, 31 Aug 2009 16:31:45 +0000 (10:31 -0600)]
docs/: document cross-compile fix
Alex Deucher [Thu, 3 Sep 2009 22:02:54 +0000 (18:02 -0400)]
r600: rework cb/db setup
Setup the regs when we emit rather than during state setup.
In certain cases a proper CB target was never emitted.
This fixes bug 23658.
Brian Paul [Thu, 3 Sep 2009 21:49:10 +0000 (15:49 -0600)]
docs: 7.5.1 md5 sums
Brian Paul [Thu, 3 Sep 2009 21:44:49 +0000 (15:44 -0600)]
docs: point to fd.o for downloads instead of SourceForge
Brian Paul [Thu, 3 Sep 2009 21:44:22 +0000 (15:44 -0600)]
gallium/xlib: silence unitialized var warning
Brian Paul [Thu, 3 Sep 2009 21:23:15 +0000 (15:23 -0600)]
gallium/xlib: silence uninitialized var warning
Brian Paul [Thu, 3 Sep 2009 21:04:49 +0000 (15:04 -0600)]
st/mesa: silence uninitialized var warnings
Brian Paul [Thu, 3 Sep 2009 20:57:30 +0000 (14:57 -0600)]
docs: prep for 7.5.1 release
Brian Paul [Thu, 3 Sep 2009 20:57:16 +0000 (14:57 -0600)]
docs: added news entry for 7.5.1
Brian Paul [Thu, 3 Sep 2009 20:57:04 +0000 (14:57 -0600)]
docs: update precompiled libs info
Brian Paul [Thu, 3 Sep 2009 20:56:50 +0000 (14:56 -0600)]
docs: move SGI GLU link
Zack Rusin [Thu, 3 Sep 2009 20:51:31 +0000 (16:51 -0400)]
st/xorg: add linear and radial gradient acceleration
Zack Rusin [Thu, 3 Sep 2009 19:33:31 +0000 (15:33 -0400)]
st/xorg: radial gradient shader
Zack Rusin [Thu, 3 Sep 2009 18:18:05 +0000 (14:18 -0400)]
st/xorg: linear gradient shader
Brian Paul [Thu, 3 Sep 2009 20:39:53 +0000 (14:39 -0600)]
st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted position
If the renderbuffer orientation is Y=0=TOP we need to invert the dstY
position.
Alex Deucher [Thu, 3 Sep 2009 19:22:16 +0000 (15:22 -0400)]
r600: make sure the active vertex shader bo is re-added to persistent list.
Brian Paul [Thu, 3 Sep 2009 19:02:41 +0000 (13:02 -0600)]
glapi: fix incorrect/missing return types for glFenceSync(), glClientWaitSync()
Brian Paul [Thu, 3 Sep 2009 18:47:25 +0000 (12:47 -0600)]
mesa: rename gl_sync_object::Status to StatusFlag
There's a symbol collision with X11/Xlib.h #define Status int
in the Mesa xlib code. This seems the simpliest way to work around this.
Ian Romanick [Thu, 3 Sep 2009 18:22:05 +0000 (11:22 -0700)]
docs: Document new extension support for 7.6 release.
Eric Anholt [Tue, 1 Sep 2009 21:26:22 +0000 (14:26 -0700)]
Add ARB_sync to the xorg sw dri driver.
Eric Anholt [Tue, 1 Sep 2009 19:37:51 +0000 (12:37 -0700)]
savage: Fix driver build post-ARB_sync.
Like s3v, clean up absurd use of Xlib in the driver, avoiding namespace
pollution.
Eric Anholt [Tue, 1 Sep 2009 19:31:24 +0000 (12:31 -0700)]
s3v: Fix driver build for ARB_sync.
This driver was including Xlibint.h to get the CARD32 typedef to use for
32-bit unsigned integers, which #defined Status to something. CARD32 isn't
actually a 32-bit unsigned integer, so replacing with uint32_t usage should
fix bugs on 64-bit along with the build.
Eric Anholt [Tue, 1 Sep 2009 19:20:10 +0000 (12:20 -0700)]
intel: Add support for ARB_sync.
We currently weasel out of supporting the timeout parameter, but otherwise
this extension looks ready, and should make the common case happy.
Ian Romanick [Tue, 1 Sep 2009 19:15:51 +0000 (12:15 -0700)]
ARB sync / swrast: Use GL_ARB_sync_functions instead of GL_ARB_sync. Oops.
Ian Romanick [Tue, 1 Sep 2009 18:58:36 +0000 (11:58 -0700)]
Don't dereference function pointers in calls.
I'm apparently alone in prefering this calling convention, so I'll be
a team player. :p Based on review comments by Brian Paul and Eric
Anholt.
Ian Romanick [Tue, 1 Sep 2009 18:57:40 +0000 (11:57 -0700)]
Add syncobj.c to SConscript
Ian Romanick [Tue, 1 Sep 2009 18:56:34 +0000 (11:56 -0700)]
Whitespace and include file clean-up.
Based on review comments by Brian Paul.
Ian Romanick [Tue, 1 Sep 2009 18:24:54 +0000 (11:24 -0700)]
Use MIN2 instead of open-coded version
Based on review comments by Brian Paul.
Ian Romanick [Mon, 31 Aug 2009 21:57:50 +0000 (14:57 -0700)]
ARB sync: Fix delete behavior and context destruction behavior
I believe this resolves the outstanding issues WRT sync object
deletetion. I have also added a large comment at the top of syncobj.c
describing the expected memory management behavior. I'm still a
little uncertain about the locking on ctx->Shared.
Ian Romanick [Mon, 31 Aug 2009 21:49:33 +0000 (14:49 -0700)]
Add dummy list node type 'struct simple_node'
Ian Romanick [Sat, 29 Aug 2009 03:10:05 +0000 (20:10 -0700)]
ARB sync: Add support for GL_ARB_sync to swrast
This isn't quite right yet. The delete behavior and the context
clean-up needs some work.
Ian Romanick [Fri, 28 Aug 2009 22:53:00 +0000 (15:53 -0700)]
Eliminate trailing whitespace in extension_helper.c
Ian Romanick [Fri, 28 Aug 2009 22:50:28 +0000 (15:50 -0700)]
ARB sync: Regenerate files from previous commit
Ian Romanick [Fri, 28 Aug 2009 22:49:27 +0000 (15:49 -0700)]
ARB sync: Add base infrastructure for GL_ARB_sync
Ian Romanick [Fri, 28 Aug 2009 22:37:25 +0000 (15:37 -0700)]
ARB sync: Add infrastructure for glGetInteger64v
Brian Paul [Thu, 3 Sep 2009 18:10:53 +0000 (12:10 -0600)]
mesa: fix typos in separable filter functions
Brian Paul [Wed, 2 Sep 2009 21:39:13 +0000 (15:39 -0600)]
mesa: compute tex env program key size based on nr_enabled_units
When no textures are enabled, the key size is 4 bytes. If unit[0] is
enabled, the key size is 16 bytes.
Inspired by a patch from Chris Wilson.
Brian Paul [Thu, 3 Sep 2009 17:46:28 +0000 (11:46 -0600)]
swrast: wrap comment to 80 columns, remove dead code
Brian Paul [Thu, 3 Sep 2009 17:41:29 +0000 (11:41 -0600)]
mesa: use new combined PBO validate/map helpers in convolution/filter funcs
Brian Paul [Thu, 3 Sep 2009 17:23:05 +0000 (11:23 -0600)]
mesa: use new combined PBO validate/map helpers
Brian Paul [Thu, 3 Sep 2009 17:22:27 +0000 (11:22 -0600)]
mesa: combined PBO validate/map helpers