summaryrefslogtreecommitdiff
path: root/src/mesa/shader
AgeCommit message (Collapse)Author
2008-11-01Merge commit 'origin/master' into gallium-0.2Alan Hourihane
Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-01mesa: silence warningsBrian Paul
2008-11-01mesa: do scope replacement for while/for loops tooBrian Paul
This fixes a function inlining bug involving vars declared inside loop bodies.
2008-11-01mesa: glsl tree print improvementsBrian Paul
2008-11-01mesa: fix assignment / parameter passing of sampler typesBrian Paul
2008-11-01mesa: additional debug flags for glsl debug/disassemblyBrian Paul
2008-10-31mesa: fix some bugs with precision qualifier parsingBrian Paul
2008-10-31mesa: do scope replacement for variable initializers tooBrian Paul
2008-10-31mesa: fix copy/paste error in GLSL error msgBrian Paul
2008-10-13mesa: when emitting an address load instruction, forAlan Hourihane
indexed elements ensure we write to a single register.
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-10Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
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
2008-10-08mesa: in _mesa_combine_programs() take new STATE_CURRENT_ATTRIB color into ↵Brian Paul
account Commit 1680ef869625dc1fe9cf481b180382a34e0738e7 changed the texenv program to get color from a state register instead of a constant-valued vertex attribute. This broke program concatenation (so glDraw/CopyPixels broke). Now check if the second program get's color from a constant register and handle that case appropriately.
2008-10-07mesa: remove old assertionBrian Paul
2008-10-06mesa: set FRAG_BIT_FOGC bit in InputsUsed if FogOption!=GL_NONEBrian Paul
2008-10-03Mesa: short-circuit case when looking up the same program twice in cacheKeith Whitwell
2008-10-03mesa: add new internal state for tracking current vertex attribsKeith Whitwell
2008-10-03mesa: add missing state dependencies for various tracked constantsKeith Whitwell
2008-10-02mesa: Fix compiler warnings on Windows.Michal Krol
2008-10-01mesa: 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-29GLSL: Implement _mesa_get_handleIan Romanick
Implementing _mesa_get_handle in using glGetIntegerv(GL_CURRENT_PROGRAM, ...) allows glGetHandleARB to work.
2008-09-29GLSL: AttachShader returns INVALID_OPERATION for repeated attachIan Romanick
The GL_ARB_shader_objects spec says that glAttachShaderARB is supposed to return GL_INVALID_OPERATION if a shader is attached to a program where it is already attached. _mesa_attach_shader perviously returned without error in this case.
2008-09-29mesa: asst updates for VMSJouk Jansen
2008-09-26mesa: fix assertion in _mesa_reference_program()Brian Paul
2008-09-26mesa: add some bracesBrian Paul
2008-09-26mesa: add some bracesBrian Paul
2008-09-26Merge commit 'origin/master' into HEADKeith Whitwell
Conflicts: src/mesa/vbo/vbo.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_exec_draw.c
2008-09-25mesa: fix function params to match prototypesSam Hocevar
2008-09-25mesa: prevent the slang code generator from aborting when faced with a ↵Sam Hocevar
sampler variable redeclaration.
2008-09-23mesa: glsl: fix glGetUniform for matrix queriesBrian Paul
(cherry picked from commit 7a6eba54d064cadf15f93df2c1748cf5e474ef03)
2008-09-23mesa: glsl: fix a number of glUniform issuesBrian Paul
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.
2008-09-23mesa: glsl: fix error check in get_uniformfv()Brian Paul
(cherry picked from commit 18cd9c229a1fc8da8b7669b8d1d100f6bbeca183)
2008-09-23mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca
2008-09-23mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()Brian Paul
2008-09-23mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵Brian Paul
point coord (cherry picked from commit d7a7b0a10dd355fbeb7a404091a42d4ab558c820)
2008-09-21Merge branch 'master' into gallium-0.2Keith Whitwell
Conflicts: src/mesa/glapi/glapi.h src/mesa/main/api_exec.c src/mesa/main/attrib.c src/mesa/main/clear.c src/mesa/main/context.c src/mesa/main/mfeatures.h src/mesa/main/mipmap.c src/mesa/main/mipmap.h src/mesa/main/readpix.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texformat.c src/mesa/main/texparam.c src/mesa/main/texstate.c src/mesa/vbo/vbo_context.c src/mesa/x86/common_x86_asm.S
2008-09-21mesa: set point stateBrian Paul
(cherry picked from commit af3d9dba562813ffed71691bffd7faf6665c4487)
2008-09-21mesa: fix issues causing warnings on WindowsBrian Paul
2008-09-21mesa: Use appropriate unsigned/signed, float/integer types.José Fonseca
2008-09-21mesa: remove unneeded #includeBrian Paul
(cherry picked from commit 6363960db55769db73021081b60f1028723d9f58)
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-21mesa: move fixed function vertex program builder from tnl to core mesaKeith Whitwell
Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
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-18Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
Conflicts: src/mesa/shader/slang/slang_link.c
2008-09-18Merge commit 'origin/master' into gallium-0.2Keith Whitwell
Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
2008-09-17mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵Brian Paul
point coord
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-11 22:02:24 +0000