Commit Graph

32474 Commits

Author SHA1 Message Date
Eric Anholt ba208604ea Revert "i965: Do FS SLT, SGT, and friends using CMP, SEL instead of CMP, MOV, MOV."
This reverts commit 46450c1f3f.  I was
wrong about null reg behavior -- it reads undefined, not 0.  And
they're not kidding.
2010-03-16 13:18:54 -07:00
Eric Anholt 7cbb7051f4 meta: Fix up restoration of state if _mesa_map_pbo_source() fails. 2010-03-16 13:18:54 -07:00
Eric Anholt 541c9c08e5 meta: Properly refcount our saved programs and texobjs.
Found while debugging bug #24119.
2010-03-16 13:18:53 -07:00
Brian Paul 7c45710859 gallium: add target-helpers/wrap_screen.c to C_SOURCES
Was commented out before.
2010-03-16 13:31:46 -06:00
Michal Krol 40c3861e1e st/mesa: Invalidate sampler view when texture object changes. 2010-03-16 19:40:15 +01:00
Roland Scheidegger ac8662c29d st/xorg: fix up xorg state tracker to use cso changes
use cso_set_fragment_sampler_views instead of cso_set_sampler_textures
2010-03-16 16:24:27 +01:00
Brian Paul e1a4bb2370 regenerate gl_mangle.h to get new EGLImage functions 2010-03-16 07:56:56 -06:00
José Fonseca 759c1c287c libgl-xlib: Use a simple GALLIUM_DRIVER env var to select the pipe driver.
GALLIUM_DRIVER is being used in many other places, and it easier to
memorizing and understand than all the GALLIUM_NO_XXX.
2010-03-16 13:48:09 +00:00
José Fonseca d731190ec3 gallium: Silence warning. 2010-03-16 13:46:10 +00:00
Roland Scheidegger 8f55a95178 gallium: change remaining util functions to use cso sampler views
changes arguments of util_blit_pixels_tex and util_gen_mipmap to
struct pipe_sampler_view * instead of struct pipe_texture *.
2010-03-16 11:25:12 +01:00
Michal Krol e4b8a307b2 gallium/docs: Create a separate section for Sampler Views. 2010-03-16 10:58:33 +01:00
Keith Whitwell 8cdfd1219a Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.

Conflicts:
	src/gallium/drivers/nv50/nv50_tex.c
2010-03-16 09:02:38 +00:00
Chia-I Wu e0ce4a4a09 i965g: Fix use of an uninitialized variable. 2010-03-16 15:51:17 +08:00
Chia-I Wu 9d3a873f42 Merge remote branch 'origin/gallium-st-api' 2010-03-16 15:12:46 +08:00
Ben Skeggs 95d43bccde nv50: fix texturing from >=4GiB mark 2010-03-16 13:18:39 +10:00
Jakob Bornecrantz b586774016 llvmpipe: Fix rebase typo 2010-03-16 01:17:33 +00:00
Jakob Bornecrantz 8b63f9b497 winsys/sw: Add a software winsys layered on a pipe 2010-03-16 01:06:46 +00:00
Jakob Bornecrantz eaee22ac88 i965g: Fix after context transfers 2010-03-16 01:06:46 +00:00
Brian Paul cb1b0b4bec gallivm: checkpoint: stencil test code 2010-03-15 18:19:04 -06:00
Brian Paul 185be3a87a gallivm/llvmpipe: rename some constant building functions 2010-03-15 18:16:56 -06:00
Brian Paul c86a499769 gallivm: fix up some #includes 2010-03-15 18:16:56 -06:00
Brian Paul 0d71ba46e6 gallivm/llvmpipe: rename os_llvm.h to lp_bld.h
The llvm wrapper wasn't really an OS thing.

Use lp_bld.h for now but we eventually should rename/re-prefix all the
files/functions in the gallivm/ directory.
2010-03-15 18:16:56 -06:00
José Fonseca 3eb4b7bbec libgl-xlib: Obey GALLIUM_SOFTPIPE define. 2010-03-15 21:04:58 +00:00
Dave Airlie 8e848d682e gallium: fix frontbuffer rendering with r300g
No idea if this is the correct fix, but it makes it work again at least.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-03-16 06:51:04 +10:00
Brian Paul d0b35352ed llvmpipe: updated status in README file 2010-03-15 11:46:41 -06:00
Brian Paul aa3cdb712f progs/objviewer: remove debug code 2010-03-15 11:31:59 -06:00
Brian Paul d25d3cc008 gallivm: fix typo/bug in lp_build_sgn()
We were never returning -1 as a result.  This fixes some inverted/flipped
faces with cube mapping.
2010-03-15 11:30:05 -06:00
Keith Whitwell 6420aca08b cso: Do not hold references to bound textures.
Sampler views already hold references to those.
2010-03-15 17:56:19 +01:00
Brian Paul 1d6d51413e gallivm: add min_lod==max_lod special-case code in lp_build_lod_selector()
When min_lod==max_lod we don't need to go through all the work of
computing the lod from partial derivatives.  This is hit by the mipmap
generation utility code.
2010-03-15 10:51:58 -06:00
Brian Paul b9a81b626a gallivm: asst clean-ups, comments, etc. 2010-03-15 10:43:05 -06:00
Brian Paul eecf9c85b0 gallivm: implement minification/magnification selection
Use the LOD value to determine whether to use the minification vs.
magnification filter.

All mipmap sampling modes work now.
2010-03-15 10:36:58 -06:00
Brian Paul e0f7c3cbf0 gallivm: fix incorrect clamp in lp_build_linear_mip_levels() 2010-03-15 10:31:20 -06:00
Brian Paul f9d753787e gallivm: fix incorrect floor(), itrunc()
LLVMBuildFPTrunc() should be used for double->float conversion, not
float->int conversion.

There should be a better way to compute floor(), ceil(), etc that doesn't
involve float->int->float conversion.
2010-03-15 10:29:10 -06:00
Michal Krol 3949388ca3 st/mesa: Fix a call to st_get_stobj_sampler_view(). 2010-03-15 15:04:12 +01:00
Michal Krol 6b60820fde st/mesa: Pass in correct sampler view object to blitter. 2010-03-15 15:03:44 +01:00
Michal Krol df65fc8100 util: Fix nil pointer reference. 2010-03-15 14:42:44 +01:00
Luca Barbieri 50d96f741e nv40: remove leftover nv40_transfer.c from unification into nvfx 2010-03-15 08:47:03 -04:00
Michal Krol f2bc089d14 gallium: util_blit_pixels() takes source sampler view as argument. 2010-03-15 13:22:40 +01:00
Michal Krol dbf20a1f0f st/mesa: Cache FBO texture's sampler view object. 2010-03-15 13:22:40 +01:00
Chia-I Wu a66d008104 st/mesa: Update the comments in st_manager.c. 2010-03-15 19:15:43 +08:00
Keith Whitwell 08189e6391 nvfx: fix up after merge 2010-03-15 10:27:25 +00:00
Keith Whitwell 506130fff5 r300g: fix up after merge 2010-03-15 10:24:55 +00:00
Keith Whitwell 42910ebe7b Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
	src/gallium/drivers/nv30/nv30_context.h
	src/gallium/drivers/nv30/nv30_state.c
	src/gallium/drivers/nv40/nv40_context.h
	src/gallium/drivers/nv40/nv40_state.c
	src/gallium/drivers/r300/r300_emit.c
2010-03-15 09:44:52 +00:00
Dave Airlie 68e58a96e8 r300g: rebuild screen/winsys interface
This creates a cleaner winsys and drop the simple screen stuff.

It makes r300g use pb_bufmgr structs.

It also tries to avoid overheads from mapping too often.

v5: clean warnings

v6: break out of cache check on first buffer - since most likely
the first busy one implies all after it are busy.

v7: cleanup a bit

v8-merged: drop cman for now to just get all the interface changes in first.
rework to changes that happened upstream

Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-03-15 18:36:47 +10:00
Ben Skeggs a899c5a76e nv50: reset vbo_fifo before each validate 2010-03-15 16:53:46 +10:00
Luca Barbieri 9b3a908736 nvfx: remove src_native_swz, which was a no-op
src_native_swz was used to translate 0/1 swizzles back when Gallium
supported them.

That support was later removed from Gallium, and the function currently
always returns true.

Remove it.
2010-03-15 00:03:05 -04:00
Luca Barbieri 49f2a89956 nvfx: clean up shader header
Currently the behavior of shader.h depends on some constants that
are defined differently in vertex and fragment programs.

This patch cleans that up by splitting the relevant symbols in
vertex program and fragment program variants
2010-03-15 00:03:05 -04:00
Luca Barbieri a174db480b nvfx: draw: make swtnl draw_elements actually work.
It was totally broken: the index buffer was passed as NULL!
2010-03-15 00:03:04 -04:00
Luca Barbieri 152dffd3e1 nvfx: draw: emit color as floating point
Don't lose precision by converting to u8.
2010-03-15 00:03:04 -04:00
Luca Barbieri ac7ae8bc6a nvfx: draw: make perspective corrective texturing work
We must divide everything in the position by w, and emit position as
a 4-component vector.

Not sure why we must divide, but it works (see progs/redbook/checker).
2010-03-15 00:03:04 -04:00