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.
Brian Paul [Fri, 6 Feb 2009 17:20:33 +0000 (10:20 -0700)]
mesa: tweak output of _mesa_write_shader_to_file()
Enclose GPU code in comments to the file can be re-fed back into GLSL compiler.
Brian Paul [Fri, 6 Feb 2009 17:00:34 +0000 (10:00 -0700)]
Revert "mesa: meaningless whitespace change to see if git's working (ignore)"
This reverts commit
b2e779988eeb595187933fe2122d86f8ccfe059c.
I didn't mean to push this stuff yet. I'm having a bad git day...
Brian Paul [Fri, 6 Feb 2009 16:57:28 +0000 (09:57 -0700)]
mesa: meaningless whitespace change to see if git's working (ignore)
Dave Airlie [Fri, 6 Feb 2009 14:18:34 +0000 (00:18 +1000)]
radeon: remove include that breaks build in !OLD_PACKET path
this path isn't enabled by default in any case.
Corbin Simpson [Fri, 6 Feb 2009 09:59:26 +0000 (01:59 -0800)]
r300: Clean up CS counting.
Joakim Sindholt [Thu, 5 Feb 2009 21:23:40 +0000 (22:23 +0100)]
r300: working trivial/clear for r5xx
Corbin Simpson [Thu, 5 Feb 2009 21:27:07 +0000 (13:27 -0800)]
r300: Add framebuffer setup stub.
Pekka Paalanen [Thu, 5 Feb 2009 18:12:04 +0000 (20:12 +0200)]
nv20: copy miptree flags from nv40
nv20_miptree_create() should set various flags.
Copy stuff over from nv40.
trivial/tri does not abort on nv04 swizzled copy anymore.
I still miss my triangle.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Thu, 5 Feb 2009 17:45:33 +0000 (19:45 +0200)]
nv04-nv40: fix nv##_surface_copy() for flipped
If do_flipp is true, it would first do the proper copy, height would
wrap around to unsigned maximum, and then it attempts to do another
copy.
Return after doing the proper copy.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Thu, 5 Feb 2009 17:43:36 +0000 (19:43 +0200)]
nv04: fix pasto in nv04_surface_2d_init()
Wrong hardware object being used, when compared with earlier code.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Keith Whitwell [Thu, 5 Feb 2009 16:04:13 +0000 (16:04 +0000)]
indices: quad fixes
Keith Whitwell [Thu, 5 Feb 2009 14:44:17 +0000 (14:44 +0000)]
gallium: add new aux lib for index list translations
Could this be the ultimate index list translating utility? Maybe, but it
doesn't yet include support for splitting primitives.
Unlike previous attempts, this captures all possible combinations of API
and hardware provoking vertex, supports generated list reuse and various
other tricks. Relies on python-generated code.
Brian Paul [Thu, 5 Feb 2009 15:41:27 +0000 (08:41 -0700)]
mesa: remove oddball linux-directfb-install makefile rule
It's probably not needed since the 'make install' rules were overhauled last year.
Brian Paul [Thu, 5 Feb 2009 15:39:10 +0000 (08:39 -0700)]
mesa: minor Makefile improvement for versioning
Brian Paul [Thu, 5 Feb 2009 15:23:00 +0000 (08:23 -0700)]
gallium: fixup #includes: p_screen.h does not need anything in p_state.h
Brian Paul [Thu, 5 Feb 2009 15:16:56 +0000 (08:16 -0700)]
gallium: move 'struct pipe_winsys'
Not used in p_state.h but used in p_context.h and p_screen.h
Ben Skeggs [Thu, 5 Feb 2009 08:40:38 +0000 (18:40 +1000)]
nv50: stop using nouveau_push.h, it's evil
Ben Skeggs [Thu, 5 Feb 2009 08:19:32 +0000 (18:19 +1000)]
nv04-nv40: move 2d blit/fill code into pipe driver
Ben Skeggs [Thu, 5 Feb 2009 04:04:45 +0000 (14:04 +1000)]
nv50: move 2d blit/fill code into pipe driver
Ben Skeggs [Thu, 5 Feb 2009 03:17:12 +0000 (13:17 +1000)]
nouveau: support getting "native" bo from winsys
Brian Paul [Thu, 5 Feb 2009 00:40:51 +0000 (17:40 -0700)]
glsl: use _slang_var_swizzle() in a few places to simplify the code.
Brian Paul [Thu, 5 Feb 2009 00:37:20 +0000 (17:37 -0700)]
glsl: remove unused prototype
Brian Paul [Thu, 5 Feb 2009 00:32:07 +0000 (17:32 -0700)]
glsl: replace assertion with conditional in _slang_pop_var_table()
We were hitting the assertion when we ran out of registers, which can happen.
Also, add some additional assertions and freshen up some comments.
Corbin Simpson [Thu, 5 Feb 2009 00:07:39 +0000 (16:07 -0800)]
r300: Add shader state stubs.
Brian Paul [Wed, 4 Feb 2009 21:22:12 +0000 (14:22 -0700)]
mesa: more info in error messages
Brian Paul [Wed, 4 Feb 2009 17:45:04 +0000 (10:45 -0700)]
swrast: add minor comments
Brian Paul [Wed, 4 Feb 2009 15:43:11 +0000 (08:43 -0700)]
Revert "docs: document new MESA_GLX_FORCE_DIRECT env var for the Xlib driver"
This reverts commit
2f51be75c55f69dc3e09036d6fd12f808f5a5028.
Brian Paul [Wed, 4 Feb 2009 15:42:30 +0000 (08:42 -0700)]
mesa: make Xlib glXIsDirect() always return True
Brian Paul [Wed, 4 Feb 2009 15:38:43 +0000 (08:38 -0700)]
demos: remove unused function
Brian Paul [Wed, 4 Feb 2009 15:38:28 +0000 (08:38 -0700)]
demos: silence uninitialized var warning
Brian Paul [Tue, 3 Feb 2009 23:33:12 +0000 (16:33 -0700)]
mesa: minor error msg improvement
Chris Wilson [Wed, 4 Feb 2009 20:59:22 +0000 (20:59 +0000)]
intel: Decode MI operands using specific length masks
The MI opcodes have different variable length masks, so use an operand
specific mask to decode the length.
Chris Wilson [Wed, 4 Feb 2009 20:25:08 +0000 (20:25 +0000)]
intel: Correct decoding of 3DSTATE_PIXEL_SHADER_CONSTANTS
A couple of minor typos that proclaimed an error in the wrong command, and
failed to offset the mask.
Eric Anholt [Wed, 4 Feb 2009 18:27:13 +0000 (10:27 -0800)]
intel: Fix fbo_firecube regression with FBconfigs change.
By selecting a 4444 texture format due to a bad test, we hit the
intel_update_wrapper error path, and despite the appearance of error handling
in it and its callers, the desired behavior (software fallback) doesn't occur.
Maciej Cencora [Wed, 4 Feb 2009 12:26:09 +0000 (13:26 +0100)]
r300: make the macros safe. add missing parenthesis.
Maciej Cencora [Sat, 24 Jan 2009 13:58:17 +0000 (14:58 +0100)]
r300: Fix EXP2 fog
Ben Skeggs [Wed, 4 Feb 2009 11:08:41 +0000 (21:08 +1000)]
nouveau: notifier timeout is a float now
Ben Skeggs [Wed, 4 Feb 2009 10:59:49 +0000 (20:59 +1000)]
nouveau: get things building/running again after pipe_surface.buffer removal
Don't look at nouveau_winsys_pipe.h... I promise it's temporary!
Ben Skeggs [Wed, 4 Feb 2009 04:55:13 +0000 (14:55 +1000)]
nouveau: link against libdrm_nouveau (installed with libdrm)
Corbin Simpson [Wed, 4 Feb 2009 08:50:38 +0000 (00:50 -0800)]
r300: A bit more cleanup and state handling.
Corbin Simpson [Wed, 4 Feb 2009 06:55:30 +0000 (22:55 -0800)]
r300: Moar swtcl emit. Still sucks, but getting there.
Eric Anholt [Wed, 4 Feb 2009 04:04:24 +0000 (20:04 -0800)]
intel: Fix commented-out glViewport in intel_meta_set_passthrough_transform.
Too much commit -a while debugging.
Eric Anholt [Wed, 4 Feb 2009 03:29:11 +0000 (19:29 -0800)]
swrast: Add support for x8r8g8b8 fbconfig.
This lets swrast produce an fbconfig suitable for the root visual now that
the server's not allowing mismatched fbconfigs.
Brian Paul [Tue, 3 Feb 2009 17:13:22 +0000 (10:13 -0700)]
docs: document new MESA_GLX_FORCE_DIRECT env var for the Xlib driver
Brian Paul [Tue, 3 Feb 2009 17:12:51 +0000 (10:12 -0700)]
xlib: use MESA_GLX_FORCE_DIRECT to make glXIsDirect() always return True
Some apps won't run w/ indirect rendering contexts.
Also, consolidate some context-init code in new init_glx_context() function.
Brian Paul [Tue, 3 Feb 2009 16:21:32 +0000 (09:21 -0700)]
mesa: simplify delete_wrapper()
Brian Paul [Tue, 3 Feb 2009 22:17:26 +0000 (15:17 -0700)]
demos: modify bufferobj.c to exercise interleaved vertex arrays
Also, put colors before vertex positions, and place the data at a 40-byte
offset from the start of the buffer.
Alan Hourihane [Tue, 3 Feb 2009 20:07:42 +0000 (20:07 +0000)]
mesa: fix offset problem with interleaved arrays
Zack Rusin [Tue, 3 Feb 2009 04:54:28 +0000 (23:54 -0500)]
gallium: adjust gdi for the latest changes
Zack Rusin [Tue, 3 Feb 2009 04:47:16 +0000 (23:47 -0500)]
gallium: remove pipe_buffer from surfaces
this change disassociates, at least from the driver perspective,
the surface from buffer. surfaces are technically now views on the
textures so make it so by hiding the buffer in the internals of
textures.
Corbin Simpson [Tue, 3 Feb 2009 04:33:57 +0000 (20:33 -0800)]
r300: Add stubs for swtcl immediate emit.
Joakim Sindholt [Tue, 3 Feb 2009 01:58:51 +0000 (02:58 +0100)]
r300: fix compiler/linker errors
Corbin Simpson [Tue, 3 Feb 2009 00:39:43 +0000 (16:39 -0800)]
r300: Clear up XXX in r300_state.
Corbin Simpson [Tue, 3 Feb 2009 00:13:41 +0000 (16:13 -0800)]
r300: Take care of some XXXes.
Brian Paul [Mon, 2 Feb 2009 23:50:45 +0000 (16:50 -0700)]
demos: update multitex.c GLSL demo to use vertex arrays or glVertex-mode
Press 'a' to toggle drawing mode.
Brian Paul [Mon, 2 Feb 2009 23:47:51 +0000 (16:47 -0700)]
util: added more functions to extfuncs.h
Brian Paul [Mon, 2 Feb 2009 23:33:08 +0000 (16:33 -0700)]
mesa: fix GLSL issue preventing use of all 16 generic vertex attributes
Only 15 actually worked before since we always reserved generic[0] as an
alias for vertex position.
The case of vertex attribute 0 is tricky. The spec says that there is no
aliasing between generic vertex attributes 0..MAX_VERTEX_ATTRIBS-1 and the
conventional attributes. But it also says that calls to glVertexAttrib(0, v)
are equivalent to glVertex(v). The distinction seems to be in glVertex-mode
versus vertex array mode.
So update the VBO code so that if the shader uses generic[0] but not gl_Vertex,
route the attribute data set with glVertex() to go to shader input generic[0].
No change needed for the glDrawArrays/Elements() path.
This is a potentially risky change so regressions are possible. All the usual
tests seem OK though.
Brian Paul [Mon, 2 Feb 2009 23:29:08 +0000 (16:29 -0700)]
glsl: update program->InputsRead when referencing input attributes
This info will be used in the linker for allocating generic vertex attribs.
Brian Paul [Mon, 2 Feb 2009 19:24:58 +0000 (12:24 -0700)]
mesa: fix stand-alone glslcompiler
Brian Paul [Mon, 2 Feb 2009 19:24:41 +0000 (12:24 -0700)]
mesa: make _mesa_fprint_program_opt() non-static
Corbin Simpson [Mon, 2 Feb 2009 23:39:30 +0000 (15:39 -0800)]
r300: Move some registers around.
This fixes r500 hangs.
Eric Anholt [Fri, 30 Jan 2009 22:32:23 +0000 (14:32 -0800)]
i965: Remove brw->attribs now that we can just always look in the GLcontext.
Eric Anholt [Fri, 30 Jan 2009 22:18:03 +0000 (14:18 -0800)]
i965: Delete old metaops code now that there are no remaining consumers.