Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cso: Remove set/save/restore_vertex_sampler_textures(). | Michal Krol | 2010-03-12 | 2 | -98/+0 |
| | |||||
* | st/mesa: Associate a sampler view with an st texture object. | Michal Krol | 2010-03-12 | 8 | -47/+119 |
| | | | | | Lazily create a sampler view when the texture is being bound for the first time. | ||||
* | cso: Add entry points for vertex/fragment sampler views. | Michal Krol | 2010-03-12 | 2 | -15/+167 |
| | |||||
* | nv50: take format from sampler view, not the referenced texture | Christoph Bumiller | 2010-03-11 | 1 | -1/+1 |
| | |||||
* | nv50: put correct value into the TIC MAX_LEVEL field | Christoph Bumiller | 2010-03-11 | 1 | -2/+1 |
| | |||||
* | nv50: fix damage from merging master into sampler-view | Christoph Bumiller | 2010-03-11 | 3 | -19/+17 |
| | | | | | | Fixed the state array sizes at 3 (instead of PIPE_SHADER_TYPES) because we'll never have domain and hull shaders on nv50; also the numbering doesn't correspond to the hw numbering. | ||||
* | gallium: Check for OOM condition when creating a sampler view. | Michal Krol | 2010-03-11 | 9 | -45/+63 |
| | |||||
* | gallium: Use last_level for pipe_sampler_view instead of num_levels. | Michal Krol | 2010-03-11 | 3 | -3/+3 |
| | | | | It's more consistent with the rest of the interfaces. | ||||
* | gallium: pipe_get_tile_swizzle() accepts format parameter. | Michal Krol | 2010-03-10 | 4 | -1/+25 |
| | | | | Enables casting of texture data. | ||||
* | Merge branch 'master' into gallium-sampler-view | Michal Krol | 2010-03-10 | 1327 | -169767/+30867 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript src/gallium/auxiliary/tgsi/tgsi_exec.c src/gallium/auxiliary/util/u_blitter.c src/gallium/drivers/i915/i915_context.h src/gallium/drivers/i965/brw_context.h src/gallium/drivers/llvmpipe/lp_context.h src/gallium/drivers/nv50/nv50_context.h src/gallium/drivers/nv50/nv50_state_validate.c src/gallium/drivers/nv50/nv50_tex.c src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_context.h src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_state.c src/gallium/drivers/softpipe/sp_context.h src/gallium/drivers/svga/svga_context.h src/gallium/drivers/svga/svga_pipe_sampler.c | ||||
| * | svga: Disable debug message. | Michal Krol | 2010-03-10 | 1 | -1/+1 |
| | | |||||
| * | svga: Check if vertex elements has been bound before using it. | Michal Krol | 2010-03-10 | 1 | -0/+5 |
| | | |||||
| * | softpipe: Prevent NULL dereference. | José Fonseca | 2010-03-10 | 1 | -1/+2 |
| | | |||||
| * | python: Remove broken link hack. | José Fonseca | 2010-03-10 | 2 | -5/+1 |
| | | |||||
| * | python: More build fixes. | José Fonseca | 2010-03-10 | 4 | -5/+10 |
| | | |||||
| * | trace: Make tr_public.h c++ friendly. | José Fonseca | 2010-03-10 | 1 | -9/+17 |
| | | |||||
| * | target-helpers: remove swrast_xlib.c helper | Keith Whitwell | 2010-03-10 | 5 | -115/+121 |
| | | | | | | | | | | | | | | | | | | | | This was a good idea, but ended up tying the build systems in knots. We can revisit this later, in particular if we can put in place dummy implementations of cell_create_screen(), llvmpipe_create_screen() which just return NULL if the driver isn't available. In the meantime, just duplicate this smallish function in the two places it was being called. | ||||
| * | ws/xlib: remove dead lines | Keith Whitwell | 2010-03-10 | 1 | -6/+0 |
| | | |||||
| * | scons: Fixup the libgl-gdi build. | José Fonseca | 2010-03-10 | 3 | -7/+9 |
| | | |||||
| * | python: Handle the possibility that no driver is selected. | José Fonseca | 2010-03-10 | 1 | -0/+2 |
| | | |||||
| * | gallium: remove trace module injection from various state trackers | Keith Whitwell | 2010-03-10 | 5 | -44/+3 |
| | | | | | | | | | | | | | | Components such as state trackers, drivers, etc, should be free to be recombined in arbtrary ways to build driver stacks. They should not be reaching out and trying to build the stack themselves - this is now expected to be handled by the "target" abstraction. | ||||
| * | ws/gdi: add include | Keith Whitwell | 2010-03-10 | 1 | -0/+2 |
| | | |||||
| * | target-helpers: helper for injecting common debug layers | Keith Whitwell | 2010-03-10 | 5 | -11/+85 |
| | | | | | | | | | | | | | | Add a helper gallium_wrap_screen() for injecting the commonly used extra layers into a gallium stack. Currently that's just the trace module and identity layer, but there could be more in the future, eg. a validation layer. | ||||
| * | python: Fix up state tracker for sw api. | José Fonseca | 2010-03-10 | 7 | -225/+84 |
| | | |||||
| * | Revert "r300-gallium: Skeleton for integrating into the python statetracker." | José Fonseca | 2010-03-10 | 6 | -1297/+0 |
| | | | | | | | | | | | | This reverts commit 2d56d0839e6db0861131893d67fe23734800085a. Never actually used. | ||||
| * | st/wgl: add missing paramter | Keith Whitwell | 2010-03-10 | 1 | -1/+1 |
| | | |||||
| * | trace: include tr_public.h | Keith Whitwell | 2010-03-10 | 1 | -0/+1 |
| | | |||||
| * | gallium: plumb winsys-drawable-handle through to state tracker | Keith Whitwell | 2010-03-10 | 9 | -16/+42 |
| | | | | | | | | | | | | | | The state trackers need this value so that they can supply it as the "void *" argument to flush_frontbuffer. Fixes single-buffer rendering. | ||||
| * | Merge commit 'origin/master' into gallium-sw-api-2 | Keith Whitwell | 2010-03-10 | 134 | -2847/+3994 |
| |\ | |||||
| | * | llvmpipe: Cope with null Vertex element cso. | José Fonseca | 2010-03-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSO can often be null. For example: 1. at initialization 2. using an util module (u_blit) right after initialization (it will push state and pop the previous null state) 3. at shutdown time (state shouldn't be bound when being destroyed) Glean was hitting 2. | ||||
| | * | nouveau: translate PIPE_BUFFER_USAGE_UNSYNCHRONIZED | Ben Skeggs | 2010-03-10 | 1 | -1/+1 |
| | | | |||||
| | * | nv50: inline nv50_state_flush_notify() | Ben Skeggs | 2010-03-10 | 2 | -16/+6 |
| | | | | | | | | | | | | It's (rightly) not called from anywhere else now | ||||
| | * | nv50: remove nv50_context.state.instbuf | Ben Skeggs | 2010-03-10 | 2 | -6/+0 |
| | | | |||||
| | * | nv50: remove unnecessary macro | Ben Skeggs | 2010-03-10 | 1 | -3/+2 |
| | | | |||||
| | * | nv50: move nv50_prim() into a header file rather than duplicating | Ben Skeggs | 2010-03-10 | 3 | -62/+31 |
| | | | |||||
| | * | nv50: add option to force immediate-mode submission, disable by default | Ben Skeggs | 2010-03-10 | 3 | -4/+14 |
| | | | |||||
| | * | nv50: re-add immediate mode vertex submission paths | Ben Skeggs | 2010-03-10 | 4 | -8/+399 |
| | | | |||||
| | * | nv50: when doing inline indices, split elt lists so they fit into pushbuf | Ben Skeggs | 2010-03-10 | 2 | -85/+202 |
| | | | |||||
| | * | nv50: reimplement draw_elements_instance(), use for draw_elements() too | Ben Skeggs | 2010-03-10 | 1 | -159/+93 |
| | | | | | | | | | | | | | | | This makes draw_elements()/draw_elements_instanced() do the right thing for the non-inline elements cases, and not require flush_notify(). | ||||
| | * | nv50: reimplement draw_arrays_instanced(), do draw_arrays() in terms of it | Ben Skeggs | 2010-03-10 | 1 | -144/+134 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes draw_arrays()/draw_arrays_instanced() do the right thing and not require the (probably broken anyway) flush_notify() usage. It also fixes a potential bug in the behaviour of reading InstanceID from shaders, where 0 should be read for non-instanced drawing, previously it was possible to read non-0 ids if mixing instanced/non-instanced. | ||||
| | * | nv50: rip out inline push draw paths temporarily | Ben Skeggs | 2010-03-10 | 2 | -551/+12 |
| | | | |||||
| | * | nv50: make use of scissor enable/disable method | Ben Skeggs | 2010-03-10 | 4 | -25/+8 |
| | | | |||||
| | * | nv50: move magic 0x142c stuff to after state emission | Ben Skeggs | 2010-03-10 | 2 | -11/+8 |
| | | | |||||
| | * | nv50: avoid unnecessary vp/gp/fp state changes | Ben Skeggs | 2010-03-10 | 1 | -0/+9 |
| | | | |||||
| | * | nv50: remove pre_pipebuffer_map hack.... | Ben Skeggs | 2010-03-10 | 1 | -23/+0 |
| | | | |||||
| | * | nv50: remove horrific abuse of nouveau_channel.flush_notify | Ben Skeggs | 2010-03-10 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | Really though, using this at all is just not a good idea in the 3D driver. I'm almost certain the hardware will not like a reloc appearing between begin()/end().. Anyways, this is still better than before, more fixes to come.. | ||||
| | * | nv50: always emit dummy relocs for all still-referenced buffers | Ben Skeggs | 2010-03-10 | 1 | -2/+8 |
| | | | |||||
| | * | nv50: ensure enough room for state changes in current pushbuf | Ben Skeggs | 2010-03-10 | 4 | -17/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also allows the nv50_state_validate() caller to request a minimum amount of space that itself requires, not all callers accurately use this yet but the simple cases are now accounted for. Rendering will also be dropped on the floor if validate fails now. | ||||
| | * | nv50: rework state emission | Ben Skeggs | 2010-03-10 | 7 | -311/+249 |
| | | | |||||
| | * | nv50: use relocs rather than re-uploading TIC all the time | Ben Skeggs | 2010-03-10 | 3 | -2/+32 |
| | | |