Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | shader_api: Fix bounds checking of glUniform and glUniformMatrix | Nicolai Hähnle | 2009-10-07 | 1 | -9/+22 |
| | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> Reviewed-by: Ian Romanick <[email protected]> | ||||
* | prog_parameter: Document the fact that Size may be > 4 | Nicolai Hähnle | 2009-10-07 | 1 | -1/+7 |
| | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | mesa: fix mem leaks | Brian Paul | 2009-10-01 | 1 | -0/+4 |
| | |||||
* | glsl: fix mem leak | Brian Paul | 2009-10-01 | 1 | -0/+1 |
| | |||||
* | mesa: Return -FLT_MAX instead of 0 for LG2(0). | Vinson Lee | 2009-10-01 | 1 | -1/+1 |
| | | | | | lim x->0 log(x) = -inf so -FLT_MAX is a better approximation than 0 for LG2(0). | ||||
* | glsl: regenerated file | Brian Paul | 2009-09-29 | 1 | -49/+57 |
| | |||||
* | glsl: rewrite sqrt(x) intrinsic to handle x=0 | Brian Paul | 2009-09-29 | 1 | -34/+42 |
| | | | | | | Since sqrt() is basically implemented in terms of RSQ/RCP we'll do a divide by zero if x=0 and wind up with unpredictable results. Now use CMP instruction to test for x<=0 and return zero in that case. | ||||
* | glsl: add support for CMP instruction | Brian Paul | 2009-09-29 | 4 | -0/+4 |
| | |||||
* | mesa: move declaration before code | Vinson Lee | 2009-09-25 | 1 | -2/+3 |
| | |||||
* | i965: Emit zero initialization for NV VP temporaries as required. | Eric Anholt | 2009-09-24 | 3 | -0/+49 |
| | | | | | | | This is similar to what r300 does inside the driver, but I've added it as a generic option since it seems most hardware will want it. Fixes piglit nv-init-zero-reg.vpfp and nv-init-zero-addr.vpfp. | ||||
* | mesa: Initialize NV_vertex_program fields for the parameter lists and such. | Eric Anholt | 2009-09-24 | 3 | -0/+55 |
| | | | | This helps let drivers treat NV_vp like ARB_vp. | ||||
* | mesa: added comment | Brian Paul | 2009-09-24 | 1 | -0/+1 |
| | |||||
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Brian Paul | 2009-09-24 | 1 | -6/+1 |
|\ | |||||
| * | mesa: don't bias LOD in shader interpreter; do it in swrast | Brian Paul | 2009-09-23 | 1 | -6/+1 |
| | | |||||
* | | glsl: init var to silence warning | Brian Paul | 2009-09-24 | 1 | -1/+1 |
| | | |||||
* | | glsl: fix missing initializers warning | Brian Paul | 2009-09-24 | 1 | -2/+2 |
| | | |||||
* | | r300: Fix handling of NV_vertex_program parameters | Nicolai Hähnle | 2009-09-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | The handling is a bit inefficient, unfortunately, but I don't want to make any intrusive changes for Mesa 7.6. Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Brian Paul | 2009-09-15 | 2 | -0/+43 |
|\| | |||||
| * | glsl: added some link debug code (disabled) | Brian Paul | 2009-09-14 | 1 | -0/+15 |
| | | |||||
| * | glsl: remove extra #version directives from concatenated shader sources | Brian Paul | 2009-09-14 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | When we concatenate shaders to do our form of poor-man linking, if there's multiple #version directives, preprocessing fails. This change disables the extra #version directives by changing the first two chars to //. This should help with some Wine issues such as bug 23946. | ||||
* | | ARB prog: replace 'unsigned' with 'gl_state_index' | Brian Paul | 2009-09-04 | 5 | -195/+195 |
| | | | | | | | | Fixes compilation warnings with MSVC. | ||||
* | | ARB prog: rename POINT, SIZE to POINT_TOK, SIZE_TOK | Brian Paul | 2009-09-04 | 5 | -37/+23 |
| | | | | | | | | | | Fixes symbol collisions with typedefs in Microsoft headers. Perhaps we should prefix/suffix all the lexer tokens to avoid this. | ||||
* | | ARB prog parser: Fix handling of stateOptModMatNum | Ian Romanick | 2009-09-01 | 2 | -203/+203 |
| | | | | | | | | | | | | The optional array index should clearly be enclosed in square brackets. This helps the oglconform test vp_binding.c get a bit farther, but it still fails. | ||||
* | | mesa: debug printf for KIL | Brian Paul | 2009-08-31 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-27 | 1 | -8/+8 |
|\| | |||||
| * | mesa: direct program debug output to stderr instead of stdout | marvin24 | 2009-08-27 | 1 | -9/+9 |
| | | |||||
* | | mesa: move decls before code | Vinson Lee | 2009-08-27 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-26 | 1 | -4/+15 |
|\| | |||||
| * | glsl: signal that the program needs to be re-translated when samplers change | Brian Paul | 2009-08-26 | 1 | -4/+15 |
| | | |||||
* | | glsl: asst. clean-ups in set_program_uniform() | Brian Paul | 2009-08-26 | 1 | -14/+7 |
| | | | | | | | | | | Remove redunant type check for samplers (assert instead). Move some local vars. Update comments. | ||||
* | | mesa: var renaming, new assertion | Brian Paul | 2009-08-26 | 1 | -4/+5 |
| | | |||||
* | | mesa: additional instruction field size assertions | Brian Paul | 2009-08-26 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-26 | 1 | -3/+7 |
|\| | |||||
| * | glsl: fix bug in sampler array indexing | Brian Paul | 2009-08-26 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | Need to add the 'offset' parameter when indexing the parameter array. Before, if we were setting arrays of samplers, we were actually only setting the 0th sampler's value. Because of how progs/glsl/samplers.c is constructed, this wasn't showing up as a failure in the samplers_array output. | ||||
| * | ARB prog: Set error instead of falling through with incorrect value | Brian Paul | 2009-08-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a fragment program only parameter was queried of a vertex program (e.g., GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB) no error would be set and a random value would be returned. This caused 'glxinfo -l' to show the same values for GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB as for GL_MAX_PROGRAM_ENV_PARAMETERS_ARB. This is confusing and incorrect. (cherry picked from master, commit 4bccd693a72a0b42dffc849034263a68e779ca91) | ||||
| * | glsl: Silence gcc uninitialized variable warning. | Vinson Lee | 2009-08-24 | 1 | -1/+1 |
| | | |||||
* | | glsl: update a texture/sampler comment | Brian Paul | 2009-08-25 | 1 | -1/+1 |
| | | |||||
* | | glsl: implement shader sampler validation | Brian Paul | 2009-08-25 | 2 | -11/+109 |
| | | | | | | | | | | | | Shader validation should fail if there are two samplers of different types which reference the same texture unit. For example, if a cubemap sampler and a 2D sampler both reference texture unit 0, that's invalid. | ||||
* | | mesa: print some program fields in binary too | Brian Paul | 2009-08-25 | 1 | -2/+29 |
| | | |||||
* | | ARB prog: Set error instead of falling through with incorrect value | Ian Romanick | 2009-08-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | If a fragment program only parameter was queried of a vertex program (e.g., GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB) no error would be set and a random value would be returned. This caused 'glxinfo -l' to show the same values for GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB, GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB as for GL_MAX_PROGRAM_ENV_PARAMETERS_ARB. This is confusing and incorrect. | ||||
* | | glsl: Silence gcc uninitialized variable warning. | Vinson Lee | 2009-08-24 | 1 | -1/+1 |
| | | |||||
* | | ARB prog parser: Regenerate parser from previous commit | Ian Romanick | 2009-08-24 | 1 | -6/+6 |
| | | |||||
* | | ARB prog parser: use correct context limits | Brian Paul | 2009-08-24 | 1 | -6/+6 |
| | | |||||
* | | mesa: _mesa_layout_parameters() returns a boolean value | Brian Paul | 2009-08-24 | 2 | -5/+10 |
| | | |||||
* | | ARB prog lexer: Fix lexer to eat both DOS and Unix line endings | Ian Romanick | 2009-08-23 | 2 | -304/+308 |
| | | |||||
* | | ARB prog parser: include imports.h to kill some compiler warnings | Luo Jinghua | 2009-08-22 | 1 | -0/+1 |
| | | |||||
* | | ARB prog parser: Revert part of previous change to constant parsing | Ian Romanick | 2009-08-20 | 2 | -16/+16 |
| | | | | | | | | | | | | The commit "ARP prog parser: Implement the spec, not what makes sense" broke the parsing of scalar constants. This commit reverts that part of that commit. Now vp_swizzle.c passes. | ||||
* | | Merge branch 'master' into asm-shader-rework-1 | Ian Romanick | 2009-08-18 | 10 | -135/+276 |
|\ \ | | | | | | | | | | | | | Conflicts: src/mesa/shader/arbprogparse.c | ||||
| * | | mesa: also pass the GPU program to _mesa_append_uniforms_to_file() | Brian Paul | 2009-08-14 | 2 | -3/+5 |
| | | | | | | | | | | | | We want the post-link program at this points. | ||||
| * | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-14 | 1 | -2/+2 |
| |\| |