summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into pipe-videoChristian König2011-03-19118-2833/+3888
|\ | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c src/gallium/tests/unit/SConscript
| * nouveau: Fix serious compiler warningsJohannes Obermayr2011-03-181-0/+1
| | | | | | | | | | | | Fixes https://bugs.freedesktop.org/show_bug.cgi?id=35025 Signed-off-by: Brian Paul <[email protected]>
| * mesa: minor improvements in glTexEnvfv()Brian Paul2011-03-171-16/+17
| |
| * mesa: only report up to 50 _mesa_problem() callsBrian Paul2011-03-171-5/+11
| | | | | | | | | | | | http://bugs.freedesktop.org/show_bug.cgi?id=35200 reports a disk partition getting filled because of warning messages. Stop emitting after 50.
| * swrast: report data type in error messageBrian Paul2011-03-171-1/+2
| |
| * mesa: Remove the CompileShader driver hook; it's just a no-op.Kenneth Graunke2011-03-176-42/+0
| |
| * mesa: use _mesa_get_current_tex_unit() helper in BindTexture()Brian Paul2011-03-161-2/+2
| |
| * mesa: remove unneeded local var in BindTexture()Brian Paul2011-03-161-3/+3
| |
| * mesa: clean up the glBindTexture early out code a bitBrian Paul2011-03-161-10/+12
| |
| * i965: Rename brw_(IF|CONT)_gen6 functions to gen6_(IF|CONT).Kenneth Graunke2011-03-164-11/+11
| |
| * autoconf: don't use CFLAGS for cpp filesTobias Droste2011-03-161-1/+1
| | | | | | | | Signed-off-by: Tobias Droste <[email protected]>
| * i965: Rename BRW_DATAPORT_..._GEN6 messages to GEN6_... for consistency.Kenneth Graunke2011-03-162-9/+9
| |
| * i965: Rename BRW_SAMPLER_MESSAGE_..._GEN5 to GEN5_SAMPLER_MESSAGE.Kenneth Graunke2011-03-163-17/+17
| | | | | | | | We already have lots of GEN6_* defines; this seems more consistent.
| * mesa: Sort extensions in extension string by year.José Fonseca2011-03-161-216/+278
| | | | | | | | | | The years were obtained automatically by scraping the first year from the spec text file. They are approximate.
| * mesa: Use typecast in BITFIELD64_BIT macro.José Fonseca2011-03-161-5/+1
| | | | | | | | | | | | | | | | | | Unsigned long is 32bit on several platforms (e.g., Windows), yielding 1UL << 32 to be zero. Note that BITFIELD64_BIT result is often assigned to variables of type GLbitfield, instead of GLbitfield64. That's probably wrong and should be addressed in a later change.
| * mesa: use BITFIELD64_BIT() macroBrian Paul2011-03-151-2/+2
| |
| * st/mesa: use BITFIELD64_BIT() macro in a few more placesBrian Paul2011-03-153-4/+4
| |
| * mesa: use 1UL for 64-bit unsigned constant for C++Brian Paul2011-03-151-0/+4
| | | | | | | | This fixes C++ warnings where BITFIELD64_BIT() is used.
| * i965: Fix alpha testing when there is no color buffer in the FBO.Eric Anholt2011-03-153-0/+13
| | | | | | | | | | We were alpha testing against an unwritten value, resulting in garbage. (part of) Bug #35073.
| * i965: Do our lowering passes before the loop of optimization.Eric Anholt2011-03-151-10/+8
| | | | | | | | | | | | | | | | The optimization loop won't reinsert noise instructions or quadop vectors, so we were traversing the tree for nothing. Lowering vector indexing was in the loop after do_common_optimization() to avoid the work if it ended up that the index was actually constant, but that has been called already in the core.
| * mesa: fix scons buildMarek Olšák2011-03-151-1/+1
| |
| * gallium: add texture barrier support to the interface and st/mesa (v2)Marek Olšák2011-03-156-0/+105
| | | | | | | | v2: change the gallium entry point to texture_barrier.
| * mesa: add display list support for NV_texture_barrierMarek Olšák2011-03-151-0/+22
| |
| * mesa: regenerate glapi filesMarek Olšák2011-03-153-1995/+2013
| | | | | | | | | | Be sure to type "make clean" after this commit, otherwise your binaries will segfault.
| * mesa: add NV_texture_barrierMarek Olšák2011-03-159-0/+114
| |
| * st/mesa: Make use of the new PIPE_TRANSFER_DISCARD_* for buffer object.Mathias Fröhlich2011-03-151-5/+9
| | | | | | | | | | | | | | | | In memory mapping buffer objects make use of PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE and PIPE_TRANSFER_DISCARD_RANGE when appropriate. Signed-off-by: Mathias Fröhlich <[email protected]>
| * i965: Enable texture lookups whose return type is 'float'Kenneth Graunke2011-03-141-1/+4
| | | | | | | | | | | | | | This enables the new shadow texture functions in GLSL 1.30. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Chad Versace <[email protected]>
| * i965: Fix tex_swizzle when depth mode is GL_REDChad Versace2011-03-141-1/+2
| | | | | | | | | | | | | | Change swizzle from (x000) to (x001). Signed-off-by: Chad Versace <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
| * i965: Remove dead assignmentChad Versace2011-03-141-2/+0
| | | | | | | | | | | | | | | | The assignment on line 368, `tex_swizzles[i] = SWIZZLE_NOOP`, is rendered dead by the reassignment on line 392. Signed-off-by: Chad Versace <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
| * mesa: rename _mesa_texstore_a8 -> _mesa_texstore_unorm8Marek Olšák2011-03-141-6/+6
| | | | | | | | It's a generic function capable of storing A8, L8, I8, R8.
| * mesa: fix up assertion in _mesa_source_buffer_existsMarek Olšák2011-03-141-0/+2
| | | | | | | | | | | | | | | | | | | | This was probably missed when implementing luminance and luminance alpha render targets. _mesa_get_format_bits checks for both GL_*_BITS and GL_TEXTURE_*_SIZE. This fixes: main/framebuffer.c:892: _mesa_source_buffer_exists: Assertion `....' failed.
| * ir_to_mesa: do not check the number of uniforms against hw limitsMarek Olšák2011-03-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The r300 compiler can eliminate unused uniforms and remap uniform locations if their number surpasses hardware limits, so the limit is actually NumParameters + NumUnusedParameters. This is important for some apps under Wine to run. Wine sometimes declares a uniform array of 256 vec4's and some Wine-specific constants on top of that, so in total there is more uniforms than r300 can handle. This was the main motivation for implementing the elimination of unused constants. We should allow drivers to implement fail & recovery paths where it makes sense, so giving up too early especially when comes to uniforms is not so good idea, though I agree there should be some hard limit for all drivers. This patch fixes: - glsl-fs-uniform-array-5 - glsl-vs-large-uniform-array on drivers which can eliminate unused uniforms.
| * Revert "mesa: Convert fixed function fragment program generator to GLSL IR."Eric Anholt2011-03-124-668/+783
| | | | | | | | | | This reverts commit 7cb87dffce2c7a37f960f3a865cf92fd193dd8c5. There were regressions (Bug #35244) and more review has been requested.
| * Revert "mesa: Track a computed _CurrentFragmentProgram for current ↵Eric Anholt2011-03-122-10/+4
| | | | | | | | | | | | gl_shader_program" This reverts commit b4452c3baad6e0379eeb7f22f2e51d13999e1323.
| * Revert "i965: Use the fixed function GLSL program instead of the ARB program."Eric Anholt2011-03-122-5/+5
| | | | | | | | | | This reverts commit 81b34a4e3a7aec9cdf2781757408dc5e9eec79cb. There were regressions in the core change that this depends on.
| * gallium: Delay the creation of simple helper shadersJakob Bornecrantz2011-03-121-16/+38
| |
| * u_blitter: Do blits in linear color space.Henri Verbeet2011-03-121-1/+1
| | | | | | | | | | Blits between sRGB and linear formats should happen in linear color space. This fixes piglit fbo/fbo-srgb-blit.
| * r300/compiler: do not set TEX_IGNORE_UNCOVERED on r500Marek Olšák2011-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | The docs say it can be set for direct texture lookups, but even that causes problems. This fixes the wireframe bug: https://bugs.freedesktop.org/show_bug.cgi?id=32688 NOTE: This is a candidate for the 7.9 and 7.10 branches.
| * r300/compiler: TEX instructions don't support negation on source argumentsMarek Olšák2011-03-121-3/+0
| | | | | | | | | | | | | | This fixes piglit: - glsl-fs-texture2d-dependent-4 NOTE: This is a candidate for the 7.9 and 7.10 branches.
| * r300/compiler: Abs doesn't cancel Negate (in the conversion to native swizzles)Marek Olšák2011-03-122-9/+0
| | | | | | | | NOTE: This is a candidate for the 7.9 and 7.10 branches.
| * r300/compiler: fix translating the src negate bits in pair_translateMarek Olšák2011-03-121-3/+8
| | | | | | | | | | | | | | | | | | | | | | (1, -_, ...) was converted to (-1, ...) because of the negation in the second component. Masking out the unused bits fixes this. Piglit: - glsl-fs-texture2d-branching NOTE: This is a candidate for the 7.9 and 7.10 branches.
| * r300g: implement fragment color clamping in the shaderMarek Olšák2011-03-122-0/+23
| | | | | | | | | | This finishes the implementation of the fragment color clamp control for ARB_color_buffer_float. I don't wanna keep this stuff in a branch...
| * r300/compiler: fix the saturate modifier when applied to TEX instructionsMarek Olšák2011-03-121-1/+5
| | | | | | | | This bug can only be triggered if the source texture is either signed or float.
| * nouveau: Build fixAdam Jackson2011-03-111-0/+1
| | | | | | | | nouveau_vieux_dri.so.tmp: undefined reference to `_mesa_need_secondary_color'
| * r600: Build fixAdam Jackson2011-03-112-0/+2
| | | | | | | | r600_dri.so.tmp: undefined reference to `_mesa_rgba_logicop_enabled'
| * scons: Move texenvprogram.c to ff_fragment_shader.cpp.Vinson Lee2011-03-111-1/+1
| |
| * i965: Use the fixed function GLSL program instead of the ARB program.Eric Anholt2011-03-112-5/+5
| | | | | | | | | | | | This gets one more piece of the pipeline onto the new codegen backend. Once ARB_fragment_program can generate GLSL programs, we can nuke the old backend.
| * mesa: Track a computed _CurrentFragmentProgram for current gl_shader_programEric Anholt2011-03-112-4/+10
| | | | | | | | | | | | | | This is like how we track FragmentProgram._Current for the computed ARB fragment program for fixed function texenv, but this gives direct access to the gl_shader_program for drivers to codegen from, skipping ARB_fp.
| * mesa: Convert fixed function fragment program generator to GLSL IR.Eric Anholt2011-03-114-783/+668
| | | | | | | | | | | | | | | | This is a step towards providing a direct route for drivers accepting GLSL IR for codegen. Perhaps more importantly, it runs the fixed function fragment program through the GLSL IR optimization. Having seen how easy it is to make ugly fixed function texenv code that can do unnecessary work, this may improve real applicatinos.
| * mesa: Add gl_MESAFogParamsOptimized for our special pre-computed fog params.Eric Anholt2011-03-111-0/+5
| | | | | | | | | | | | | | It would be nice if we handled optimized uniform math like this in some generic way, since people often end up doing uniform expressions in shaders, but for now keep this hard-coded like it was in the texenvprogram code.