summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/program.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * mesa: Prefix main includes with dir to avoid conflicts.José Fonseca2008-07-241-1/+1
| | | | | | | | | | Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
| * mesa: refactor: move _mesa_Bind/Gen/DeleteProgram() to arbprogram.cBrian2008-07-211-18/+0
| | | | | | | | No API-level functions now in program.c.
| * gallium: implement full reference counting for vertex/fragment programsBrian Paul2008-05-071-0/+22
| | | | | | | | | | | | | | | | Use _mesa_reference_vert/fragprog() wherever we assign program pointers. Fixes a memory corruption bug found with glean/api2 test. Another memory bug involving shaders yet to be fixed... Picked from gallium-0.1
| * mesa: added _mesa_insert_instructions()Brian2008-04-071-0/+2
| | | | | | | | Also, use new _mesa_free_instructions() in a few places.
| * make _mesa_combine_programs() params constBrian2007-10-301-1/+2
| |
| * Added _mesa_combine_programs() for concatenating two programs.Brian2007-10-301-0/+8
| |
* | mesa: refactor: move _mesa_Bind/Gen/DeleteProgram() to arbprogram.cBrian Paul2008-07-291-18/+0
| | | | | | | | No API-level functions now in program.c.
* | r500: Add "Not quite SSA" and dead code elimination passNicolai Haehnle2008-07-121-5/+8
| | | | | | | | In addition, this pass fixes non-native swizzles.
* | fixes to _mesa_combine_programs(), from gallium-0.1Brian Paul2008-05-181-1/+2
| |
* | added _mesa_combine_parameter_lists()Brian Paul2008-05-141-0/+8
| | | | | | | | cherry-picked from gallium-0.1
* | mesa: added _mesa_insert_instructions()Brian Paul2008-05-141-0/+2
| | | | | | | | | | | | Also, use new _mesa_free_instructions() in a few places. cherry-picked from gallium-0.1
* | implement full reference counting for vertex/fragment programsBrian2008-05-061-0/+22
| | | | | | | | | | Use _mesa_reference_vert/fragprog() wherever we assign program pointers. Fixes a memory corruption bug found with glean/api2 test.
* | For _mesa_share_state(), update the context's references to the new share ↵Brian2007-08-231-0/+3
|/ | | | group's objects (Shane Blackett)
* move GL_MESA_program_debug funcs to prog_debug.cBrian2007-02-091-15/+2
|
* Remove some moved extern decls.Brian2006-12-141-15/+0
|
* Move many functions into new files.Brian2006-12-141-203/+0
|
* New functions for cloning programs and parameter lists.Brian2006-12-141-1/+13
|
* Checkpoint of work for new GLSL compiler back-end. Lots of assorted changes.Brian2006-12-131-6/+18
|
* add STATE_INTERNAL_DRIVER, etc (Rune Petersen)Brian Paul2006-11-171-1/+2
|
* Add a size parameter to _mesa_add_unnamed_constant() andBrian Paul2006-11-151-2/+3
| | | | | _mesa_add_named_constant() to indicate vector size (1, 2, 3 or 4). Always 4 for now...
* Add new _mesa_lookup_parameter_constant() to search for a GLfloat4 constantBrian Paul2006-11-151-4/+7
| | | | | | in a parameter list. Use it in _mesa_add_named_constant() and _mesa_add_unnamed_constant() to avoid duplication of identical constants.
* Rename _mesa_IsProgram() to _mesa_IsProgramARB() to avoid collision with theBrian Paul2006-11-021-4/+1
| | | | OpenGL 2.0 function of the same name.
* Add a new internal program parameter value STATE_TEXRECT_SCALE whichKeith Whitwell2006-09-201-0/+1
| | | | | | provides 1/width and 1/height of the active texture, useful for implementing ARB_texture_rectangle support on hardware which only supports ARB_npot-style texturing.
* Export _mesa_print_alu_instruction() to allow drivers to roll theirKeith Whitwell2006-09-201-0/+5
| | | | | | own debug code for programs with driver-private opcodes. Remove redundant loop in _mesa_num_inst_src_regs().
* added _mesa_alloc_instructions() utility functionBrian Paul2006-08-251-0/+3
|
* Added _mesa_realloc_instructions() utility function.Brian Paul2006-08-241-0/+4
| | | | Fixed/updated comments for parameter list functions.
* Added _mesa_lookup_program() and _mesa_lookup_bufferobj() functions to avoidBrian Paul2006-08-231-1/+3
| | | | | | a lot of casting elsewhere. Use _mesa_lookup_texture() in tdfx driver, use _mesa_lookup_bufferobj() in r300 driver.
* Some structure renaming. Prefix vertex/fragment-related structs withBrian Paul2006-07-201-21/+21
| | | | "gl_" to match other structs.
* Roll _mesa_free_parameters() into calling function (the only caller).Brian Paul2006-05-241-3/+0
| | | | | | Replace assert(0) with _mesa_warning(). Use new _mesa_align_realloc() function. New comments, clean-ups.
* use GLbitfield for StateFlags, improved commentsBrian Paul2006-05-241-11/+13
|
* track state flags which might invalidate parameter listsKeith Whitwell2005-11-221-0/+3
|
* No longer derive 'ati_fragment_shader' from 'program' class. Only theBrian Paul2005-11-191-5/+0
| | | | | program->Id and program->RefCount fields were used and ATI fragment shaders didn't have too much in common with ARB/NV vertex/fragment programs anyway.
* Move stuff common to vertex/fragment_program into the base class, including:Brian Paul2005-11-121-1/+7
| | | | | | Instructions, InputsRead, OutputsWritten, and Parameters. Also, added debug functions: _mesa_print_instruction(), _mesa_print_program_parameters() and revamp _mesa_print_program().
* consolidate vertex/fragment program printing into _mesa_print_program()Brian Paul2005-11-051-0/+5
|
* don't need MAKE_SWIZZLE() macroBrian Paul2005-11-051-5/+4
|
* Replace parameter_type enum in program.[ch], use register_file enums instead.Brian Paul2005-11-051-15/+6
|
* added a const, clean-upBrian Paul2005-11-031-1/+1
|
* reduce the use of malloc and strdup for parameter listsKeith Whitwell2005-05-101-0/+1
|
* Reduce the size of mesa's internal fragment and vertex programKeith Whitwell2005-04-211-2/+29
| | | | | representations by switching to packed structures for registers and instructions.
* prototype _mesa_init_ati_fragment_shader()Brian Paul2005-01-111-10/+13
|
* fix LoadProgramNV regression when I had fixed the RefCount bugBrian Paul2004-10-021-0/+3
|
* More updates for Doxygen.Brian Paul2004-09-101-2/+10
|
* fix some memory leaks (bug #1002030)Brian Paul2004-08-141-0/+3
|
* Moved from src/mesa/mainMichal Krol2004-03-291-0/+253