Luca Barbieri [Sun, 21 Feb 2010 10:33:15 +0000 (11:33 +0100)]
nv30, nv40: non-trivially unify nv[34]0_state_emit.c
The files are the same except for swtnl support on nv40 and for
texture cache flushing on nv40.
Unify them, and use a macro to define 4 versions of render_states,
for all combinations of nvfx and hwtnl/swtnl.
Luca Barbieri [Sat, 20 Feb 2010 19:07:10 +0000 (20:07 +0100)]
nv30, nv40: unify identical nv[34]0_transfer.c
Luca Barbieri [Sat, 20 Feb 2010 19:04:54 +0000 (20:04 +0100)]
nv30, nv40: unify identical nv[34]0_clear.c
Luca Barbieri [Sat, 20 Feb 2010 18:52:22 +0000 (19:52 +0100)]
nvfx: add nvfx directory to build system
Will be used to hold source files unified between nv30 and nv40.
Eventually all nv30 and nv40 code will be moved there and the
nv30 and nv40 directories will be removed.
Luca Barbieri [Sun, 21 Feb 2010 12:40:49 +0000 (13:40 +0100)]
nv30, nv40: add is_nv4x member to context and screen structs
This will make it faster to check for nv40.
Luca Barbieri [Sat, 20 Feb 2010 17:37:43 +0000 (18:37 +0100)]
nv30, nv40: unify all structures and headers, except shaders
This patch unifies nv[34]0_screen.h, nv[34]0_context.h and
nv[34]0_state.h
The unified files are put in a new "nvfx" directory.
nv30_context.h and nv40_context.h still exist to hold the function
prototypes and include nvfx_context.h
nv[34]0_screen.h and nv[34]0_state.h are deleted, replaced by the
unified versions.
nv40 includes some extra fields for swtnl and user clip planes
support.
These fields will be unused on nv30 until that functionality gets
added to it too (by unification with nv40).
Luca Barbieri [Sat, 20 Feb 2010 17:34:00 +0000 (18:34 +0100)]
nouveau: s/rankine/eng3d/g; s/curie/eng3d/g
Result of running:
perl -i -p -e 's/rankine/eng3d/g; s/curie/eng3d/g;' nv[34]0/*.[ch]
This will allow to more easily unify nv30 and nv40.
Luca Barbieri [Sat, 20 Feb 2010 17:18:48 +0000 (18:18 +0100)]
nv30: remove unused on_hw field and constant fp_reg_control field
This makes nv30_state.h equivalent to nv40_state.h
Luca Barbieri [Sat, 20 Feb 2010 16:43:31 +0000 (17:43 +0100)]
nv40: use NV34TCL_ constants where available
It was decided to just use the NV34TCL_ constants for constants
common between nv30 and nv40, and deprecate the NV40TCL_ versions.
This patch changes the nv40 driver to use NV34TCL_ constants for
common functionality.
This reduces differences between nv30 and nv40 to ease further
unification.
Vinson Lee [Sun, 14 Mar 2010 23:43:01 +0000 (16:43 -0700)]
r300g: Remove unnecessary headers.
George Sapountzis [Sun, 14 Mar 2010 09:36:47 +0000 (11:36 +0200)]
dri/common: mv __driUtilMessage to utils.c
allows to link with xmlconfig without dri_util, and has nothing drm-specific.
George Sapountzis [Sun, 14 Mar 2010 09:36:46 +0000 (11:36 +0200)]
dri/swrast: add comment in case it's not clear
George Sapountzis [Sun, 14 Mar 2010 09:36:46 +0000 (11:36 +0200)]
dri/swrast: drop mtypes.h from dri_sw
George Sapountzis [Sun, 14 Mar 2010 09:36:46 +0000 (11:36 +0200)]
dri/swrast: update copyright email
George Sapountzis [Sun, 14 Mar 2010 09:36:46 +0000 (11:36 +0200)]
dri/swrast: port to dri_sw (drawable)
George Sapountzis [Sun, 14 Mar 2010 09:36:45 +0000 (11:36 +0200)]
dri/swrast: port to dri_sw (context)
George Sapountzis [Sun, 14 Mar 2010 09:36:45 +0000 (11:36 +0200)]
dri/swrast: port to dri_sw
George Sapountzis [Sun, 14 Mar 2010 09:36:45 +0000 (11:36 +0200)]
dri: add dri_sw.c helper
This is dri_util.c stripped from the drm-specific bits and will be used for
both classic and gallium swrast_dri.so
Vinson Lee [Sun, 14 Mar 2010 22:47:05 +0000 (15:47 -0700)]
trace: Remove unnecessary headers.
Vinson Lee [Sun, 14 Mar 2010 22:38:04 +0000 (15:38 -0700)]
svga: Remove unnecessary header.
George Sapountzis [Thu, 11 Mar 2010 16:04:03 +0000 (18:04 +0200)]
glapi: exec_malloc for dispatch stubs
George Sapountzis [Thu, 11 Mar 2010 16:04:03 +0000 (18:04 +0200)]
glapi: this one should be by THREAD
George Sapountzis [Thu, 11 Mar 2010 16:04:03 +0000 (18:04 +0200)]
glapi: more organize code by arch
It seems that x86-64 with tls will fail to compile or load due to a missining
gl_dispatch_functions_start symbol. Not changing though, since this is how it
used to be and cannot test.
George Sapountzis [Thu, 11 Mar 2010 16:04:02 +0000 (18:04 +0200)]
glapi: organize arch-specific code by arch (2)
George Sapountzis [Thu, 11 Mar 2010 16:04:02 +0000 (18:04 +0200)]
glapi: organize arch-specific code by arch
Marek Olšák [Sun, 14 Mar 2010 13:32:50 +0000 (14:32 +0100)]
r300g: remove pipe_context from r300_screen
Vinson Lee [Sun, 14 Mar 2010 02:05:39 +0000 (18:05 -0800)]
softpipe: Remove unnecessary header.
Dan Nicholson [Sat, 13 Mar 2010 19:56:59 +0000 (11:56 -0800)]
gallium: Respect user's CFLAGS for including X headers
This can break on systems that don't have a system X installation.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Jeff Smith [Sat, 13 Mar 2010 00:55:09 +0000 (18:55 -0600)]
Use X_LIBS from pkg-config, instead of libdir, for locating libX11
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
José Fonseca [Sat, 13 Mar 2010 19:11:08 +0000 (19:11 +0000)]
llvmpipe: Switch to PIPE_TEX_MIPFILTER_NONE when texture has no mipmaps.
Marek Olšák [Sat, 13 Mar 2010 16:38:43 +0000 (17:38 +0100)]
r300g: add high quality anisotropic filtering for R5xx (disabled by default)
Oh look, an undocumented feature. It's a nice tool for benchmarking
texturing.
Marek Olšák [Sat, 13 Mar 2010 15:24:50 +0000 (16:24 +0100)]
r300g: fix anisotropic filtering, fix macrotiling
Two bug fixes at the same time. :)
Marek Olšák [Sat, 13 Mar 2010 05:07:33 +0000 (06:07 +0100)]
r300g: refrain from using immediate mode if it causes slowdown
E.g. when mapping buffers could flush CS or cause waiting
for a busy buffer.
The side effect of this is it also fixes progs/demos/arbocclude however
a separate fix should be proposed to address this issue in other cases
it might occur.
Marek Olšák [Sat, 13 Mar 2010 03:43:46 +0000 (04:43 +0100)]
r300g: fix up function names
Maciej Cencora [Sat, 13 Mar 2010 16:33:48 +0000 (17:33 +0100)]
radeon: add some debuging info for glCopyTex(Sub)Image
Maciej Cencora [Sat, 13 Mar 2010 16:28:33 +0000 (17:28 +0100)]
r300: blits for small dst pitch work just fine
Maciej Cencora [Sat, 13 Mar 2010 16:27:51 +0000 (17:27 +0100)]
radeon: fix gl format to mesa format mapping and add GL_BGRA formats
Maciej Cencora [Sat, 13 Mar 2010 15:46:19 +0000 (16:46 +0100)]
radeon: fix glCopyTex(Sub)Image
Fallback to swrast for software renderbuffers
José Fonseca [Sat, 13 Mar 2010 16:13:26 +0000 (16:13 +0000)]
llvmpipe: Ensure the context is flushed before modifying textures.
José Fonseca [Sat, 13 Mar 2010 16:04:06 +0000 (16:04 +0000)]
llvmpipe: Don't use texture transfer internally.
Now that transfers are context objects their sideeffects must happen in
order when used by the state tracker, but that synchronization must be
bypassed when used inside the driver, or it would cause infinite
recursion.
José Fonseca [Sat, 13 Mar 2010 11:22:39 +0000 (11:22 +0000)]
llvmpipe: Obey rasterization rules.
Replicates softpipe.
José Fonseca [Sat, 13 Mar 2010 10:45:52 +0000 (10:45 +0000)]
llvmpipe: setup_context -> lp_setup_context
Otherwise IDEs and debuggers have trouble distinguishing from softpipe's
setup_context.
Xavier Chantry [Sat, 13 Mar 2010 10:33:27 +0000 (11:33 +0100)]
nv50: fixup after gallium-context-transfers merge
José Fonseca [Fri, 12 Mar 2010 13:12:15 +0000 (13:12 +0000)]
python: Temporarily disable python state tracker until transfers are done by contexts
It requires changes not ony to the state tracker but to the python
scripts too.
Chia-I Wu [Fri, 12 Mar 2010 16:48:23 +0000 (00:48 +0800)]
st/egl: Cache the pipe surface used in flush_frontbuffer.
It is very likely that the same surface will be flushed again and again.
Caching the surface should reduce the overhead of surface creation.
Alan Coopersmith [Sat, 13 Mar 2010 03:03:41 +0000 (19:03 -0800)]
mklib: Fix amd64 builds on Solaris when using Sun compilers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Corbin Simpson [Sat, 13 Mar 2010 02:13:18 +0000 (18:13 -0800)]
r300g: Forcibly sanitize max index.
Not perfect, but the kernel should shut up now.
Corbin Simpson [Sat, 13 Mar 2010 01:58:59 +0000 (17:58 -0800)]
Revert "st/mesa: Always recalculate invalid index bounds."
This reverts commit
50876ddaaff72a324ac45e255985e0f84e108594.
Per ML discussion.
Brian Paul [Fri, 12 Mar 2010 23:54:55 +0000 (16:54 -0700)]
gallivm: cube map sampling works now
Brian Paul [Fri, 12 Mar 2010 23:53:51 +0000 (16:53 -0700)]
gallivm: fix bugs in nested if/then/else codegen
Quite a bit a hair pulling was involved...
Brian Paul [Fri, 12 Mar 2010 21:24:03 +0000 (14:24 -0700)]
gallivm: support non-vector float in lp_build_sgn()
Eric Anholt [Fri, 12 Mar 2010 23:10:22 +0000 (15:10 -0800)]
i965: Clarify the roles of emit_pixel_xy(), emit_delta_xy(), emit_wpos_xy().
Eric Anholt [Thu, 11 Mar 2010 02:48:23 +0000 (18:48 -0800)]
i965: Clarify that DELTAXY always occurs for both X and Y.
Eric Anholt [Thu, 11 Mar 2010 01:38:33 +0000 (17:38 -0800)]
i965: Do FS SLT, SGT, and friends using CMP, SEL instead of CMP, MOV, MOV.
Eric Anholt [Thu, 11 Mar 2010 01:35:02 +0000 (17:35 -0800)]
i965: Do VS SGT, SLT, and friends using CMP, SEL instead of CMP, MOV, MOV.
Eric Anholt [Thu, 11 Mar 2010 01:16:39 +0000 (17:16 -0800)]
i965: Fix up VS DP4 sequences to avoid dependency control.
This is recommended by the B-Spec. I wasn't able to measure any
difference in ETQW.
Eric Anholt [Wed, 10 Mar 2010 23:44:32 +0000 (15:44 -0800)]
i965: When doing a swizzled kill pixel, don't do redundant channel compares.
This was obvious when looking at the compiled output of ETQW's
shaders.
Eric Anholt [Wed, 10 Mar 2010 23:32:05 +0000 (15:32 -0800)]
i965: Use the SEL instruction to implement MIN and MAX.
Saves an instruction over doing conditional moves.
Michel Dänzer [Fri, 12 Mar 2010 18:52:24 +0000 (19:52 +0100)]
svga: Fix up for context transfers.
Michel Dänzer [Fri, 12 Mar 2010 18:52:24 +0000 (19:52 +0100)]
st/xorg: Remove flushes no longer necessary thanks to context transfers.
Alan Coopersmith [Fri, 12 Mar 2010 18:27:03 +0000 (10:27 -0800)]
glx/single2.c: Don't call __builtin_expect on non-gnu compilers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Michel Dänzer [Fri, 12 Mar 2010 18:00:47 +0000 (19:00 +0100)]
Merge branch '7.8'
Michel Dänzer [Fri, 12 Mar 2010 17:54:23 +0000 (18:54 +0100)]
vmwgfx/dri: Fix SCons build.
Michel Dänzer [Fri, 12 Mar 2010 17:24:34 +0000 (18:24 +0100)]
st/dri: Always try to set up R5G6B5 configs.
Allows compiz to work in depth 16.
The DRI2 getBuffersWithFormat hook is only required for 16/32 bit depth
buffers, for colour buffers the only requirement is that the format matches
the drawable depth, which we can't check here.
(cherry picked from commit
c50477c255a34444720fb944c54373462ef39fb9)
Alex Deucher [Fri, 12 Mar 2010 16:16:50 +0000 (11:16 -0500)]
r100/r200/r300/r300: only enable accelerated pixel ops with kms
fixes fdo bug 27043
Luc Verhaegen [Fri, 12 Mar 2010 07:35:22 +0000 (08:35 +0100)]
dri/r700: include shader/programopt.h instead of programopt.c.
Signed-off-by: Brian Paul <brianp@vmware.com>
Jeff Smith [Fri, 12 Mar 2010 02:19:49 +0000 (20:19 -0600)]
Add programs to .gitignore in redbook
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Jeff Smith [Fri, 2 Mar 2007 06:14:48 +0000 (00:14 -0600)]
Add programs to .gitignore in xdemos
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Jeff Smith [Tue, 9 Mar 2010 18:40:44 +0000 (12:40 -0600)]
Add -L$(libdir) for xdemos and egl so that the right libX11 is found
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Jeff Smith [Fri, 13 Jun 2008 14:50:43 +0000 (09:50 -0500)]
Grammar and spelling fixes
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Keith Whitwell [Fri, 12 Mar 2010 12:13:32 +0000 (12:13 +0000)]
st/xorg: context transfers
Marek Olšák [Tue, 9 Mar 2010 01:55:42 +0000 (01:55 +0000)]
gallium: fix BGRA vertex color swizzles
The mapping for vertex_array_bgra:
(gl -> st -> translate)
GL_RGBA -> PIPE_FORMAT_R8G8B8A8 (RGBA) -> no swizzle (XYZW)
GL_BGRA -> PIPE_FORMAT_A8R8G8B8 (ARGB) -> ZYXW (BGRA again??)
Iẗ́'s pretty clear that PIPE_FORMAT_A8R8G8B8 here is wrong. This commit
fixes the pipe format and removes obvious workarounds in util/translate.
Tested with: softpipe, llvmpipe, r300g.
Signed-off-by: José Fonseca <jfonseca@vmware.com>
Corbin Simpson [Fri, 12 Mar 2010 10:51:40 +0000 (02:51 -0800)]
st/mesa: Always recalculate invalid index bounds.
These should always be sanitized before heading towards the pipe driver,
and if the calling function explicitly marked them as invalid, we need
to regenerate them.
Allows r300g to properly pass a bit more of Wine's d3d9 testing without
dropping stuff on the floor.
Corbin Simpson [Fri, 12 Mar 2010 10:51:10 +0000 (02:51 -0800)]
st/mesa: Update debug infos.
Still commented out, of course.
Corbin Simpson [Fri, 12 Mar 2010 10:47:44 +0000 (02:47 -0800)]
r300g: Properly clamp index limits.
Make the kernel even less likely to barf on us.
Keith Whitwell [Fri, 12 Mar 2010 09:08:40 +0000 (09:08 +0000)]
Merge commit 'origin/gallium-context-transfers-2'
Keith Whitwell [Thu, 11 Mar 2010 14:43:00 +0000 (14:43 +0000)]
mesa: fix linux-dri and autogen builds since sw-api-2 merge
Vinson Lee [Fri, 12 Mar 2010 05:55:44 +0000 (21:55 -0800)]
radeon: Fix memory leaks from early return.
Vinson Lee [Fri, 12 Mar 2010 04:52:38 +0000 (20:52 -0800)]
llvmpipe: Remove unnecessary header.
Brian Paul [Thu, 11 Mar 2010 23:26:52 +0000 (16:26 -0700)]
gallivm: checkpoint WIP cubemap code
Brian Paul [Thu, 11 Mar 2010 23:26:12 +0000 (16:26 -0700)]
gallivm: added lp_build_sum_vector()
Brian Paul [Thu, 11 Mar 2010 23:23:36 +0000 (16:23 -0700)]
softpipe: further tighen up sample_cube()
The code can fairly easily be translated to llvm...
Brian Paul [Thu, 11 Mar 2010 22:29:11 +0000 (15:29 -0700)]
softpipe: tighten up the code in sample_cube()
Brian Paul [Thu, 11 Mar 2010 21:51:02 +0000 (14:51 -0700)]
st/mesa: s/BUFFER_FRONT_LEFT/surfIndex/
Brian Paul [Thu, 11 Mar 2010 21:42:26 +0000 (14:42 -0700)]
gallivm: enable 3D texture sampling
Brian Paul [Thu, 11 Mar 2010 21:42:11 +0000 (14:42 -0700)]
progs/demos: added 'f' key to toggle filtering mode in stex3d.c
Brian Paul [Thu, 11 Mar 2010 21:46:06 +0000 (14:46 -0700)]
gallivm/llvmpipe: replace 'int stride' with 'int row_stride[MAX_LEVELS]'
The stride depends on the mipmap level. Rename to row_stride to
distinguish from img_stride for 3D textures.
Fixes incorrect texel addressing in small mipmap levels.
Brian Paul [Thu, 11 Mar 2010 21:03:33 +0000 (14:03 -0700)]
llvmpipe: fix comment typo
Brian Paul [Thu, 11 Mar 2010 20:57:52 +0000 (13:57 -0700)]
gallivm/llvmpipe: include os_llvm.h instead of llvm-c/Core.h
Brian Paul [Thu, 11 Mar 2010 21:00:48 +0000 (14:00 -0700)]
gallium/os: wrapper for llvm-c/Core.h and #define HAVE_LLVM if needed
Brian Paul [Thu, 11 Mar 2010 20:44:39 +0000 (13:44 -0700)]
st/mesa: fix st_set_framebuffer_surface() state validation
Set the _NEW_BUFFERS flag and remove the code which updated the
parent framebuffer size. Normal Mesa state validation will do that.
Fixes issues with Warsow on r300g and possibly other bugs.
Jakob Bornecrantz [Thu, 11 Mar 2010 19:23:15 +0000 (19:23 +0000)]
st/xorg: Fixup configure
Make sure we always test for XEXT version.
Make sure that the user has a recent version of libkms and libdrm installed.
Note that the st/xorg code requires so new versions to work but these are
needed to make a proper vmwgfx_drv.so driver which is the only real user.
Cherry picked from
46cf606cd35d6740b28fd26bd32dbdfdde2c7833
Conflicts:
configure.ac
Alex Deucher [Thu, 11 Mar 2010 18:48:28 +0000 (13:48 -0500)]
r200: support additional blit formats
swizzle in the pixel shader
Brian Paul [Thu, 11 Mar 2010 18:17:15 +0000 (11:17 -0700)]
gallivm: fix some bugs on the 1D texture paths
Roland Scheidegger [Thu, 11 Mar 2010 17:54:14 +0000 (18:54 +0100)]
st/mesa: don't enable extensions which aren't actually supported
don't enable APPLE_client_storage, TDFX_texture_compression_FXT1,
EXT_cull_vertex, NV_vertex_program, NV_vertex_program1_1 -
the latter two might work somewhat with some luck.
Also don't enable ARB_imaging.
Roland Scheidegger [Thu, 11 Mar 2010 17:40:25 +0000 (18:40 +0100)]
cell: adapt to context texture transfers (untested)
Keith Whitwell [Thu, 11 Mar 2010 16:10:25 +0000 (16:10 +0000)]
gallium: remove pipe_context member from pipe_transfer
There was very little use for this beyond permitting the
pipe_context::tex_transfer_destroy() function to omit the pipe_context
argument.
This change adds the pipe_context argument into tex_transfer_destroy()
so that it looks like other pipe_context functions, and removes the
pipe_context pointer from pipe_transfer.
Karl Schultz [Thu, 11 Mar 2010 16:17:05 +0000 (09:17 -0700)]
windows: Add new file to project file.
Brian Paul [Thu, 11 Mar 2010 16:08:58 +0000 (09:08 -0700)]
ARB prog parser: added (float) casts and regenerate files
Brian Paul [Thu, 11 Mar 2010 15:52:03 +0000 (08:52 -0700)]
gallivm: include tgsi_dump.h to silence warning