summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/arbprogparse.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into asm-shader-rework-1Ian Romanick2009-08-181-7/+0
|\ | | | | | | | | Conflicts: src/mesa/shader/arbprogparse.c
| * Merge branch 'new-frag-attribs'Brian Paul2009-08-121-7/+0
| |\ | | | | | | | | | | | | | | | | | | 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 inputsBrian Paul2009-07-291-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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...
| * | Merge branch 'mesa_7_5_branch'Brian Paul2009-07-301-1/+1
| |\ \
| | * | mesa: move misplaced return statementBrian Paul2009-07-301-1/+1
| | | | | | | | | | | | | | | | Fixes regression from commit 7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878
| * | | Merge branch 'mesa_7_5_branch'Brian Paul2009-07-301-0/+1
| |\| | | | |/ | |/|
| | * mesa: add missing return after catching program errorBrian Paul2009-07-301-0/+1
| | |
* | | ARB prog parser: Delete the old parserIan Romanick2009-08-181-3861/+0
| | |
* | | ARB prog: Revert some changes to debug outputIan Romanick2009-08-181-3/+1
| | |
* | | ARB prog: get frag prog texture info from the right placeIan Romanick2009-07-241-3/+3
| | | | | | | | | | | | This gets basic texturing working. w00t!
* | | ARB_fp/vp: Initial import of new ARB vp/fp assemblerIan Romanick2009-07-201-49/+72
|/ / | | | | | | | | This still needs quite a bit of work, but a bunch of the programs in progs/vp produce correct results.
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-07-031-0/+7
|\| | | | | | | | | | | Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
| * mesa: s/TRUE/GL_TRUEKeith Whitwell2009-07-021-1/+1
| | | | | | | | Fix compile breakage on Linux.
| * mesa: ensure UsesFogFragCoord value is set for non-glsl shadersKeith Whitwell2009-07-021-0/+7
| | | | | | | | | | | | With recent changes to support frontfacing in glsl, it is necessary to ensure that the UsesFogFragCoord value is accurate in all shaders. We were previously not setting it for fixed-function and ARB_fs shaders.
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-06-091-1/+4
|\| | | | | | | | | | | | | | | | | Conflicts: Makefile src/mesa/main/version.h src/mesa/shader/slang/slang_preprocess.c src/mesa/state_tracker/st_cb_bufferobjects.c
| * mesa: better error message for invalid texture unit indexBrian Paul2009-06-081-1/+4
| |
* | mesa: remove MAX_VERTEX_PROGRAM_ATTRIBSBrian Paul2009-05-221-7/+7
| | | | | | | | | | Use MAX_VERTEX_GENERIC_ATTRIBS instead. No need for two #defines for the same quantity.
* | mesa: be smarter about allocating vert/frag program constantsBrian Paul2009-05-061-25/+76
|/ | | | | | | Try to re-use constants/literals more often to make best use of the constant buffer space. See bug 21354.
* mesa: Fix buffer overflow when parsing generic vertex attributes.Brian Paul2009-04-221-3/+9
|
* mesa: merge the prog_src_register::NegateBase and NegateAbs fieldsBrian Paul2009-04-141-4/+4
| | | | | | There's really no need for two negation fields. This came from the GL_NV_fragment_program extension. The new, unified Negate bitfield applies after the absolute value step.
* mesa: fix parameter counting in ARB vertex/fragment program parsingBrian Paul2009-04-031-5/+2
| | | | Duplicated unnamed constants were getting counted more than once.
* mesa: replace >= with > when testing if we've exceeded max local paramsBrian Paul2009-04-031-2/+2
| | | | Now a program that uses 256 locals works as it should.
* mesa: Silence compiler warnings.Michal Krol2009-03-161-0/+1
|
* mesa: gl_register_file enum typedefBrian Paul2009-03-071-11/+11
|
* mesa: remove GL_MESA_program_debug extensionBrian Paul2009-03-071-9/+0
| | | | This was never fully fleshed out and hasn't been used.
* mesa: rename, reorder FRAG_RESULT_x tokensBrian Paul2009-02-281-2/+2
| | | | | | | s/FRAG_RESULT_DEPR/FRAG_RESULT_DEPTH/ s/FRAG_RESULT_COLR/FRAG_RESULT/COLOR/ Remove FRAG_RESULT_COLH (NV half-precision) output since we never used it. Next, we might merge the COLOR and DATA outputs (COLOR0, COLOR1, etc).
* mesa: add TexShadow field to prog_instructionBrian Paul2009-02-201-0/+3
| | | | | If the instruction is TEX/TXP/TXL/etc the TexShadow field will be true if the instruction is a texture fetch with shadow compare.
* mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-091-13/+55
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
| * Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-141-3/+28
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h
| * \ 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: 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: _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
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 21:40:05 +0000