summaryrefslogtreecommitdiff
path: root/src/mesa/shader/arbprogparse.c
AgeCommit message (Collapse)Author
2006-12-14Replace __extension__ with LONGSTRING.Brian
2006-11-15Add a size parameter to _mesa_add_unnamed_constant() andBrian Paul
_mesa_add_named_constant() to indicate vector size (1, 2, 3 or 4). Always 4 for now...
2006-11-15#define LONGSTRING __extension__ in imports.h and use it to silence gccBrian Paul
warnings about long string literals.
2006-10-29Change _mesa_init_instruction() to initialize an array of instructions.Brian Paul
2006-10-29Program instructions are initialized before parsing so no need to setBrian Paul
Abs, NegateAbs, CondMask and CondSwizzle fields to defaults here. CondMask was getting mis-set. Removing the incorrect assignment improves fragment program speed by 15%.
2006-09-06for VERTEX_ATTRIB_WEIGHT, use break, not returnBrian Paul
2006-09-05Hack for Warcraft (bug 8060): allow 'vertex.weight' to be referenced inBrian Paul
vertex program, even though it's not really supported. Results will be undefined, but Warcraft doesn't actually use the attribute.
2006-09-05fix typo in enable_parser_extensions(): s/point_parameters/vertex_blend/Brian Paul
2006-09-05Consolidate common case of _mesa_set_program_error() followed by _mesa_error()Brian Paul
in new program_error() function. Add const qualifiers in many places. Reorder some debug code to prevent referencing free'd memory.
2006-08-30Check that we don't try to reference more than one target of a texture unit.Brian Paul
For example, referencing both "texture[0], 2D" and "texture[0], CUBE" in one program is an error.
2006-08-30fix initialization of native resource usage of vertex/fragment programsRoland Scheidegger
2006-08-25use _mesa_alloc_instructions()Brian Paul
2006-08-24update MAX_INSTRUCTIONS limitBrian Paul
2006-08-24use _mesa_realloc_instructions()Brian Paul
2006-07-20Some structure renaming. Prefix vertex/fragment-related structs withBrian Paul
"gl_" to match other structs.
2006-06-28propagate errors from parse_generic_attrib_num in parse_attrib_binding (-> ↵Tilman Sauerbeck
don't segfault when you're trying to access invalid generic attributes
2006-05-29don't do the check for >= MAX_VERTEX_PROGRAM_ATTRIBS twice, it's already ↵Tilman Sauerbeck
done in parse_generic_attrib_num()
2006-05-29generic attribute 0 wasn't handled correctly (Jesse Allen)Brian Paul
2006-04-28fix second memory leak (bug 5557)Brian Paul
2006-04-28fix first memory leak (bug 5557)Brian Paul
2006-04-25No longer alias generic vertex attribs with conventional attribs for ↵Brian Paul
GL_ARB_vertex_program.
2006-04-11More GLSL code:Michal Krol
- use macros to access and modify render inputs bit-field; - un-alias generic vertex attributes for ARB vertex calls; - use MAX_VERTEX_PROGRAM_ATTRIBS (NV code) or MAX_VERTEX_ATTRIBS (ARB code) in place of VERT_ATTRIB_MAX; - define VERT_ATTRIB_GENERIC0..15 for un-aliased vertex attributes for ARB_vertex_shader; - fix generic attribute index range check in arbprogparse.c; - interface GLSL varyings between vertex and fragment shader; - use 64-bit optimised bitset (bitset.h) for render inputs;
2006-03-29move NumNativeAlu/TexInstruction assignments (Ewald Snel)Brian Paul
2006-03-22ARL dst idx was undefined.Aapo Tahkola
2005-12-06C++ fixes, mostly casts (Stephane Conversy)Brian Paul
2005-11-20Make Saturate a 2-bit field again, renamed to SaturateMode with threeBrian Paul
possible values: SATURATE_OFF, SATURATE_ZERO_ONE and SATURATE_PLUS_MINUS_ONE.
2005-11-19remove incorrect castBrian Paul
2005-11-19Remove the _mesa_parse_arb_vertex/fragment_program() functions intoBrian Paul
arbprogparse.c and remove arbvertparse.[ch] and arbfragparse.[ch]. Clean up quite a bit of the arb parsing code. Rewrite parser extension code to avoid a mess of string operations every time the parser was used.
2005-11-12Move stuff common to vertex/fragment_program into the base class, including:Brian Paul
Instructions, InputsRead, OutputsWritten, and Parameters. Also, added debug functions: _mesa_print_instruction(), _mesa_print_program_parameters() and revamp _mesa_print_program().
2005-11-08remove unneeded #includesBrian Paul
2005-11-05Unify vertex/fragment program instuctions.Brian Paul
Based on patch by Ian (#4967) but also unify instruction opcodes.
2005-11-03Streamline code generation by using a fixed size instruction buffer inBrian Paul
arb_program struct.
2005-11-03fix typo, minor clean-upsBrian Paul
2005-11-02Rename FRAG_OUTPUT_* tokens to FRAG_RESULT_* to match vertex program conventionBrian Paul
2005-11-01Several fp and vp tweaks:Keith Whitwell
- Renumber VERT_RESULT_* values so that they match the numbers of the corresponding FRAG_ATTRIB_ values. - Add ctx->VertexProgram._Current and FragmentProgram._Current values which point to either the current client-supplied program if enabled, or otherwise to the current mesa-internal program. Thus this program is always the correct one for the current state, providing that the mesa flags to turn on automatic generation are enabled. - Add callbacks to ctx->Driver.BindProgram() in texenvprogram.c and t_vp_build.c so that the driver knows when the generated program changes. This is cleaner than trying to code all the possible _NEW_* flags into the driver, and more precise as well. - Add a UsesKill flag to identify fragment programs with that instruction, as these can require special treatment. - Move the FRAG_OUTPUT values to mtypes.h, near to similar defn's.
2005-11-01Re-org and clean-up of vertx/fragment program limits (instructions,Brian Paul
temporaries, parameters, etc). glGetProgramivARB() now returns all the right things. Updated i915 and r300 code to initialize program native limits and current program's native instruction/temporary/etc counts.
2005-10-30Simplify parse_attrib_binding().Brian Paul
Now only use VERT_ATTRIB_* and FRAG_ATTRIB_* tokens instead of hard-coded numbers. Note: previous check-in did similarly for output register parsing.
2005-10-30Lots of clean-up in arb program parser.Brian Paul
Use new _mesa_init_fp/vp_instruction() function to initialize instructions.
2005-10-29Use MAKE_SWIZZLE4() macro in a few more places.Brian Paul
Clean up the parse_extended_swizzle_mask() and parse_swizzle_mask() functions.
2005-10-29s/lenght/length/Brian Paul
2005-10-29If parsing a program fails, don't change the vertex/fragment program object.Brian Paul
Specifically, don't attach a dummy program. This change also fixes an occasional segfault. Some code clean-ups. Use GLboolean instead of GLuint to return pass/fail.
2005-10-21fix broken SWZ instructionBrian Paul
2005-09-19additional wrapper updates, bug 4468Brian Paul
2005-09-16remove unused ctx varBrian Paul
2005-09-16use mesa import wrappers, bug 4468Brian Paul
2005-09-08be consistent in populating NegateBase fieldKeith Whitwell
2005-07-18Wrap every place that accesses a dispatch table with a macro. A new script-Ian Romanick
generated file, called src/mesa/glapi/dispatch.h, is added. This file contains three macros for each API function. It contains a GET, a SET, and a CALL. Each of the macros take a pointer to the context and a pointer to the dispatch table. In several threads on mesa3d-dev we discussed replacing _glapi_add_entrypoint with a new function called _glapi_add_dispatch. For this discussion, the important difference between the two is that the caller of _glapi_add_dispatch does *not* know what the dispatch offset will be at compile time. Because of this callers need to track the dispatch offset returned by _glapi_add_dispatch. http://marc.theaimsgroup.com/?t=111947074700001&r=1&w=2 The downside is that driver code then has to access the dispatch table two different ways. It accesses it using structure tags (e.g., exec->Begin) for functions with fixed offsets and via a remap table (e.g., exec[ remap->NewExtensionFunction ]) for functions without fixed offsets. Yuck! Using the macros allows both types of functions to be accessed identically. If a driver needs to set a pointer for Begin, it does 'SET_Begin(ctx, exec, my_begin_function)'. If it needs to set a pointer for NewExtensionFunction, it does 'SET_NewExtensionFunction(ctx, exec, my_NewExtensionFunction_function)'. Furthermore, if at some point in the future a static offset is assigned for NewExtensionFunction, only the macros need to change (instead of every single place that accesses a table for that function). This code differs slightly from the originally posted patches in that the CALL, GET, and SET marcos no longer take a context pointer as a parameter. Brian Paul had suggested that the remap table could be stored as a global since it would be set at CreateScreen time and would be constant for all contexts. This change reflects that feedback. http://marc.theaimsgroup.com/?t=112087194700001&r=1&w=2
2005-07-01Set fp->Opcode for OP_TEX_KILL case, fix from Ben Skeggs.Keith Whitwell
2005-07-01comment-out some unused code to silence warningsBrian Paul
2005-05-05Port Mesa to build on a P64 platform (e.g., Win64). P64 platformsKarl Schultz
use 64-bit pointers and 32-bit longs. So, operations like casting pointers to unsigned long and back to pointer won't work. glheader.h now includes files to define uintptr_t, which should instead be used for this sort of operation. It is an integer type that is the same size as a pointer.