summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-10-1058-1967/+854
|\ | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
| * i965: Accelerate depth textures with border color.Eric Anholt2008-10-092-6/+20
| | | | | | | | | | The fallback was introduced to fix bug #16697, but made the test it was fixing run excessively long.
| * i965: Actually hook up the accelerated DrawPixels support.Eric Anholt2008-10-093-3/+3
| |
| * i915: Accelerate depth textures with border color.Eric Anholt2008-10-082-8/+16
| | | | | | | | | | The fallback was introduced to fix bug #16697, but made the test it was fixing run excessively long.
| * mesa: vertex emit debug code (disabled)Brian Paul2008-10-081-22/+58
| |
| * mesa: fix vertex format/attribute bugBrian Paul2008-10-081-5/+8
| | | | | | | | | | | | | | | | If the tnl output attributes matches the swsetup input attributes we still need to check if the desired vertex color type (float vs. chan) has changed so that we use the right emit functions. Fixes a conformance failure found with logicop test at pathlevel 3.
| * mesa: Pass the context to query object delete cb to avoid null dereference.Eric Anholt2008-10-071-1/+1
| |
| * i965: Add ARB_occlusion_query support.Eric Anholt2008-10-079-52/+331
| |
| * intel: Push flushing for cliprects changes down into the cliprects changes.Eric Anholt2008-10-071-6/+22
| | | | | | | | | | | | This lets us short-circuit when we're leaving the same cliprects in place, which becomes quite common with metaops clears, and may be useful for some of our FBO paths.
| * i965: Fix a potential assertion failure.Xiang, Haihao2008-10-081-2/+4
| |
| * mesa: pass 'mask', not NULL to renderbuffer->Put functionsBrian Paul2008-10-071-10/+10
| | | | | | | | Fixes bug 17800.
| * mesa: fix convolve/convolution mix-upsBrian2008-10-062-3/+3
| |
| * mesa: set FRAG_BIT_FOGC bit in InputsUsed if FogOption!=GL_NONEBrian Paul2008-10-061-0/+3
| |
| * mesa: adjust texcoords for swrast sprite points.Brian Paul2008-10-061-2/+2
| | | | | | | | Fixes glean pointSprite test w/ software rendering
| * mesa: fix static library constructionBrian Paul2008-10-061-1/+23
| | | | | | | | If the .a is made of other .a files, extract the objects from the later.
| * mesa: updated _mesa_delete_query() commentsBrian Paul2008-10-061-2/+1
| |
| * mesa: add missing GLcontext param to _mesa_delete_query().Brian Paul2008-10-062-2/+2
| | | | | | | | Fixes vtk crash and others.
| * i915: Refine the texture indirect lookup accounting.Eric Anholt2008-10-042-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | Without this, we would reject programs which sampled multiple times from registers defined in the same phase (block of instructions with the same texture indirection count), as each sample would count as a new phase beginning. Instead, keep track of which phases registers were written in, and only bump phase when we're reading from one generated in this phase. On the other hand, we failed to count oC or oD texture samples as being new phases. Bug #17865.
| * intel: Don't advertise unsupported extensions on pre-965 hardwareIan Romanick2008-10-031-2/+2
| | | | | | | | | | | | | | | | | | Move GL_ARB_texture_non_power_of_two and GL_ATI_separate_stencil from the generic extension list to the 965-specific list. Neither extension is supported on i830-class hardware, and GL_ATI_separate_stencil is not supported on i915-class hardare. GL_ARB_texture_non_power_of_two is supported on i915-class hardare and is already in the i915-specific list.
| * Unify ARB_depth_texture and SGIX_depth_textureIan Romanick2008-10-0111-31/+20
| | | | | | | | | | | | | | The ARB extension is a superset of the older SGIX extension. Any hardware that can support the SGIX version can also support the ARB version. In Mesa, any driver that supports one also supports the other. This unification just simplifies some bits of code.
| * i965: sampler default color ends up in texture cache, not instructions.Eric Anholt2008-10-011-1/+1
| | | | | | | | See volume 4, SAMPLER_BORDER_COLOR_STATE programming notes.
| * i965: Fix overwriting of depth override for SetTexOffset.Eric Anholt2008-10-011-1/+0
| | | | | | | | Fixes black borders around windows in compiz. Bug #17233.
| * intel: Clean-up the extension string madness!Ian Romanick2008-09-291-70/+64
| | | | | | | | | | | | - Sort extensions by ARB, then EXT, then vendor by name - Remove redundant (only one of GL_{ARB,EXT,NV}_texture_rectangle) or duplicate extension strings
| * GLSL: Implement GL_OBJECT_TYPE_ARB queryIan Romanick2008-09-291-2/+10
| | | | | | | | | | | | | | The GL_OBJECT_TYPE_ARB query is handled directly in _mesa_GetObjectParamterivARB because it is only supported in the extension version of the shanding language API. glGetProgramiv and glGetShaderiv should not accept this enum.
| * GLSL: Implement _mesa_get_handleIan Romanick2008-09-291-17/+8
| | | | | | | | | | Implementing _mesa_get_handle in using glGetIntegerv(GL_CURRENT_PROGRAM, ...) allows glGetHandleARB to work.
| * GLSL: AttachShader returns INVALID_OPERATION for repeated attachIan Romanick2008-09-291-1/+7
| | | | | | | | | | | | | | The GL_ARB_shader_objects spec says that glAttachShaderARB is supposed to return GL_INVALID_OPERATION if a shader is attached to a program where it is already attached. _mesa_attach_shader perviously returned without error in this case.
| * mesa: asst updates for VMSJouk Jansen2008-09-296-14/+51
| |
| * mesa: drop calloc from _mesa_get_fixed_func_vertex_programShunichi Fuji2008-09-291-11/+7
| | | | | | | | Signed-off-by: Shunichi Fuji <[email protected]>
| * Use 3Dnow! x86-64 routines only on processors that support 3Dnow!Ian Romanick2008-09-282-19/+46
| | | | | | | | | | | | | | | | | | Added an x86-64 CPUID function and use it to detect 3Dnow! If 3Dnow! is available, use _mesa_3dnow_transform_points4_3d_no_rot, _mesa_3dnow_transform_points4_perspective, _mesa_3dnow_transform_points4_2d_no_rot, and _mesa_3dnow_transform_points4_2d. This fixes long standing bug #8724.
| * Remove TNL-to-VP tracking from i965Ian Romanick2008-09-287-1665/+2
| | | | | | | | | | | | | | | | The i965 driver previously had it's own set of code to convert fixed-function TNL state to a vertex program. Core Mesa has code to do this, so there is no reason to duplicate that effort in the driver. In fact, this duplication leads to bugs when other aspects of the Mesa infrastructure change.
| * glapi: add DISPATCH_FUNCTION_SIZETobias Jakobi2008-09-271-0/+14
| |
| * glapi: add gl_dispatch_functions_start and endTobias Jakobi2008-09-271-0/+10
| |
| * intel: Fix a number of memory leaks on context destroy.Eric Anholt2008-09-268-3/+83
| |
| * configs: darwin: Don't build GLwJeremy Huddleston2008-09-261-3/+3
| | | | | | | | (cherry picked from commit ef688ba1ee366a8937a41075cbe8b76a9bf75013)
| * mesa: remove invalid assertions that programs have parametersBrian Paul2008-09-261-6/+0
| | | | | | | | Fixes failure with demos/fplight.c
| * mesa: fix assertion in _mesa_reference_program()Brian Paul2008-09-261-1/+5
| |
| * mesa: fix param indexingBrad King2008-09-261-6/+6
| |
* | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-10-1040-122/+769
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/gallivm/instructionssoa.cpp src/gallium/auxiliary/gallivm/soabuiltins.c src/gallium/auxiliary/rtasm/rtasm_x86sse.c src/gallium/auxiliary/rtasm/rtasm_x86sse.h src/mesa/main/texenvprogram.c src/mesa/shader/arbprogparse.c src/mesa/shader/prog_statevars.c src/mesa/state_tracker/st_draw.c src/mesa/vbo/vbo_exec_draw.c
| * | mesa: rasterizer state depends on ST_NEW_VERTEX_PROGRAMBrian Paul2008-10-091-1/+4
| | | | | | | | | | | | Check for per-vertex point size must be done when vertex program changes.
| * | mesa: in _mesa_combine_programs() take new STATE_CURRENT_ATTRIB color into ↵Brian Paul2008-10-081-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account Commit 1680ef869625dc1fe9cf481b180382a34e0738e7 changed the texenv program to get color from a state register instead of a constant-valued vertex attribute. This broke program concatenation (so glDraw/CopyPixels broke). Now check if the second program get's color from a constant register and handle that case appropriately.
| * | Mesa: fix the case where there are no vertex attributes.Stephane Marchesin2008-10-071-0/+2
| | | | | | | | | | | | This is a backport of 8e8208d6db8b764568539784a6473d545dec2265 to gallium-0.1
| * | trivial: add more vp testsKeith Whitwell2008-10-073-0/+210
| | |
| * | mesa: replace GLuint with GLbitfield to be clearer about usageBrian Paul2008-10-077-20/+22
| | | | | | | | | | | | Also, fix up some comments to be doxygen style.
| * | draw: don't assume output buffer pointer is alignedKeith Whitwell2008-10-071-1/+1
| | |
| * | mesa: update state after binding vertex list in dlist pathKeith Whitwell2008-10-071-0/+5
| | |
| * | trivial: exercise vertprog sligtlyKeith Whitwell2008-10-072-0/+104
| | |
| * | mesa: protect against segfault in get_fp_input_mask()Keith Whitwell2008-10-071-1/+4
| | |
| * | draw: add switch for drivers to force vertex data passthroughKeith Whitwell2008-10-074-19/+33
| | |
| * | mesa: remove old assertionBrian Paul2008-10-071-2/+0
| | |
| * | gallium: replace assertion with conditional/recovery codeBrian2008-10-061-1/+5
| | | | | | | | | | | | | | | The assertion failed when we ran out of exec memory. Found with conform texcombine test.