summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'lb2/arb_fragment_coord_conventions'Keith Whitwell2010-01-293-4/+74
|\
| * st/mesa: Gallium support for ARB_fragment_coord_conventions (v4)Luca Barbieri2010-01-292-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in v4; - Implemented Brian Paul's style suggestions Changes in v3: - Use positive caps instead of negative ones Changes in v2: - Updated formatting The state tracker will use the TGSI convention properties if the hardware exposes the appropriate capability, and otherwise adjust WPOS itself. This will also fix some drivers that were previously broken due to their incorrect, inadvertent, use of conventions other than upper_left+half_integer.
| * mesa: don't expose GL_ARB_fragment_coord_conventions until the GLSL part is doneLuca Barbieri2010-01-291-1/+2
| | | | | | | | | | | | | | | | Exposing it was incorrect, as the GLSL part of the extension is missing. We still keep the ARB_fragment_coord_conventions field, so that the ARBfp parser can know whether to accept or reject the keywords.
* | tnl: check that state is validated before drawingBrian Paul2010-01-291-0/+3
| | | | | | | | | | | | | | | | (cherry picked from commit 9fd3c74724e557bc6ecc851d8552615ab3becfe2) Conflicts: src/mesa/tnl/t_draw.c
* | st/mesa: check that state is validated before drawingBrian Paul2010-01-291-0/+3
| | | | | | | | | | | | | | | | (cherry picked from commit 4d1234e22242529c8d85f5ef0cf826af41a91570) Conflicts: src/mesa/state_tracker/st_draw.c
* | vbo: fix missing state validation bugsBrian Paul2010-01-291-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2708ddfb06a36d8568e2aa130bf1f7d551fcd309 caused a few regressions. We need to check/validate state after calling bind_arrays() because it might set the _NEW_ARRAYS flag if the varying VP inputs change. The symptom of this problem was some attribute arrays being ignored (or interpreted as constant-valued) in glDrawRangeElements or glMultiDrawElements. A follow-on patch will add some additional asserts to try to catch this kind of thing in the future. (cherry picked from commit 3cba779e16935f7c3a0bfd8af48bd5e015068e96)
* | mesa: do state validation in _mesa_valid_to_render()Brian Paul2010-01-292-9/+4
| | | | | | | | | | | | | | | | | | ...rather than checking/validating before all the calls to _mesa_valid_to_render() and valid_to_render(). The next patch will actually fix some bugs... (cherry picked from commit 23eda89ec89e2bd5bc26077bd56e8d6b5d4040d4)
* | windows: assorted build fixesBrian Paul2010-01-292-14/+2
| | | | | | | | | | | | | | These changes were originally submitted by Karl Schultz for Mesa 7.7-rc2 but weren't applied. (cherry picked from commit 82c76cd16f35f4d903f49761af7eb28a755ad299)
* | mesa: Warn when indices are out of bounds, but do not skip the draw in debug ↵Brian Paul2010-01-291-3/+1
|/ | | | | | | | | | | | builds. The driver (or preferably the hardware) should handle out of bounds indices. If there are problems then it's better to detect those in the debug builds. (cherry picked from commit e3257912e006120f6ab611e77005eed1a464030a)
* intel: Set the region's tiling to none when attaching a PBO to a region.Eric Anholt2010-01-281-0/+1
| | | | | | | | Note that when detaching the PBO from the region and making a new BO for the region, we don't make it tiled even if the region originally was. Fixes piglit pbo-teximage-tiling.
* i915: Remove unused initial and current state, now that there's nothing else.Eric Anholt2010-01-286-22/+10
|
* intel: Remove long-disabled meta readpixels, and associated meta support.Eric Anholt2010-01-2811-1178/+20
|
* Merge commit 'origin/perrtblend'Roland Scheidegger2010-01-283-39/+94
|\ | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h
| * mesa/st: code cleanups for new blend functionalityRoland Scheidegger2010-01-261-9/+23
| | | | | | | | minor code changes, style and comment fixes
| * st/mesa: handle EXT_draw_buffers2 per rendertarget blend enables / colormasksRoland Scheidegger2010-01-252-31/+72
| | | | | | | | uses the new gallium per-rt blend functionality
| * gallium: prepare for per-rendertarget blend enables, writemasks, blend funcsRoland Scheidegger2010-01-202-23/+23
| | | | | | | | | | | | | | | | GL 3.0 (EXT_draw_buffers2) and other APIs allow independent blend enables and write masks per render target, ARB_draw_buffers_blend (and other APIs) also allow independent blend functions. Things like dithering, logic ops however are not extended to be per rendertarget, that might be conceptually possible however it doesn't look like any API wants to expose this.
* | gallium: Enable multiple constant buffers for vertex and geometry shaders.Michal Krol2010-01-281-1/+1
| |
* | radeon: Silence "format" compiler warnings.Vinson Lee2010-01-281-1/+1
| |
* | swrast: s/FIXED_TO_FLOAT/FixedToFloat/Brian Paul2010-01-271-2/+2
| |
* | mesa: fix int/uint comparison warningsBrian Paul2010-01-272-6/+8
| | | | | | | | Reported by Karl Schultz.
* | mesa: fix double->float assignment warnings, int/uint comparison warningsBrian Paul2010-01-276-14/+14
| | | | | | | | Reported by Karl Schultz.
* | mesa: fix double->float assignment warningsBrian Paul2010-01-271-3/+3
| | | | | | | | Reported by Karl Schultz.
* | mesa: fix int/uint comparison warningsBrian Paul2010-01-272-7/+7
| | | | | | | | Reported by Karl Schultz.
* | tnl: fix double->float and int/uint conversion warningsBrian Paul2010-01-273-3/+3
| | | | | | | | Reported by Karl Schultz.
* | swrast: silence double->float assignment warningsBrian Paul2010-01-2711-52/+53
| | | | | | | | Reported by Karl Schultz.
* | mesa: more info in glActiveTexture error msgBrian Paul2010-01-271-1/+2
| |
* | r600: fix warningAlex Deucher2010-01-271-2/+0
| |
* | r600: rv670 support 8 tex instructions just like other r6xxAlex Deucher2010-01-271-3/+5
| | | | | | | | also clarify some other const values.
* | r600: increase max texture units to 16Andre Maasikas2010-01-272-5/+3
| |
* | r600: fix XPD with writemaskAndre Maasikas2010-01-271-7/+8
| | | | | | | | | | same variable used for 2 different temp registers fixes e.g. glsl/bump
* | radeon/r200/r300: don't clean non-emitted state.Dave Airlie2010-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | So if we don't actually emit an atom to the hw because we don't need it in the current state (e.g. lighting related atoms when lighting is off) then don't mark it as clean, because when lighting gets switched on we won't emit it at all. This fixes funky gears colors. Signed-off-by: Dave Airlie <[email protected]>
* | radeon: remove unused fileDave Airlie2010-01-271-681/+0
| |
* | intel: Remove dead code from having to clip copyteximage source rect.Eric Anholt2010-01-261-5/+0
| | | | | | | | mesa core does it now. If only it did so for other entrypoints.
* | intel: Use a handy helper in glReadPixels source clipping.Eric Anholt2010-01-264-64/+19
| |
* | intel: Clean up stale comments about cliprects.Eric Anholt2010-01-263-42/+4
| |
* | intel: Remove the remaining cliprects code from DRI1.Eric Anholt2010-01-262-22/+0
| |
* | intel: Remove DRI1 junk from spans code.Eric Anholt2010-01-261-30/+11
| | | | | | | | This reduces the driver size by over 1%.
* | intel: Remove DRI1 junk from blit glBitmap.Eric Anholt2010-01-261-82/+53
| |
* | intel: Remove DRI1 junk from CopyPixels.Eric Anholt2010-01-261-87/+50
| |
* | intel: Remove DRI1 junk from glClear blit implementation.Eric Anholt2010-01-261-174/+123
| |
* | i965: Remove DRI1 leftovers from stipple offset handling.Eric Anholt2010-01-261-3/+3
| |
* | st/mesa: Silence uninitialized variable warning.Vinson Lee2010-01-261-0/+1
| |
* | intel: Fix PBO blit ReadPixels from an FBO.Eric Anholt2010-01-261-44/+37
| | | | | | | | Bug #25921 -- clutter PBO usage gave unreliable results.
* | i965: Add support for EXT_draw_buffers2.Eric Anholt2010-01-262-2/+4
| |
* | i965: Fix fp fragment.position handling and enable HW part of ARB_fcc.Eric Anholt2010-01-263-16/+35
| | | | | | | | | | | | | | | | | | As with swrast, this fixes the default pixel center behavior which was broken, and implements the previous behavior for integer. Fixes piglit fp-arb-fragment-coord-conventions-none. The extension won't be exposed until we get the GLSL part implemented. The DRI1 origin_x/y parts are dropped since they're no longer relevant.
* | swrast: Implement ARB_fragment_coord_conventions but don't enable.Eric Anholt2010-01-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | This brings swrast's support up to the state of gallium, and fixes the default center behavior of fragment.position.xy in piglit fp-arb-fragment-coord-conventions-none. The extension is not enabled currently because the GLSL part of the extension isn't supported, so piglit glsl-arb-fragment-coord-conventions-define fails as would any serious test of the GLSL part.
* | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-263-14/+33
|\ \ | | | | | | | | | Merging was easier than cherry picking in this instance.
| * | mesa: Don't bind DRAW/READ_FRAMEBUFFER separately without FBO blit supportErik Wien2010-01-261-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If GL_EXT_framebuffer_blit was not supported _mesa_DeleteFramebuffersEXT would raise an error when deleting the currently bound framebuffer. This because it tried to bind the default DRAW- and READ_FRAMEBUFFER separately. This patch binds the default FRAMEBUFFER instead in that case. Encountered in the fbo/fbo-copyteximage piglit test on R600. Patch cleaned up a bit by Brian Paul.
| * | vbo: if 'end' is out of bounds, clamp itBrian Paul2010-01-261-0/+4
| | | | | | | | | | | | | | | If we determine that the 'end' parameter to glDrawElements() is out of bounds, clamp it to the max legal index value.
| * | vbo: clamp DrawElements start/end to max possible valuesBrian Paul2010-01-261-0/+10
| | | | | | | | | | | | | | | Some apps are sloppy with their start/end values. Clamp them to max possible values to prevent problems later.