Brian Paul [Tue, 10 Feb 2009 23:56:58 +0000 (16:56 -0700)]
cell: update Cell driver info (code is on master now)
Brian Paul [Tue, 10 Feb 2009 23:44:02 +0000 (16:44 -0700)]
Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.
Conflicts:
progs/demos/Makefile
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
Brian Paul [Tue, 10 Feb 2009 23:34:51 +0000 (16:34 -0700)]
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Brian Paul [Tue, 10 Feb 2009 23:30:24 +0000 (16:30 -0700)]
mesa: remove the unused _mesa_UpdateTexEnvProgram() function
Brian Paul [Tue, 10 Feb 2009 23:28:25 +0000 (16:28 -0700)]
mesa: another fix for program/texture state validation
This fixes a regression introduced in
46ae1abbac6837d051c10b2e8b57eab3d4958ff4
Break program validation into two steps, do part before texture state
validation and do the rest after:
1. Determine Vertex/Fragment _Enabled state.
2. Update texture state.
3. Determine pointers to current Vertex/Fragment programs (which may involve
generating new "fixed-function" programs).
See comments in the code for more details of the dependencies.
Brian Paul [Tue, 10 Feb 2009 17:12:44 +0000 (10:12 -0700)]
intel: minor reformatting, comments
Brian Paul [Tue, 10 Feb 2009 22:43:05 +0000 (15:43 -0700)]
mesa: s/_IMAGE_NEW_TRANSFER_STATE/_MESA_NEW_TRANSFER_STATE/ to be more consistant with other flags
Brian Paul [Tue, 10 Feb 2009 22:35:25 +0000 (15:35 -0700)]
mesa: fix/change state validation order for program/texture state
Program state needs to be updated before texture state since the later depends
on the former.
Fixes piglit texgen failure. The second time through the modes (press 't'
three times) we disable the fragment program and return to conventional texture
mode. State validation failed here because update_texture() saw stale fragment
program state.
Younes Manton [Tue, 10 Feb 2009 21:36:33 +0000 (16:36 -0500)]
nouveau: nv40 swizzled mipmap fixes.
Patrice Mandin [Tue, 10 Feb 2009 21:22:55 +0000 (22:22 +0100)]
nouveau: nv30: fix miptree organization to have swizzled texture+mipmap at the right places
Patrice Mandin [Tue, 10 Feb 2009 21:22:06 +0000 (22:22 +0100)]
nouveau: revert all my changes here, not the right way
Patrice Mandin [Tue, 10 Feb 2009 21:04:56 +0000 (22:04 +0100)]
nouveau: stop with 0 dimension
Patrice Mandin [Tue, 10 Feb 2009 20:57:40 +0000 (21:57 +0100)]
nouveau: we already have the right src offset
José Fonseca [Tue, 10 Feb 2009 20:27:49 +0000 (20:27 +0000)]
progs: Build samples dir with scons and glew.
Patrice Mandin [Tue, 10 Feb 2009 20:22:29 +0000 (21:22 +0100)]
nouveau: do not forget to half dimension.
Patrice Mandin [Tue, 10 Feb 2009 20:20:06 +0000 (21:20 +0100)]
nouveau: revert most parts of recent mipmap+swizzle stuff. We only need to find right src and dst offset for given mipmap level.
José Fonseca [Tue, 10 Feb 2009 18:25:31 +0000 (18:25 +0000)]
progs: Build rebook with scons too.
Keith Whitwell [Tue, 10 Feb 2009 18:21:41 +0000 (18:21 +0000)]
wgl: return before locking if stw_icd is NULL
Keith Whitwell [Tue, 10 Feb 2009 19:22:57 +0000 (19:22 +0000)]
Merge commit 'origin/gallium-0.2' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
José Fonseca [Tue, 10 Feb 2009 18:11:56 +0000 (18:11 +0000)]
scons: Use parallel builds by default.
Keith Whitwell [Tue, 10 Feb 2009 18:11:44 +0000 (18:11 +0000)]
wgl: mutex-protect the shared stw_icd struct
Patrice Mandin [Tue, 10 Feb 2009 17:44:08 +0000 (18:44 +0100)]
nouveau: dst offset is correct
José Fonseca [Tue, 10 Feb 2009 16:18:22 +0000 (16:18 +0000)]
pipebuffer: Drop reliance on pipe_winsys.
Patrice Mandin [Tue, 10 Feb 2009 17:31:41 +0000 (18:31 +0100)]
Missing: tgsi: Fix build -- rename Size to NrTokens.
Patrice Mandin [Tue, 10 Feb 2009 17:09:10 +0000 (18:09 +0100)]
nouveau: recalc sub width and height for each mipmap level
Jakob Bornecrantz [Tue, 10 Feb 2009 16:43:25 +0000 (17:43 +0100)]
mesa: Build both software rasterizers for debug
But put the gallium one in lib/gallium
Jakob Bornecrantz [Tue, 10 Feb 2009 15:17:32 +0000 (16:17 +0100)]
gallium: Don't rebuild common drm code
Jakob Bornecrantz [Tue, 10 Feb 2009 15:16:15 +0000 (16:16 +0100)]
gallium: Install DRI drivers into lib/gallium
Jakob Bornecrantz [Tue, 10 Feb 2009 15:23:02 +0000 (16:23 +0100)]
gallium: Introduce new subdirs build variables
(based on gallium-xorg-driver/commit
270ce504052d415870a25ab59818b2309eb8ac13)
Jakob Bornecrantz [Tue, 10 Feb 2009 13:14:28 +0000 (14:14 +0100)]
Revert "cell: update linux-cell config"
This reverts commit
22c6c1eaad49692416f45bcbbcdc6424aea2da7c.
Need to revert this since we reverted commited this depended on.
Jakob Bornecrantz [Tue, 10 Feb 2009 12:59:35 +0000 (13:59 +0100)]
Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
This reverts commit
abbe96cb6e7581a52652030e40442b943a482840.
It only reverts parts of the commit the other parts where related to
libmesagallium changes.
Michal Krol [Tue, 10 Feb 2009 14:18:32 +0000 (15:18 +0100)]
nv40: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:18:19 +0000 (15:18 +0100)]
nv30: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:18:03 +0000 (15:18 +0100)]
nv20: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:17:41 +0000 (15:17 +0100)]
brw: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:17:17 +0000 (15:17 +0100)]
i915: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:16:35 +0000 (15:16 +0100)]
gallivm: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:16:00 +0000 (15:16 +0100)]
draw: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:14:31 +0000 (15:14 +0100)]
tgsi: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:12:34 +0000 (15:12 +0100)]
gallium: Rename Size member of TGSI token to NrTokens.
Driver writers often got confused and assumed Size to be
the number of immediate values in Immediate declaration.
Keith Whitwell [Tue, 10 Feb 2009 14:03:43 +0000 (14:03 +0000)]
vmw/icd: remove bogus current_context value
José Fonseca [Tue, 10 Feb 2009 13:40:00 +0000 (13:40 +0000)]
mesa: Compare formats using nominal bytes per pixel.
This is a temporary fix which works for the formats we care so far. The
real fix would be abandon the concept "nominal bytes per pixel" entirely
in Mesa, and use macropixels instead, as done in gallium interfaces
already.
Michel Dänzer [Tue, 10 Feb 2009 12:47:49 +0000 (13:47 +0100)]
gallium: Fixups for driCreateConfigs MSAA support.
Add the MSAA samples array or make sure its contents are initialized.
José Fonseca [Tue, 10 Feb 2009 11:50:54 +0000 (11:50 +0000)]
wgl: Fix null pointer reference.
José Fonseca [Tue, 10 Feb 2009 11:37:23 +0000 (11:37 +0000)]
stw: Hack for applications which use wglSetPixelFormat instead of SetPixelFormat.
José Fonseca [Tue, 10 Feb 2009 11:36:48 +0000 (11:36 +0000)]
glut: Use the official WGL functions.
Especially using wglGetPixelFormat instead of GetPixelFormat causes
problems with opengl32.dll and drivers that not hack around this issue.
José Fonseca [Tue, 10 Feb 2009 11:35:26 +0000 (11:35 +0000)]
glut: DESCRIPTION .def clause deprecated.
José Fonseca [Mon, 9 Feb 2009 21:08:49 +0000 (21:08 +0000)]
wgl: s/0x%p/%p/g
Rather not have 0x prefix, than 0x0x in certain platforms.
Brian [Sat, 7 Feb 2009 23:10:21 +0000 (16:10 -0700)]
demos: remove OSMESA stuff from Makefile
Benjamin Close [Tue, 10 Feb 2009 01:24:27 +0000 (11:54 +1030)]
autogen: Make sure MAKEFLAGS is not set before running autoreconf
Without this the "w" flag may be set which causes the version
to be incorrectly to be obtains in configure.ac causing configure
to fail miserably
Brian Paul [Mon, 9 Feb 2009 22:41:06 +0000 (15:41 -0700)]
mesa: add x86/rtasm/x86sse.c to fix linux-x86 build
Roland Scheidegger [Mon, 9 Feb 2009 22:10:16 +0000 (23:10 +0100)]
mesa: fixes for srgb formats
swizzling in fetch/store srgba/sargb functions fixed (consistent with
equivalent non-srgb formats now).
Roland Scheidegger [Mon, 9 Feb 2009 16:57:22 +0000 (17:57 +0100)]
fix _mesa_get_teximage for srgb textures
Brian Paul [Mon, 9 Feb 2009 20:58:32 +0000 (13:58 -0700)]
mesa: avoid setting texObj->_Complete = GL_FALSE when there's no state change
Avoid a little bit of unneeded state validation and fixes a bug where the
texture complete flags was set to false, but we didn't signal _NEW_TEXTURE.
Fixes piglit tex1d-2dborder failure.
Brian Paul [Mon, 9 Feb 2009 20:50:36 +0000 (13:50 -0700)]
mesa: add no-change testing for a few more texture parameters
Brian Paul [Mon, 9 Feb 2009 19:43:09 +0000 (12:43 -0700)]
swrast: use ASSIGN_4V() macro
Brian Paul [Mon, 9 Feb 2009 15:31:28 +0000 (08:31 -0700)]
mesa: replace _mesa_unreference_framebuffer() with _mesa_reference_framebuffer()
Brian Paul [Mon, 9 Feb 2009 15:30:55 +0000 (08:30 -0700)]
mesa: replace _mesa_unreference_framebuffer() with _mesa_reference_framebuffer()
Brian Paul [Mon, 9 Feb 2009 19:12:09 +0000 (12:12 -0700)]
i965: need to disable current shader, if any, in intel_clear_tris()
Fixes bad background in all the progs/glsl/ tests.
Brian Paul [Mon, 9 Feb 2009 18:16:20 +0000 (11:16 -0700)]
re-add MSAA support
(cherry picked from commit
f7d80aa00611917bc8ce637136d982b151b8f44f)
This also involved adding the new MSAA fields to driCreateConfigs().
Also, re-add prog_instructions->Sampler field for i965 driver. Will
have to revisit that.
José Fonseca [Mon, 9 Feb 2009 18:11:05 +0000 (18:11 +0000)]
indices: Fix typo.
Brian Paul [Mon, 9 Feb 2009 17:42:34 +0000 (10:42 -0700)]
cell: update linux-cell config
Brian Paul [Mon, 9 Feb 2009 17:37:38 +0000 (10:37 -0700)]
mesa: build/use libmesagallium.a for gallium builds
This contains the core mesa code but excludes things not needed for gallium
such as tnl/, swrast/, swrast_setup/, etc.
Brian Paul [Mon, 9 Feb 2009 17:17:58 +0000 (10:17 -0700)]
mesa: added new linux-gallium and linux-gallium-debug configs
Also, remove gallium-related things from configs/default. They're in
linux-gallium now.
So the default builds are the same as they have been for Mesa/master.
Brian Paul [Mon, 9 Feb 2009 17:12:11 +0000 (10:12 -0700)]
softpipe: add null ptr check in softpipe_map_constant_buffers()
Fixes segfault regression in progs/glsl/identity.c
Brian Paul [Mon, 9 Feb 2009 16:54:52 +0000 (09:54 -0700)]
mesa: prefix #includes with main/
Brian Paul [Mon, 9 Feb 2009 16:54:33 +0000 (09:54 -0700)]
swrast: fix typo: s/drapix/drawpix/
Brian Paul [Mon, 9 Feb 2009 16:53:58 +0000 (09:53 -0700)]
mesa: remove old 'sources' file in favor of 'sources.mak'
Brian Paul [Mon, 9 Feb 2009 16:22:22 +0000 (09:22 -0700)]
mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
Siddhartha Chaudhuri [Mon, 9 Feb 2009 14:58:38 +0000 (07:58 -0700)]
mesa: autoconf fixes for OS X
See bug report 17566.
Brian Paul [Mon, 9 Feb 2009 14:55:08 +0000 (07:55 -0700)]
mesa: rework _mesa_reference_framebuffer() to look like _mesa_reference_renderbuffer()
_mesa_unreference_framebuffer() is deprecated since _mesa_reference_framebuffer(ptr, NULL)
can be used instead.
Patrice Mandin [Sun, 8 Feb 2009 16:03:47 +0000 (17:03 +0100)]
nouveau: include and calc offset before changing dimensions for next level
Patrice Mandin [Sun, 8 Feb 2009 15:42:56 +0000 (16:42 +0100)]
nouveau: upload and swizzle each mipmap level in turn
Corbin Simpson [Sun, 8 Feb 2009 10:03:29 +0000 (02:03 -0800)]
r300: Accidentally removed a pipe_buffer_reference that should be there.
Corbin Simpson [Sun, 8 Feb 2009 09:07:03 +0000 (01:07 -0800)]
r300: Add SW TCL paths for clear.
This should make things work for people on RSxxx chipsets.
Corbin Simpson [Sun, 8 Feb 2009 09:01:26 +0000 (01:01 -0800)]
r300: Update to match pipe_surface changes.
Brian Paul [Sat, 7 Feb 2009 20:05:38 +0000 (13:05 -0700)]
cell: remove unused var
Brian Paul [Sat, 7 Feb 2009 20:04:53 +0000 (13:04 -0700)]
cell: compile fix: many updates to cell texture code for new surface mapping
The Cell texture code really needs a thorough inspection and clean-up someday...
Brian Paul [Sat, 7 Feb 2009 20:03:24 +0000 (13:03 -0700)]
softpipe: simplify an assertion
Brian Paul [Sat, 7 Feb 2009 20:02:27 +0000 (13:02 -0700)]
cell: compile fix: no-op xlib_create_brw_screen() for Cell build
Brian Paul [Sat, 7 Feb 2009 20:01:53 +0000 (13:01 -0700)]
cell: compile fix: alpha.ref is now alpha.ref_value
Brian Paul [Sat, 7 Feb 2009 20:01:02 +0000 (13:01 -0700)]
cell: compile fix: pipe_constant_buffer no longer has size field
Brian Paul [Sat, 7 Feb 2009 19:59:40 +0000 (12:59 -0700)]
cell: compile fix: pipe_constant_buffer no longer has size field
Brian Paul [Sat, 7 Feb 2009 18:50:24 +0000 (11:50 -0700)]
mesa: minor fixes to incomplete texture debug code
Brian Paul [Sat, 7 Feb 2009 18:49:52 +0000 (11:49 -0700)]
mesa: debug code for printing info about textures, writing teximages to disk
Brian Paul [Sat, 7 Feb 2009 18:40:20 +0000 (11:40 -0700)]
mesa: code refactoring: move texcombine code into update_tex_combine()
Brian Paul [Sat, 7 Feb 2009 18:21:44 +0000 (11:21 -0700)]
mesa: minor clean-ups, remove unneeded conditional
Brian Paul [Sat, 7 Feb 2009 18:20:08 +0000 (11:20 -0700)]
mesa: fix logic error in computing enableBits in update_texture_state()
If we had a vertex shader but no fragment shader (i.e. fixed function) we
didn't get the right enabled texture targets.
Fixes blank/white texture problem.
Younes Manton [Sat, 7 Feb 2009 17:53:30 +0000 (12:53 -0500)]
nouveau: Need to surface_copy() without a pipe context.
Corbin Simpson [Fri, 6 Feb 2009 22:06:39 +0000 (14:06 -0800)]
Merge branch 'gallium-0.2' of git://anongit.freedesktop.org/mesa/mesa into gallium-0.2
Corbin Simpson [Fri, 6 Feb 2009 21:36:31 +0000 (13:36 -0800)]
Readd trace to list of default pipe drivers.
Looks like the gallium-0.2-radeon merge clobbered it.
Corbin Simpson [Fri, 6 Feb 2009 21:34:04 +0000 (13:34 -0800)]
Merge branch 'gallium-0.2-radeon' into gallium-0.2
Corbin Simpson [Fri, 6 Feb 2009 21:28:15 +0000 (13:28 -0800)]
Rename winsys amd to radeon.
Corbin Simpson [Fri, 6 Feb 2009 21:27:51 +0000 (13:27 -0800)]
Remove r300 from default build.
Younes Manton [Fri, 6 Feb 2009 19:37:35 +0000 (14:37 -0500)]
g3dvl: Catch up to gallium changes, fix build.
Younes Manton [Fri, 6 Feb 2009 19:36:56 +0000 (14:36 -0500)]
nouveau: Pass proper format to NV04_GDI_RECTANGLE_TEXT.
Younes Manton [Fri, 6 Feb 2009 19:33:49 +0000 (14:33 -0500)]
nouveau: Frontbuffer pitch needs to be set.
Brian Paul [Fri, 6 Feb 2009 17:48:38 +0000 (10:48 -0700)]
mesa: fix tnl->render_inputs_bitset setup for fragment program texcoords
Handle the case where there's no per-vertex texcoords but the fragment shader
needs texcoords.
Fixes piglit shaders/fp-generic/dph test.
Brian Paul [Fri, 6 Feb 2009 17:47:31 +0000 (10:47 -0700)]
swrast: return (0,0,0,1) when sampling incomplete textures, not (0,0,0,0)
Fixes piglit shaders/fp-incomplete-tex test.
Brian Paul [Fri, 6 Feb 2009 17:21:36 +0000 (10:21 -0700)]
glsl: new MESA_GLSL env var for GLSL debugging features
Replaces the VERBOSE_GLSL, VERBOSE_GLSL_DUMP flags which only worked in debug
builds. MESA_GLSL will work both in debug and non-debug builds.
Also add facility to dump glUniform() calls to stdout.