summaryrefslogtreecommitdiff
path: root/src/mesa/shader/arbprogparse.c
AgeCommit message (Collapse)Author
2008-10-10Merge commit 'origin/master' into gallium-0.2Keith Whitwell
Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
2008-10-06mesa: set FRAG_BIT_FOGC bit in InputsUsed if FogOption!=GL_NONEBrian Paul
2008-10-02mesa: Fix compiler warnings on Windows.Michal Krol
2008-09-30cell: Fixed usage of MAX_INSTRUCTIONS to use new MAX_PROGRAM_INSTRUCTIONS ↵Jonathan White
instead of old MAX_NV_XXX definitions in order to allow Cell TGSI fragment program generator to work again.
2008-09-21Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
2008-09-21Merge branch 'master' into gallium-0.2Keith Whitwell
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
2008-09-19mesa: Fix compiler error.Michal Krol
2008-09-19mesa: Fix arb parse constantsBrian Paul
2008-09-18mesa: prefix a bunch of #include lines with "main/".Brian Paul
This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
2008-09-05mesa: _mesa_program_state_string() returns char *, not const char *.Michal Krol
2008-07-24mesa: Prefix main includes with dir to avoid conflicts.José Fonseca
Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
2008-07-09mesa: fix state.clip[n].plane parsing bug (bug 16611)Brian Paul
cherry-picked from master
2008-07-09mesa: fix state.clip[n].plane parsing bug (bug 16611)Brian Paul
2008-06-12glsl: implement variable array indexesZack Rusin
2008-06-12glsl: implement variable array indexesZack Rusin
2008-05-16init SamplersUsed bits in _mesa_parse_arb_fragment_programBrian Paul
2008-03-27consolidate some parsing functions that were pretty much identical for ↵Brian
vertex/fragment programs cherry-picked from master
2008-03-27consolidate some parsing functions that were pretty much identical for ↵Brian
vertex/fragment programs
2008-03-27when negating scalar src args, use NEGATE_XYZW, not NEGATE_XBrian
This makes things easier on the back-end when generating GPU code. cherry-picked from gallium-0.1
2008-03-27Set param_var->param_binding_type = PROGRAM_CONSTANTBrian
cherry-picked from gallium-0.1
2008-03-27mesa: misc sync-up with masterBrian
2008-03-27raise GL_INVALID_OPERATION if glProgramString compilation failsBrian
cherry-picked from master
2008-03-27make sure state token values are fully initializedBrian
cherry-picked from master
2008-03-27added program_error2() function for better error reportingBrian
cherry-picked from master
2008-03-27Fix state.texgen parsing error (bug 12313).Brian
Replace *(*inst++) with *(*inst)++ in a few places. Cherry-picked from master.
2008-03-25mesa: append fog instructions after parsing if a fog option is setBrian Paul
Drivers don't have to worry about it then.
2008-03-25mesa: when negating scalar src args, use NEGATE_XYZW, not NEGATE_XBrian Paul
This makes things easier on the back-end when generating GPU code.
2008-03-17only set InputsRead bit if input is really usedMarkus Amsler
2008-03-17only set InputsRead bit if input is really usedMarkus Amsler
2008-03-12mesa: set SamplersUsed bitmask when parsing ARB fragment programsBrian
2008-02-27mesa: set input read only on successJerome Glisse
2008-02-27mesa: set input read only on successMarkus Amsler
2008-02-20raise GL_INVALID_OPERATION if glProgramString compilation failsBrian
2008-01-18s/varible/variable/Brian
2008-01-18set param type to PROGRAM_CONSTANT when parsing immediatesBrian
2008-01-15Fix the compile of disabled DEBUG_PARSING code.Eric Anholt
2007-12-11make sure state token values are fully initializedRoland Scheidegger
2007-09-13added program_error2() function for better error reportingBrian
2007-09-13Fix state.texgen parsing error (bug 12313).Brian
Replace *(*inst++) with *(*inst)++ in a few places.
2007-07-04Be more consistant with paths in #includes. Eventually, eliminate a bunch ↵Brian
of -I flags.
2007-06-07Add support for GL_ARB_fragment_program_shadow.Ian Romanick
2007-06-05Updates for array texture shadow targets.Ian Romanick
2007-05-16Initial implementation of MESA_texture_arrayIan Romanick
Shadow sampling from texture arrays is still not implemented. Everything else should be there, though.
2007-03-09Merge branch 'origin' into glsl-compiler-1Brian
Conflicts: src/mesa/main/context.c
2007-03-04Propogate UsesKill information.Keith Whitwell
2007-02-23fix fog breakageBrian
2007-02-23replace GLint with gl_state_indexBrian
2007-02-22updated debug codeBrian
2007-02-22Undo some STATE_POINT/FOG changes. Max length of state token array is now 5.Brian
2007-02-22Merge branch 'origin' into glsl-compiler-1Brian
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 04:21:16 +0000