aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/prog_statevars.c
Commit message (Collapse)AuthorAgeFilesLines
* mesa: rename src/mesa/shader/ to src/mesa/program/Brian Paul2010-06-101-1187/+0
|
* Replace the _mesa_*printf() wrappers with the plain libc versionsKristian Høgsberg2010-02-191-3/+3
|
* Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc versionsKristian Høgsberg2010-02-191-1/+1
|
* mesa: replace old MEMCPY macro with memcpyBrian Paul2010-02-191-1/+1
|
* Merge branch 'gallium-nopointsizeminmax'Roland Scheidegger2010-02-091-0/+64
|\ | | | | | | | | | | | | Conflicts: src/gallium/drivers/nv10/nv10_state.c src/gallium/drivers/nv20/nv20_state.c src/gallium/drivers/nv50/nv50_program.c
| * gallium: add point size clamp to implementation limits in vertex shaderRoland Scheidegger2010-02-041-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The point size min/max registers (unused by mesa state tracker) were removed since most hardware couldn't do much with them. However, we don't want to have to rely on hw to do point size clamping correctly to implementation dependent limits, hence have to do that in the vertex shader. This should also solve a potential problem with (non-AA) points smaller than 1.0 which according to OGL still have size 1.0. Note that OGL point rendering is odd, in particular point sprites are rasterized differently to points. Some hardware might support those different modes, but in any case the different clamping values used for smooth/multisampled/sprite enabled points might help a bit for hw which rasterizes points the same as point sprites. Also tweak mesa's ff to vertex shader translation so don't have to clamp twice in case of point attenuation.
* | mesa: check/clamp texture/program matrix accessesBrian Paul2010-02-031-2/+6
| | | | | | | | Further testing should reveal if any these assertions are hit...
* | glsl: Remove unnecessary header from prog_statevars.c.Vinson Lee2010-01-161-1/+0
|/
* mesa: print internal.current[i] attribBrian Paul2009-04-211-2/+7
|
* mesa: rename some gl_light fields to be clearerBrian Paul2009-04-031-2/+2
| | | | | EyeDirection -> SpotDirection _NormDirection -> _NormSpotDirection
* mesa: clean up formatting and use 'return' instead of 'break' consistantlyBrian Paul2009-04-031-51/+67
|
* mesa: minor tweaks in append_token() for printing state var stringsBrian Paul2009-04-011-8/+8
|
* mesa: add new internal state var for window sizeBrian Paul2009-03-201-0/+13
| | | | Actually, window width - 1, height - 1
* mesa: add support for ATI_envmap_bumpmapRoland Scheidegger2009-03-121-0/+28
| | | | | | | | add new entrypoints, new texture format, etc translate in texenvprogram.c for drivers using the mesa-generated tex env fragment program also handled in swrast, but not tested (cannot work due to negative texel results not handled correctly)
* mesa: re-org texgen stateBrian Paul2009-02-211-8/+8
| | | | New gl_texgen struct allows quite a bit of code reduction.
* mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-091-1/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Hourihane2008-12-081-2/+3
| |\ | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-281-10/+33
| |\ \
| * \ \ Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-10-101-0/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/gallivm/instructionssoa.cpp src/gallium/auxiliary/gallivm/soabuiltins.c src/gallium/auxiliary/rtasm/rtasm_x86sse.c src/gallium/auxiliary/rtasm/rtasm_x86sse.h src/mesa/main/texenvprogram.c src/mesa/shader/arbprogparse.c src/mesa/shader/prog_statevars.c src/mesa/state_tracker/st_draw.c src/mesa/vbo/vbo_exec_draw.c
| | * | | mesa: add new internal state for tracking current vertex attribsKeith Whitwell2008-10-031-0/+8
| | | | |
| | * | | mesa: add missing state dependencies for various tracked constantsKeith Whitwell2008-10-031-0/+20
| | | | |
| * | | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c
| | * | | mesa: _mesa_program_state_string() returns char *, not const char *.Michal Krol2008-09-051-1/+1
| | | | |
| * | | | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-18/+46
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
| | * | | mesa: Silence compiler warnings on Windows.Michal Krol2008-07-151-4/+4
| | | | |
| | * | | mesa: remove unneeded #includeBrian Paul2008-06-121-1/+0
| | | | |
| | * | | mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca2008-05-311-5/+5
| | | | |
| | * | | mesa: pre-swizzle normal scale state valueKeith Whitwell2008-05-241-1/+5
| | | | |
| | * | | mesa: do object-space lighting in ffvertex_prog.cKeith Whitwell2008-05-231-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | Start pulling over some of the optimizations from the fixed function paths.
| | * | | Fix some bugs in material, depth range stateBrian Paul2008-05-181-4/+4
| | | | | | | | | | | | | | | | | | | | picked from master
| | * | | gallium: fix potential divide by zero in fog computationBrian Paul2008-04-231-3/+5
| | | | | | | | | | | | | | | | | | | | It's legal for Fog.Start == Fog.End and conformance testing does so.
| | * | | mesa: added internal post color matrix scale/bias varsBrian Paul2008-04-161-0/+12
| | | | |
| | * | | more additions for COLOR_MATRIX, etcBrian2007-10-301-0/+12
| | | | |
| | * | | add state vars for color matrix, pixel transfer scale&biasBrian2007-10-301-0/+16
| | | | |
| | * | | disable the NeedFlush assertion for nowBrian2007-10-171-1/+1
| | | | |
| | * | | Assert that there's no outstanding current state that needs to be flushed ↵Brian2007-10-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the vbo in _mesa_load_state_parameters(). Several of the state parameters use current state (such as materials). Need to make sure those values are not stale.
* | | | | mesa: remove GL_SGIX_shadow, GL_SGIX_shadow_ambient and GL_SGIX_depth_textureBrian Paul2009-01-281-5/+5
| |_|_|/ |/| | | | | | | | | | | Everyone should be using the newer/better ARB versions of these extensions.
* | | | mesa: fix default switch case in append_token(), see bug 18734Brian Paul2008-11-281-2/+3
| |_|/ |/| |
* | | mesa: remove an assertion (see bug 18734)Brian Paul2008-11-271-1/+0
| | |
* | | mesa: add some missing switch cases for generating state var stringsBrian Paul2008-11-261-10/+34
| | |
* | | mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca2008-09-231-2/+2
| | |
* | | mesa: remove unneeded #includeBrian Paul2008-09-211-1/+0
| | | | | | | | | | | | (cherry picked from commit 6363960db55769db73021081b60f1028723d9f58)
* | | mesa: move fixed function vertex program builder from tnl to core mesaKeith Whitwell2008-09-211-9/+38
| | | | | | | | | | | | | | | | | | Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
* | | mesa: prefix a bunch of #include lines with "main/".Brian Paul2008-09-181-6/+6
|/ / | | | | | | | | This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
* | mesa: Silence compiler warnings on Windows.Brian Paul2008-07-291-5/+5
| |
* | r300: Implement ARB_shadow_ambient; add STATE_SHADOW_AMBIENTNicolai Haehnle2008-07-271-5/+23
| |
* | additional fog/color matrix changes from gallium-0.1Brian Paul2008-05-181-3/+12
| |
* | add state vars for color matrix, pixel transfer scale&biasBrian Paul2008-05-181-0/+4
| | | | | | | | cherry-picked from gallium-0.1 (068c7bd912283e051a55b2fd5c4568685d10f3ed)
* | mesa: added internal post color matrix scale/bias varsBrian Paul2008-05-181-0/+30
| | | | | | | | cherry-picked from gallium-0.1 (302daeb2ec62c59bd28d0c53cdc0fb07dc9d0f58)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 11:35:03 +0000