summaryrefslogtreecommitdiff
path: root/src/mesa/main
AgeCommit message (Collapse)Author
2008-09-12mesa: get fixed-function program generation working againKeith Whitwell
2008-09-11mesa: update PointParameter usageKeith Whitwell
2008-09-11Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
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
2008-09-11Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane
gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
2008-09-11mesa: fix srcRowStride vs srcRowBytes conflictKeith Whitwell
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell
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
2008-09-11Fixes for MingwShane Blackett
2008-09-05mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()Brian Paul
2008-09-05mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()Brian Paul
2008-09-05mesa: replace MALLOC w/ CALLOC to fix valgrind warningBrian Paul
2008-09-04mesa: improved gl_buffer_object reference countingBrian Paul
Use new _mesa_reference_buffer_object() function wherever possible. Fixes buffer object/display list crash reported in ParaView.
2008-09-04mesa: improved gl_buffer_object reference countingBrian Paul
Use new _mesa_reference_buffer_object() function wherever possible. Fixes buffer object/display list crash reported in ParaView.
2008-09-04mesa: Silence compiler warnings on Windows.Michal Krol
2008-09-04mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24Xiang, Haihao
Cherry-picked from master
2008-09-04mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24Xiang, Haihao
2008-09-04mesa: Support for MESA_FORMAT_S8_Z24 textureJakob Bornecrantz
cherry-picked from gallium-0.1
2008-09-02fix BUFFER_DEPTH/BUFFER_ACCUM mix-upBrian Paul
2008-09-02fix BUFFER_DEPTH/BUFFER_ACCUM mix-upBrian Paul
2008-09-02fix no error generated when calling glLight{if}[v] inside begin/end (bug 17408)Roland Scheidegger
2008-09-01mesa: use CALLOC instead of MALLOC to fix valgrind warningBrian Paul
2008-08-28mesa: remove debug codeBrian Paul
2008-08-28mesa: dynamically grow the fixed function vertex program as neededBrian Paul
Don't use a fixed-size array. Saves memory in most cases and avoids potential overflow for long programs.
2008-08-28mesa: bump MAX_INSN to 300Brian Paul
2008-08-26mesa: don't check for GLSL 1.2 to advertise GL 2.1Brian Paul
The GLSL 1.2 features are minor...
2008-08-25mesa: set version string to 7.3-develBrian Paul
2008-08-21Call _ae_update_state when array enable state changesKrzysztof Czurylo
Basically, the application enables client vertex and color arrays, renders something, then disables color array, and renders something else (using vertex array only). Even though the color array is disabled (and the pointer is no longer valid), the driver still tries to read color data from this array (which results in an exception). This is because enabling/disabling array does not trigger _ae_update_state() and the list of enabled arrays is not updated. _ae_update_state() it's called on the first state validation only (as all the "dirty" flags are set at the beginning). Any further change to client arrays' state has no effect.
2008-08-21Flush vertices when updating texObj->GenerateMipmap state.Eric Anholt
Caught by texturing/gen-teximage test in piglit.
2008-08-19mesa: allow for extra per-context initBrian Paul
2008-08-18mesa: rearrange some code in _mesa_BindTexture() to fix error detection bug ↵Brian Paul
17173 Also, move GL_TEXTURE_RECTANGLE init code into separate function.
2008-08-18mesa: rearrange some code in _mesa_BindTexture() to fix error detection bug ↵Brian Paul
17173 Also, move GL_TEXTURE_RECTANGLE init code into separate function.
2008-08-16prep for 7.1 rc4Brian Paul
2008-08-12mesa: texture crop rect stateBrian Paul
2008-08-12mesa: set point stateBrian Paul
2008-08-08mesa: fix some feature testsBrian Paul
2008-08-08mesa: fix some pixel transfer state tests for depth formatsBrian Paul
2008-08-08mesa: fix out-of-bounds memory reads in swizzle_copy()Brian Paul
2008-08-08mesa: fix out-of-bounds memory reads in swizzle_copy()Brian Paul
2008-08-07mesa: fix glBindTexture comment/error stringBrian Paul
2008-08-07mesa: fix glBindTexture error string (bug 17005)Brian Paul
2008-08-06mesa: fix comment about texture targets (bug 17005)Brian Paul
2008-08-06fix some FBO/texture queries (bug 15296)Brian Paul
2008-08-06fix some FBO/texture queries (bug 15296)Brian Paul
2008-08-03added null ptr check (fix bug 16959)Brian Paul
2008-08-03added null ptr check (fix bug 16959)Brian Paul
2008-07-29mesa: fix issues causing warnings on WindowsBrian Paul
2008-07-29mesa: glsl: only try to link shaders defining main()Brian Paul
2008-07-29mesa: remove an error check for NV_v_p that doesn't apply to ARB_v_pBrian Paul
2008-07-29mesa: implement grammar/parsing for precision/invariant syntaxBrian Paul
Plus, fix some issues with pre-defined preprocessor symbols and version checking.
2008-07-29disable GL_ARB_shading_language_120 until 1.20 features are completeBrian Paul
2008-07-25mesa: fix issues causing warnings on WindowsBrian Paul