summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-182-24/+53
|\ | | | | | | | | | | Conflicts: src/mesa/shader/slang/slang_link.c
| * mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵Brian Paul2008-09-171-18/+32
| | | | | | | | point coord
| * mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()Brian Paul2008-09-171-0/+9
| |
| * mesa: fix bug in previous changes to _slang_resolve_attributes()Brian Paul2008-09-171-1/+3
| |
| * mesa: rework GLSL vertex attribute bindingBrian Paul2008-09-163-102/+107
| | | | | | | | | | | | | | Calls to glBindAttribLocation() should not take effect until the next time that glLinkProgram() is called. gl_shader_program::Attributes now just contains user-defined bindings. gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
| * mesa: fix bug in get_uniform_rows_cols(): sometimes returned too many rowsBrian Paul2008-09-161-6/+13
| |
* | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-183-102/+109
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
| * | mesa: fix bug in previous changes to _slang_resolve_attributes()Brian Paul2008-09-171-1/+3
| | |
| * | mesa: rework GLSL vertex attribute bindingBrian Paul2008-09-163-102/+107
| | | | | | | | | | | | | | | | | | | | | Calls to glBindAttribLocation() should not take effect until the next time that glLinkProgram() is called. gl_shader_program::Attributes now just contains user-defined bindings. gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
* | | mesa: regenerate shader filesKeith Whitwell2008-09-121-70/+76
| | |
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-115-7/+9
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-054-6/+6
| | |
| * | mesa: fix minor mem leakBrian Paul2008-09-041-1/+3
| | |
* | | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1127-271/+689
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: glsl: regenerated fileBrian Paul2008-08-221-552/+552
| |
| * mesa: glsl: implement exp() functions in terms of EXP asm instruction, not powBrian Paul2008-08-221-14/+15
| |
| * mesa: glsl: fix a swizzle bug in storage_to_src_reg()Brian Paul2008-08-201-2/+4
| | | | | | | | Need to remove the 'nil' components before swizzling a swizzle
| * mesa: glsl: add check for exceeding max number of constants/uniformsBrian Paul2008-08-201-0/+14
| |
| * mesa: glsl: regenerated fileBrian Paul2008-08-201-70/+76
| |
| * mesa: glsl: better implementation of ftransform()Brian Paul2008-08-201-1/+4
| |
| * mesa: glsl: more writemask error checkingBrian Paul2008-08-191-5/+17
| |
| * mesa: glsl: added some post incr/decr error checksBrian Paul2008-08-191-1/+5
| |
| * mesa: glsl: limit function matching through castingBrian Paul2008-08-191-1/+14
| |
| * mesa: glsl: add usage tracking for uniform varsBrian Paul2008-08-194-3/+35
| | | | | | | | Unused uniforms are no longer included in the active uniforms list.
| * mesa: glsl: put var emit/ref code into separate functionsBrian Paul2008-08-191-53/+81
| |
| * mesa: glsl: fix linking of varying vars which are arraysBrian Paul2008-08-152-42/+44
| |
| * mesa: glsl: fix error detection of writing to read-only variablesBrian Paul2008-08-121-17/+41
| |
| * mesa: glsl: fix commentBrian Paul2008-08-121-1/+1
| |
| * mesa: glsl: enable bzero() in slang_typeinfo_construct()Brian Paul2008-08-121-1/+1
| |
| * mesa: glsl: remove reads of output regs from fragment shaders tooBrian Paul2008-08-121-8/+9
| |
| * mesa: set point stateBrian Paul2008-08-121-0/+4
| |
| * mesa: allow _mesa_remove_output_reads() to work on fragment programsBrian Paul2008-08-121-4/+4
| |
| * mesa: glsl: better error messagesBrian Paul2008-08-121-3/+3
| |
| * mesa: glsl: regenerated filesBrian Paul2008-08-122-430/+422
| |
| * mesa: glsl: additional constructorsBrian Paul2008-08-121-0/+14
| |
| * mesa: glsl: better mod() functionsBrian Paul2008-08-121-21/+15
| |
| * mesa: glsl: regenerated fileBrian Paul2008-08-111-329/+337
| |
| * mesa: glsl: change refract() functions to allow inliningBrian Paul2008-08-111-8/+20
| |
| * mesa: glsl: use SGE instead of SGT in step() functionsBrian Paul2008-08-111-9/+9
| |
| * mesa: glsl: fix bugs in refract() functions, plus minor optimizationBrian Paul2008-08-111-11/+15
| |
| * mesa: glsl: add missing sampler types in sizeof_glsl_type(), bug 17079Brian Paul2008-08-111-2/+13
| |
| * mesa: glsl: regenerated filesBrian Paul2008-08-077-2497/+2522
| |
| * mesa: glsl: finish up support for precision qualifiersBrian Paul2008-08-072-4/+27
| |
| * mesa: Extend GLSL syntax to accept type precision in full type specifiers.Michal Krol2008-08-073-24/+53
| |
| * mesa: Silence compiler warnings on Windows.Michal Krol2008-08-072-3/+3
| |
| * mesa: glsl: regenerated fileBrian Paul2008-08-061-1/+1
| |
| * mesa: glsl: report 'Syntax Error' instead of 'Invalid external declaration'Brian Paul2008-08-061-1/+3
| |
| * mesa: glsl: additional error checkingBrian Paul2008-08-061-0/+12
| |
| * mesa: glsl: fix a number of glUniform issuesBrian Paul2008-08-061-31/+199
| | | | | | | | | | | | | | | | | | Additional error checking. Allow setting elements of uniform arrays. This involves encoding both a uniform location and a parameter offset in the value returned by glGetUniformLocation(). Limit glUniform[if]v()'s count to the size of the uniform array. When setting bool-valued uniforms, convert all float/int values to 0 or 1.
| * mesa: glsl: fix glGetUniform for matrix queriesBrian Paul2008-08-061-50/+79
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 08:32:46 +0000