Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | consolidate some parsing functions that were pretty much identical for ↵ | Brian | 2008-03-27 | 1 | -152/+71 |
| | | | | | | vertex/fragment programs cherry-picked from master | ||||
* | mesa: misc sync-up with master | Brian | 2008-03-27 | 1 | -3/+3 |
| | |||||
* | raise GL_INVALID_OPERATION if glProgramString compilation fails | Brian | 2008-03-27 | 1 | -1/+1 |
| | | | | cherry-picked from master | ||||
* | make sure state token values are fully initialized | Brian | 2008-03-27 | 1 | -1/+1 |
| | | | | cherry-picked from master | ||||
* | added program_error2() function for better error reporting | Brian | 2008-03-27 | 1 | -47/+60 |
| | | | | cherry-picked from master | ||||
* | Fix state.texgen parsing error (bug 12313). | Brian | 2008-03-27 | 1 | -5/+12 |
| | | | | | | Replace *(*inst++) with *(*inst)++ in a few places. Cherry-picked from master. | ||||
* | mesa: append fog instructions after parsing if a fog option is set | Brian Paul | 2008-03-25 | 1 | -0/+11 |
| | | | | Drivers don't have to worry about it then. | ||||
* | mesa: when negating scalar src args, use NEGATE_XYZW, not NEGATE_X | Brian Paul | 2008-03-25 | 1 | -6/+6 |
| | | | | This makes things easier on the back-end when generating GPU code. | ||||
* | only set InputsRead bit if input is really used | Markus Amsler | 2008-03-17 | 1 | -3/+5 |
| | |||||
* | mesa: set SamplersUsed bitmask when parsing ARB fragment programs | Brian | 2008-03-12 | 1 | -1/+4 |
| | |||||
* | mesa: set input read only on success | Jerome Glisse | 2008-02-27 | 1 | -2/+3 |
| | |||||
* | s/varible/variable/ | Brian | 2008-01-18 | 1 | -6/+6 |
| | |||||
* | set param type to PROGRAM_CONSTANT when parsing immediates | Brian | 2008-01-18 | 1 | -0/+2 |
| | |||||
* | Be more consistant with paths in #includes. Eventually, eliminate a bunch ↵ | Brian | 2007-07-04 | 1 | -4/+4 |
| | | | | of -I flags. | ||||
* | Add support for GL_ARB_fragment_program_shadow. | Ian Romanick | 2007-06-07 | 1 | -7/+33 |
| | |||||
* | Updates for array texture shadow targets. | Ian Romanick | 2007-06-05 | 1 | -5/+9 |
| | |||||
* | Initial implementation of MESA_texture_array | Ian Romanick | 2007-05-16 | 1 | -2/+20 |
| | | | | | Shadow sampling from texture arrays is still not implemented. Everything else should be there, though. | ||||
* | Merge branch 'origin' into glsl-compiler-1 | Brian | 2007-03-09 | 1 | -0/+1 |
|\ | | | | | | | | | | | Conflicts: src/mesa/main/context.c | ||||
| * | Propogate UsesKill information. | Keith Whitwell | 2007-03-04 | 1 | -0/+1 |
| | | |||||
* | | fix fog breakage | Brian | 2007-02-23 | 1 | -4/+2 |
| | | |||||
* | | replace GLint with gl_state_index | Brian | 2007-02-23 | 1 | -7/+11 |
| | | |||||
* | | updated debug code | Brian | 2007-02-22 | 1 | -210/+18 |
| | | |||||
* | | Undo some STATE_POINT/FOG changes. Max length of state token array is now 5. | Brian | 2007-02-22 | 1 | -4/+2 |
| | | |||||
* | | Merge branch 'origin' into glsl-compiler-1 | Brian | 2007-02-22 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c | ||||
| * | optimize generated vertex programs a bit | Roland Scheidegger | 2007-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Use new internal state to avoid per-vertex normalization of static spot direction vector. Use internal state for simpler per-vertex fog computations (MAD instead of SUB/MUL for linear fog, EX2 instead of POW for EXP/EXP2 fog). Simplify point size calc (2 MADs instead of MOV, MUL, MUL, DP3), and while there fix it up (RSQ instead of RCP). All untested... | ||||
| * | Replace __extension__ with LONGSTRING. | Brian | 2006-12-14 | 1 | -1/+1 |
| | | |||||
* | | more minor changes to STATE_ indexing | Brian | 2007-02-21 | 1 | -3/+9 |
| | | |||||
* | | adjustments to STATE_ token layout/format so token[1] is always the array index | Brian | 2007-02-21 | 1 | -19/+28 |
| | | |||||
* | | silence uninitialized var warning | Brian | 2007-02-01 | 1 | -2/+2 |
| | | |||||
* | | clean up a bunch of program parameter stuff | Brian | 2007-01-09 | 1 | -3/+3 |
| | | |||||
* | | Moved NumTexInstructions, NumTexIndirections, etc. into gl_program since | Brian | 2007-01-09 | 1 | -6/+6 |
| | | | | | | | | they can now apply to vertex programs. | ||||
* | | move TexturesUsed[] into gl_program since vertex programs/shaders can use ↵ | Brian | 2007-01-04 | 1 | -1/+1 |
| | | | | | | | | textures nowadays | ||||
* | | Updated includes. | Brian | 2006-12-14 | 1 | -1/+3 |
|/ | |||||
* | Add a size parameter to _mesa_add_unnamed_constant() and | Brian Paul | 2006-11-15 | 1 | -1/+1 |
| | | | | | _mesa_add_named_constant() to indicate vector size (1, 2, 3 or 4). Always 4 for now... | ||||
* | #define LONGSTRING __extension__ in imports.h and use it to silence gcc | Brian Paul | 2006-11-15 | 1 | -9/+6 |
| | | | | warnings about long string literals. | ||||
* | Change _mesa_init_instruction() to initialize an array of instructions. | Brian Paul | 2006-10-29 | 1 | -3/+3 |
| | |||||
* | Program instructions are initialized before parsing so no need to set | Brian Paul | 2006-10-29 | 1 | -7/+1 |
| | | | | | | Abs, NegateAbs, CondMask and CondSwizzle fields to defaults here. CondMask was getting mis-set. Removing the incorrect assignment improves fragment program speed by 15%. | ||||
* | for VERTEX_ATTRIB_WEIGHT, use break, not return | Brian Paul | 2006-09-06 | 1 | -1/+2 |
| | |||||
* | Hack for Warcraft (bug 8060): allow 'vertex.weight' to be referenced in | Brian Paul | 2006-09-05 | 1 | -0/+10 |
| | | | | | vertex program, even though it's not really supported. Results will be undefined, but Warcraft doesn't actually use the attribute. | ||||
* | fix typo in enable_parser_extensions(): s/point_parameters/vertex_blend/ | Brian Paul | 2006-09-05 | 1 | -1/+1 |
| | |||||
* | Consolidate common case of _mesa_set_program_error() followed by _mesa_error() | Brian Paul | 2006-09-05 | 1 | -248/+172 |
| | | | | | | in new program_error() function. Add const qualifiers in many places. Reorder some debug code to prevent referencing free'd memory. | ||||
* | Check that we don't try to reference more than one target of a texture unit.texmem_0_2_20060912 | Brian Paul | 2006-08-30 | 1 | -1/+17 |
| | | | | | For example, referencing both "texture[0], 2D" and "texture[0], CUBE" in one program is an error. | ||||
* | fix initialization of native resource usage of vertex/fragment programs | Roland Scheidegger | 2006-08-30 | 1 | -0/+10 |
| | |||||
* | use _mesa_alloc_instructions() | Brian Paul | 2006-08-25 | 1 | -2/+1 |
| | |||||
* | update MAX_INSTRUCTIONS limit | Brian Paul | 2006-08-24 | 1 | -1/+4 |
| | |||||
* | use _mesa_realloc_instructions() | Brian Paul | 2006-08-24 | 1 | -6/+6 |
| | |||||
* | Some structure renaming. Prefix vertex/fragment-related structs with | Brian Paul | 2006-07-20 | 1 | -3/+3 |
| | | | | "gl_" to match other structs. | ||||
* | propagate errors from parse_generic_attrib_num in parse_attrib_binding (-> ↵ | Tilman Sauerbeck | 2006-06-28 | 1 | -2/+4 |
| | | | | don't segfault when you're trying to access invalid generic attributes | ||||
* | don't do the check for >= MAX_VERTEX_PROGRAM_ATTRIBS twice, it's already ↵ | Tilman Sauerbeck | 2006-05-29 | 1 | -6/+0 |
| | | | | done in parse_generic_attrib_num() | ||||
* | generic attribute 0 wasn't handled correctly (Jesse Allen) | Brian Paul | 2006-05-29 | 1 | -0/+8 |
| |