Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | NV fp: Parse 'OPTION NV_fragment_program' in ARB assembly shaders | Ian Romanick | 2009-08-31 | 2 | -0/+12 |
| | |||||
* | 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 |
| |\| | |||||
| | * | glsl: fix some uninitialized pointers | Brian Paul | 2009-08-13 | 1 | -2/+2 |
| | | | |||||
| * | | mesa: new _mesa_append_uniforms_to_file() debug/logging function | Brian Paul | 2009-08-14 | 2 | -0/+34 |
| | | | |||||
| * | | glsl: fix incorrect attribute size | Brian Paul | 2009-08-13 | 1 | -1/+1 |
| | | | |||||
| * | | glsl: remove duplicate frag input entry | Brian Paul | 2009-08-12 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'new-frag-attribs' | Brian Paul | 2009-08-12 | 4 | -24/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | This branch introduces new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputs for GLSL gl_FrontFacing and gl_PointCoord. Before, these attributes were packed with the FOG attribute. That made things complicated elsewhere. | ||||
| | * | | mesa: add new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputs | Brian Paul | 2009-07-29 | 4 | -24/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the FOGC attribute contained the fragment fog coord, front/back- face flag and the gl_PointCoord.xy values. Now each of those things are separate fragment program attributes. This simplifies quite a few things in Mesa and gallium. Need to test i965 driver and fix up point coord handling in the gallium/draw module... | ||||
| * | | | glsl: add gl_Vertex, gl_Normal, etc to list of active attributes | Brian Paul | 2009-08-12 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | If a vertex shader uses gl_Vertex, gl_Normal, etc, we need to include them when the user queries the list of active attributes. Before this we were just including the user-defined attributes. | ||||
| * | | | glsl: move predefined shader input/output info/code to slang_builtin.c | Brian Paul | 2009-08-12 | 4 | -103/+199 |
| | | | | | | | | | | | | | | | | | | | | This is a more logical place for this code. Also add some functions for querying vertex shader input names, types, etc. | ||||
| * | | | mesa: log the shader checksum | Brian Paul | 2009-08-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | mesa: compute, print shader checksum | Brian Paul | 2009-08-04 | 1 | -2/+6 |
| | | | | |||||
| * | | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-07-30 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | mesa: move misplaced return statement | Brian Paul | 2009-07-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fixes regression from commit 7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878 | ||||
| * | | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-07-30 | 1 | -0/+1 |
| |\| | | | |/ | |/| | |||||
| | * | mesa: add missing return after catching program error | Brian Paul | 2009-07-30 | 1 | -0/+1 |
| | | | |||||
| * | | r300/compiler: Add rc_print_program | Nicolai Hähnle | 2009-07-27 | 2 | -1/+8 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
| * | | r300: Move vertex program compilation to compiler | Nicolai Hähnle | 2009-07-27 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | This is just the first step of refactoring. The separation is not yet clean enough with this commit. Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | ARB prog parser: Delete the old parser | Ian Romanick | 2009-08-18 | 3 | -8035/+0 |
| | | | |||||
* | | | ARB prog: Revert some changes to debug output | Ian Romanick | 2009-08-18 | 1 | -3/+1 |
| | | | |||||
* | | | ARB prog parser: Add support for RGBA components to SWZ instruction in fp | Ian Romanick | 2009-07-30 | 3 | -273/+398 |
| | | | |||||
* | | | ARB prog parser: Prevent NULL ptr deref for KIL instruction | Ian Romanick | 2009-07-30 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | The KIL instruction doesn't have a destination register, so dereferencing dst in asm_instruction_ctor would cause a segfault. | ||||
* | | | ARP prog parser: Implement the spec, not what makes sense | Ian Romanick | 2009-07-29 | 2 | -71/+89 |
| | | | |||||
* | | | ARB prog parser: Get program limits from the context | Ian Romanick | 2009-07-29 | 2 | -48/+6 |
| | | | | | | | | | | | | | | | Some debug code from the older stand-alone version of the assembler was hanging around and needed to go. | ||||
* | | | ARB prog lexer: attenuation is not just for vp | Ian Romanick | 2009-07-29 | 2 | -2/+2 |
| | | |