summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/arbprogparse.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-10-101-0/+3
|\ | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
| * mesa: set FRAG_BIT_FOGC bit in InputsUsed if FogOption!=GL_NONEBrian Paul2008-10-061-0/+3
| |
* | mesa: Fix compiler warnings on Windows.Michal Krol2008-10-021-1/+1
| |
* | cell: Fixed usage of MAX_INSTRUCTIONS to use new MAX_PROGRAM_INSTRUCTIONS ↵Jonathan White2008-09-301-10/+4
| | | | | | | | instead of old MAX_NV_XXX definitions in order to allow Cell TGSI fragment program generator to work again.
* | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-211-1/+38
|\ \
| * | mesa: Fix compiler error.Michal Krol2008-09-191-1/+3
| | |
| * | mesa: Fix arb parse constantsBrian Paul2008-09-191-1/+36
| | |
* | | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-211-3/+3
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/GLES/egl.h include/GLES/egltypes.h src/egl/main/eglconfig.c src/egl/main/eglconfig.h src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libutil/error.c src/glu/sgi/libutil/glue.c src/glu/sgi/libutil/gluint.h src/glu/sgi/libutil/project.c src/glu/sgi/libutil/registry.c src/glx/x11/Makefile src/glx/x11/glxclient.h src/glx/x11/glxext.c src/mesa/drivers/dri/ffb/ffb_dd.h src/mesa/drivers/dri/ffb/ffb_points.h src/mesa/drivers/dri/gamma/gamma_context.h src/mesa/drivers/dri/gamma/gamma_macros.h src/mesa/drivers/dri/i810/i810context.h src/mesa/drivers/dri/r128/r128_dd.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/tdfx/tdfx_dd.h src/mesa/drivers/x11/xm_buffer.c src/mesa/glapi/glapi.c src/mesa/main/dispatch.c src/mesa/main/state.c src/mesa/main/texstate.c src/mesa/shader/arbprogparse.c src/mesa/shader/arbprogram.c src/mesa/shader/nvfragparse.c src/mesa/shader/nvprogram.c src/mesa/shader/shader_api.c src/mesa/sources src/mesa/swrast/s_aaline.c src/mesa/swrast/s_aaline.h src/mesa/swrast/s_aatriangle.h src/mesa/swrast/s_accum.c src/mesa/swrast/s_alpha.h src/mesa/swrast/s_bitmap.c src/mesa/swrast/s_blend.h src/mesa/swrast/s_context.c src/mesa/swrast/s_copypix.c src/mesa/swrast/s_depth.c src/mesa/swrast/s_depth.h src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_drawpix.h src/mesa/swrast/s_feedback.c src/mesa/swrast/s_feedback.h src/mesa/swrast/s_fog.h src/mesa/swrast/s_lines.h src/mesa/swrast/s_logic.h src/mesa/swrast/s_masking.h src/mesa/swrast/s_points.c src/mesa/swrast/s_points.h src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast/s_span.h src/mesa/swrast/s_stencil.h src/mesa/swrast/s_texcombine.c src/mesa/swrast/s_texcombine.h src/mesa/swrast/s_texfilter.c src/mesa/swrast/s_texfilter.h src/mesa/swrast/s_texstore.c src/mesa/swrast/s_triangle.c src/mesa/swrast/s_triangle.h src/mesa/swrast/s_zoom.h src/mesa/swrast_setup/ss_context.c src/mesa/swrast_setup/ss_triangle.h src/mesa/tnl/t_draw.c src/mesa/tnl/t_vb_light.c src/mesa/tnl/t_vertex_generic.c src/mesa/tnl/t_vertex_sse.c src/mesa/tnl/t_vp_build.h src/mesa/tnl/tnl.h src/mesa/x86/common_x86.c
| * mesa: prefix a bunch of #include lines with "main/".Brian Paul2008-09-181-3/+3
| | | | | | | | | | This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
| * mesa: fix state.clip[n].plane parsing bug (bug 16611)Brian Paul2008-07-091-3/+6
| |
| * glsl: implement variable array indexesZack Rusin2008-06-121-1/+1
| |
| * init SamplersUsed bits in _mesa_parse_arb_fragment_programBrian Paul2008-05-161-1/+4
| |
| * consolidate some parsing functions that were pretty much identical for ↵Brian2008-03-271-152/+71
| | | | | | | | vertex/fragment programs
| * when negating scalar src args, use NEGATE_XYZW, not NEGATE_XBrian2008-03-271-6/+6
| | | | | | | | | | This makes things easier on the back-end when generating GPU code. cherry-picked from gallium-0.1
| * Set param_var->param_binding_type = PROGRAM_CONSTANTBrian2008-03-271-0/+2
| | | | | | | | cherry-picked from gallium-0.1
| * only set InputsRead bit if input is really usedMarkus Amsler2008-03-171-2/+5
| |
| * mesa: set input read only on successMarkus Amsler2008-02-271-2/+2
| |
| * raise GL_INVALID_OPERATION if glProgramString compilation failsBrian2008-02-201-1/+1
| |
| * Fix the compile of disabled DEBUG_PARSING code.Eric Anholt2008-01-151-3/+3
| |
| * make sure state token values are fully initializedRoland Scheidegger2007-12-111-1/+1
| |
| * added program_error2() function for better error reportingBrian2007-09-131-47/+60
| |
| * Fix state.texgen parsing error (bug 12313).Brian2007-09-131-5/+12
| | | | | | | | Replace *(*inst++) with *(*inst)++ in a few places.
* | mesa: _mesa_program_state_string() returns char *, not const char *.Michal Krol2008-09-051-2/+2
| |
* | mesa: Prefix main includes with dir to avoid conflicts.José Fonseca2008-07-241-3/+3
| | | | | | | | | | Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
* | mesa: fix state.clip[n].plane parsing bug (bug 16611)Brian Paul2008-07-091-3/+6
| | | | | | | | cherry-picked from master
* | glsl: implement variable array indexesZack Rusin2008-06-121-1/+1
| |
* | consolidate some parsing functions that were pretty much identical for ↵Brian2008-03-271-152/+71
| | | | | | | | | | | | vertex/fragment programs cherry-picked from master
* | mesa: misc sync-up with masterBrian2008-03-271-3/+3
| |
* | raise GL_INVALID_OPERATION if glProgramString compilation failsBrian2008-03-271-1/+1
| | | | | | | | cherry-picked from master
* | make sure state token values are fully initializedBrian2008-03-271-1/+1
| | | | | | | | cherry-picked from master
* | added program_error2() function for better error reportingBrian2008-03-271-47/+60
| | | | | | | | cherry-picked from master
* | Fix state.texgen parsing error (bug 12313).Brian2008-03-271-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 setBrian Paul2008-03-251-0/+11
| | | | | | | | Drivers don't have to worry about it then.
* | mesa: when negating scalar src args, use NEGATE_XYZW, not NEGATE_XBrian Paul2008-03-251-6/+6
| | | | | | | | This makes things easier on the back-end when generating GPU code.
* | only set InputsRead bit if input is really usedMarkus Amsler2008-03-171-3/+5
| |
* | mesa: set SamplersUsed bitmask when parsing ARB fragment programsBrian2008-03-121-1/+4
| |
* | mesa: set input read only on successJerome Glisse2008-02-271-2/+3
| |
* | s/varible/variable/Brian2008-01-181-6/+6
| |
* | set param type to PROGRAM_CONSTANT when parsing immediatesBrian2008-01-181-0/+2
|/
* Be more consistant with paths in #includes. Eventually, eliminate a bunch ↵Brian2007-07-041-4/+4
| | | | of -I flags.
* Add support for GL_ARB_fragment_program_shadow.Ian Romanick2007-06-071-7/+33
|
* Updates for array texture shadow targets.Ian Romanick2007-06-051-5/+9
|
* Initial implementation of MESA_texture_arrayIan Romanick2007-05-161-2/+20
| | | | | Shadow sampling from texture arrays is still not implemented. Everything else should be there, though.
* Merge branch 'origin' into glsl-compiler-1Brian2007-03-091-0/+1
|\ | | | | | | | | | | Conflicts: src/mesa/main/context.c
| * Propogate UsesKill information.Keith Whitwell2007-03-041-0/+1
| |
* | fix fog breakageBrian2007-02-231-4/+2
| |
* | replace GLint with gl_state_indexBrian2007-02-231-7/+11
| |
* | updated debug codeBrian2007-02-221-210/+18
| |
* | Undo some STATE_POINT/FOG changes. Max length of state token array is now 5.Brian2007-02-221-4/+2
| |
* | Merge branch 'origin' into glsl-compiler-1Brian2007-02-221-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