summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* added MAX_PROGRAM_ENV_PARAMSBrian2007-02-222-4/+5
|
* Merge branch 'origin' into glsl-compiler-1Brian2007-02-2232-567/+334
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c
| * fd.o #BZ 9684Zou Nan hai2007-02-121-1/+2
| | | | | | | | | | gcc may cast an overflowed float value to an negative int value on i386, fix it to make sure at least some apps will not crash if it contains wrong normal data.
| * ctx->Point._Size fixRune Peterson2007-02-103-26/+7
| |
| * optimize generated vertex programs a bitRoland Scheidegger2007-02-091-0/+8
| | | | | | | | | | | | | | | | Use new internal state to avoid per-vertex normalization of static spot direction vector. Use internal state for simpler per-vertex fog computations (MAD instead of SUB/MUL for linear fog, EX2 instead of POW for EXP/EXP2 fog). Simplify point size calc (2 MADs instead of MOV, MUL, MUL, DP3), and while there fix it up (RSQ instead of RCP). All untested...
| * fix mem leakPanagiotis Papadakos2007-02-051-0/+3
| |
| * Add _NEW_PROGRAM flag to _MESA_NEW_NEED_EYE_COORDS.Brian2007-02-031-0/+1
| | | | | | | | | | This fixes a segfault in the texgen code that can occur after we've disabled a vertex program.
| * Merge branch 'vbo-0.2'Keith Whitwell2007-02-0211-123/+69
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/texcompress_s3tc.c src/mesa/tnl/t_array_api.c
| | * Don't special-case index, edgeflag.Keith Whitwell2007-01-161-46/+3
| | | | | | | | | | | | | | | | | | Remove display list opcodes for INDEX and EDGEFLAG, handle them through the regular ATTRIB mechanism now that Mesa understands them to just be regular attribs.
| | * Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa ↵Keith Whitwell2007-01-1634-3261/+3586
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vbo-0.2 Conflicts: src/mesa/array_cache/sources src/mesa/drivers/dri/i965/brw_context.c src/mesa/drivers/dri/i965/brw_draw.c src/mesa/drivers/dri/i965/brw_fallback.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/i965/brw_vs_tnl.c src/mesa/drivers/dri/mach64/mach64_context.c src/mesa/main/extensions.c src/mesa/main/getstring.c src/mesa/tnl/sources src/mesa/tnl/t_save_api.c src/mesa/tnl/t_save_playback.c src/mesa/tnl/t_vtx_api.c src/mesa/tnl/t_vtx_exec.c src/mesa/vbo/vbo_attrib.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_api.c src/mesa/vbo/vbo_save_draw.c
| | * | Don't special-case FOG attribute initialization.Keith Whitwell2007-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | Initial fog value was being set to {0,0,0,0}. This results in vector size 4, but isn't necessary. The regular {0,0,0,1} works fine.
| | * | merge current trunk into vbo branchAlan Hourihane2006-11-0221-651/+950
| | | |
| | * | oops, get.c is autogeneratedKeith Whitwell2006-10-302-4/+4
| | | |
| | * | Move edgeflag into the VERT_ATTRIB_SEVEN slot. This means that ourKeith Whitwell2006-10-305-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | NV_vertex_program implementation has slightly incorrect aliasing behaviour. I think this is reasonable given the simplification and the fact that the mainstream ARB_vp continues to have the correct behaviour.
| | * | better handling of current attributes. Trivial dlist and varray tests workKeith Whitwell2006-10-303-17/+4
| | | |
| | * | Fix compiler warningKeith Whitwell2006-10-291-1/+1
| | | |
| * | | _mesa_pack_rgba_span_float: fix for packing data into groupXiang, Haihao2007-01-311-3/+5
| | | |
| * | | bump version to 6.5.3Brian2007-01-301-7/+7
| | | |
| * | | Bug 9628: no entry for GetVertexAttribPointervGeorge Sapountzis2007-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because (in glX_API.xml) GetVertexAttribPointerv is aliased to GetVertexAttribPointervARB which is then aliased to GetVertexAttribPointervNV. Make GetVertexAttribPointerv alias GetVertexAttribPointervNV directly. Patch by Ian Romanick <[email protected]> and regenerate.
| * | | fix typoBrian2007-01-261-1/+1
| | | |
| * | | document, re-indent _mesa_ffsll()Brian2007-01-261-10/+18
| | | |
| * | | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesaBrian2007-01-263-24/+28
| |\ \ \
| | * | | Add _mesa_ffsll() for compatibility on OSes without ffsll(), and use it.Eric Anholt2007-01-262-0/+24
| | | | |
| | * | | Override Const.CheckArrayBounds for Xserver in XMesaCreateContext().George Sapountzis2007-01-261-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leaves one last XFree86Server ifdef in Mesa core. --- Bug 9285: misc glcore, xmesa cleanups ACKed by Ian Romanick.
| | * | | Drop old (pre-AIGLX) GLcore interface.George Sapountzis2007-01-262-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old GLcore interface was replaced in Xorg 7.1 with the addition of AIGLX, it is only used by DDX's which are known not to work with the new DIX glx code. --- Bug 9285: misc glcore, xmesa cleanups ACKed by Ian Romanick.
| * | | | silence C++ warningsBrian2007-01-231-2/+2
| |/ / /
| * | / fixes for C++ warnings/errorsBrian2007-01-235-10/+11
| | |/ | |/|
| * | put back missing Driver.PolygonMode call (bug 9578)Roland Scheidegger2007-01-091-0/+3
| | |
| * | Fix glPush/PopClientAttrib() for VBO state (bug 9445).Brian2007-01-051-2/+15
| | |
| * | Drop mesa wrappers for XFree86.George Sapountzis2006-12-213-208/+45
| | |
| * | Fix copy-and-paste mistake in comment ("scaling" should read "translation").Gary Wong2006-12-151-1/+1
| | | | | | | | | | | | Before _mesa_Translatef().
| * | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesaBrian2006-12-141-1/+2
| |\ \
| | * | _mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.Michel Dänzer2006-12-141-1/+2
| | | | | | | | | | | | | | | | | | | | This fixes texture data corruption with glTexSubimage (and probably glTexImage under some circumstances) with the texstore swizzle path.
| * | | Move all the code for computing ctx->_TriangleCaps into state.c.Brian2006-12-138-166/+129
| |/ / | | | | | | | | | ctx->_TriangleCaps should probably go away altogether someday...
* | | Add _NEW_PROGRAM flag to _MESA_NEW_NEED_EYE_COORDS.Brian2007-02-031-0/+1
| | | | | | | | | | | | | | | This fixes a segfault in the texgen code that can occur after we've disabled a vertex program.
* | | added FRAG_BIT_TEX() and FRAG_BIT_VAR() macrosBrian2007-01-241-0/+4
| | |
* | | fix g++ warnings/errorsBrian2007-01-231-2/+3
| | |
* | | Implement vertex attribute binding.Brian2007-01-091-5/+7
| | | | | | | | | | | | | | | Users can set explicit binding with glBindAttribLocation(), otherwise the linker will allocate generic attribute slots.
* | | Moved NumTexInstructions, NumTexIndirections, etc. into gl_program sinceBrian2007-01-092-15/+15
| | | | | | | | | | | | they can now apply to vertex programs.
* | | added PROGRAM_SAMPLERBrian2007-01-051-1/+2
| | |
* | | move TexturesUsed[] into gl_program since vertex programs/shaders can use ↵Brian2007-01-042-2/+2
| | | | | | | | | | | | textures nowadays
* | | simplify update_texture_state() a bit, compute _EnabledCoordUnits for shadersBrian2007-01-041-16/+25
| | |
* | | update_texture_state() updated for new shadersBrian2007-01-041-29/+10
| | |
* | | Minor clean-ups, reformatting, comment changes.Brian2006-12-201-23/+24
| | |
* | | Fix shader object reference counting and hash table deallocation.Brian2006-12-203-23/+28
| | |
* | | Clean-up and re-org of the main GLSL object types.Brian2006-12-193-18/+19
| | | | | | | | | | | | | | | | | | | | | Use the gl_shader struct as it should be. Renamed gl_linked_program to gl_shader_program. Store both shaders and programs in the same hash table and use the Type field to distinguish them.
* | | Overhaul of GLSL API functions, dispatching, etc.Brian2006-12-195-20/+77
| | |
* | | Massive re-org of GLSL-related API functions.Brian2006-12-192-0/+908
| | | | | | | | | | | | | | | | | | | | | Added new GLSL functions to struct dd_function_table. main/shaders.c calls GLSL functions through the dd_function_table. shader/shader_api.c implements the API functions. Other assorted changes, fixes everywhere else.
* | | Lots of assorted changes for new GLSL compiler backend.Brian2006-12-159-126/+265
| | | | | | | | | | | | New datatypes, constants, variables.
* | | Modify _mesa_strdup() so it handles NULL correctly.Brian2006-12-141-6/+14
|/ /