Tag 'mesa_6_3_2' created by Brian Paul <brian.p...@tungstengraphics.com> at 1970-01-01 00:00 +0000
Changes since mesa_6_3_1_1: Adam Jackson (1): Convert libGL and DRI drivers to require libdrm. Alan Hourihane (4): remove the drmAddress Add a check which compares the passed in size of the DDX driver private DRI Add Egberts fixes for 64bit architectures Commit missing piece from Egbert's 32/64 bit patches Brian Paul (21): SPARC, DRI interface changes for 6.3.1 added directfbgl.h to tarball s/Disaptch/Dispatch/ (bug 3918) free context structure (bug 1252316) and s/free/_mesa_free/ _mesa_free_framebuffer_data() call frees the renderbuffers, no need to call the Delete methods after free display lists and destroy window upon exit delete display lists upon exit actually free the renderbuffer in xmesa_delete_renderbuffer(), fixes a memory leak fix indentation disable the pointer size assertions (bug 4021) fix static assertion problem for gcc (bug 4022) the PIXEL_MAP_I_TO_I table should be GLfloat, not GLint fix X #includes so they're relative to X11/ directory (bug 4047) added FREXPF() macro (bug 4060) test the standard stencil op modes too (Philipp Klaus Krause) include stdint.h if WIN32 and GNUC (Colin Harrison). Patch forwarded to SGI. updates for 6.3.2 Bump version to 6.3.2 Replace mult/div operators with bitwise operators in texel fetch routines updates for 6.3.2 release, plus other assorted clean-ups update MESA_DEBUG with FP info Dave Airlie (3): Add color tiling support to miniglx for radeon fix miniglx setting virtual size of 832 for 800x600 fix up color tiling in miniglx radeon server code Eric Anholt (2): Since this isn't a bash script, don't use function and instead inline the usage Dike out the linux-specific EGL bits unless it's a linux build. Ian Romanick (31): Remove '#if 0' block that was accidentally left in. glxEnableExtension is a platform-specific function exported by the loader. Use the routines supplied in the __DRIinterfaceMethods structure to create a Add a new config called linux-indirect. This build the GLX libGL just like Remove unused structures and data fields. These had been left in because Fix build problems related to finding Xthreads.h. Convert all instances of XTHREADS to USE_XTHREADS. This fixes one of Fix recent problems with display lists and other parts of the code. In order to create the set of available extensions, we have to know if Fixes bugzillla #812. Fixes bugzilla #1730. Since glcontextmodes.[ch] are no longer used in the DRI drivers, removed the Make the linux-dri-x86 builds work on x86-64 again. mklib now Add rules and target to build src/mesa/x86-64/glapi_x86-64.S. Mesa uses the glVertexAttrib*NV functions to implement fixed-function Remove _glapi_check_multithread from the interface exported by the loader to Make ffb driver build on x86-64. The fix is two fold. First, use the Since Brian's recent commit, "-I/usr/X11R6/include/X11/extensions" is no Don't link with libGL, libEGL, or libEGLdri. On EGL setups libGL isn't Makefile cleanups suggested by George Fufutos (bugzilla #3899). Remove support for the R200_NO_VTXFMT environment variable. Instead use Remove the logic that determines at compile time whether or not HAVE_ALIAS Enable support for EXT_stencil_wrap. The code was already there, but the Put back '-I/usr/X11R6/include'. Make the i810 driver use driGetRendererString like all the other drivers. Add simple regression test for bugzilla #3195. Don't try to update hardware texture fields if there is no hardware texture. Make sure extension entry point offsets are properly initialized. This is Add support for NV_blend_square. This was tested with Enable ARB_texture_compression. The code has been in place for a long time, Fix a realloc problem with indirect vertex arrays. The actual head pointer Jon Smirl (11): Fix a == vs !- typo for glx_enable_extension Commit Ian's fixes from Bug 3877 Remove OUTREG(RADEON_AGP_BASE, info->ringHandle); from DRI driver Leave the AGP_BASE code in. It is pointless to bump the interface New files for radeon egl driver. More EGL prep. No impact on anything outside of EGL Remove EGL from linux-solo makefile Enable EGL support in 'linux-dri' config Fix up some of the sample to work with the r200 EGL driver Add missing egldri.h header file Remove platform specific bits from radeon_egl.c Keith Whitwell (2): Decrement the context's refcounts on part-used storage structs on Check for prim/vertex store non-null before messing with refcounts. Roland Scheidegger (1): In _mesa_TexEnvfv, do not accept values for GL_OPERAND2_ALPHA and GL_OPERAND2_RGB which are only valid with ARB_texture_env_combine but not with EXT_texture_env_combine, when only EXT_texture_env_combine is supported. Vladimir Dergachev (3): Fix card_extensions by following corresponding r200 code. Follow suggestion by Aapo Tahkola to fix giant memory leak from forgetting to free the key when entry was already found (presumably a common case). Allow R300 driver to build on x86-64 and PowerPC. --- Makefile | 10 bin/mklib | 55 configs/default | 4 configs/freebsd-dri | 12 configs/linux-dri | 27 configs/linux-dri-ppc | 2 configs/linux-dri-x86-64 | 2 configs/linux-indirect | 49 configs/linux-solo | 6 docs/RELNOTES-6.3.2 | 37 docs/VERSIONS | 15 docs/contents.html | 3 docs/envvars.html | 4 docs/glu.html | 2 docs/intro.html | 8 docs/license.html | 83 - docs/news.html | 32 docs/relnotes.html | 2 docs/systems.html | 111 - include/GL/glxext.h | 2 include/GL/internal/dri_interface.h | 6 progs/demos/gears.c | 35 progs/egl/Makefile | 10 progs/egl/demo3.c | 25 progs/egl/eglgears.c | 12 progs/egl/eglinfo.c | 2 progs/tests/Makefile | 7 progs/tests/bug_3195.c | 275 ++++ progs/tests/stencilwrap.c | 191 ++ progs/xdemos/glxgears.c | 3 src/egl/Makefile | 2 src/egl/drivers/demo/demo.c | 9 src/egl/drivers/dri/Makefile | 64 src/egl/drivers/dri/egldri.c | 1001 ++++++++++++++ src/egl/drivers/dri/egldri.h | 113 + src/egl/main/egldriver.c | 52 src/egl/main/egldriver.h | 5 src/glx/mini/Makefile | 2 src/glx/mini/driver.h | 2 src/glx/mini/example.miniglx.conf | 4 src/glx/mini/miniglx.c | 206 ++- src/glx/mini/miniglxP.h | 3 src/glx/x11/Makefile | 28 src/glx/x11/XF86dri.c | 2 src/glx/x11/dri_glx.c | 2 src/glx/x11/glx_pbuffer.c | 4 src/glx/x11/glxclient.h | 60 src/glx/x11/glxcmds.c | 8 src/glx/x11/glxext.c | 21 src/glx/x11/glxextensions.c | 4 src/glx/x11/indirect_size.c | 7 src/glx/x11/indirect_va_private.h | 4 src/glx/x11/indirect_vertex_array.c | 5 src/mesa/drivers/dri/Makefile.template | 11 src/mesa/drivers/dri/common/dri_util.c | 11 src/mesa/drivers/dri/common/glcontextmodes.c | 10 src/mesa/drivers/dri/common/glcontextmodes.h | 4 src/mesa/drivers/dri/common/utils.c | 15 src/mesa/drivers/dri/fb/fb_egl.c | 9 src/mesa/drivers/dri/ffb/ffb_lock.h | 10 src/mesa/drivers/dri/ffb/ffb_xmesa.c | 59 src/mesa/drivers/dri/ffb/server/ffb_drishare.h | 5 src/mesa/drivers/dri/gamma/gamma_screen.c | 5 src/mesa/drivers/dri/i810/i810context.c | 26 src/mesa/drivers/dri/i810/i810screen.c | 7 src/mesa/drivers/dri/i810/i810state.c | 24 src/mesa/drivers/dri/i810/i810tex.c | 62 src/mesa/drivers/dri/i810/server/i810_dri.c | 4 src/mesa/drivers/dri/i810/server/i810_dri.h | 1 src/mesa/drivers/dri/i830/i830_screen.c | 8 src/mesa/drivers/dri/i830/server/i830_dri.h | 1 src/mesa/drivers/dri/i915/intel_screen.c | 11 src/mesa/drivers/dri/i915/server/i830_dri.h | 1 src/mesa/drivers/dri/mach64/mach64_screen.c | 22 src/mesa/drivers/dri/mga/mga_xmesa.c | 18 src/mesa/drivers/dri/mga/server/mga_dri.c | 10 src/mesa/drivers/dri/mga/server/mga_dri.h | 18 src/mesa/drivers/dri/r128/r128_screen.c | 20 src/mesa/drivers/dri/r128/server/r128_dri.c | 6 src/mesa/drivers/dri/r200/Makefile | 16 src/mesa/drivers/dri/r200/r200_context.c | 5 src/mesa/drivers/dri/r200/r200_screen.c | 23 src/mesa/drivers/dri/r300/Makefile | 3 src/mesa/drivers/dri/r300/r300_context.c | 62 src/mesa/drivers/dri/r300/radeon_screen.c | 26 src/mesa/drivers/dri/radeon/radeon_screen.c | 20 src/mesa/drivers/dri/radeon/server/radeon.h | 17 src/mesa/drivers/dri/radeon/server/radeon_dri.c | 130 + src/mesa/drivers/dri/radeon/server/radeon_egl.c | 978 ++++++++++++++ src/mesa/drivers/dri/radeon/server/radeon_reg.h | 14 src/mesa/drivers/dri/s3v/s3v_screen.c | 5 src/mesa/drivers/dri/savage/savage_bci.h | 44 src/mesa/drivers/dri/savage/savage_xmesa.c | 6 src/mesa/drivers/dri/savage/savagestate.c | 117 - src/mesa/drivers/dri/sis/server/sis_dri.h | 1 src/mesa/drivers/dri/sis/sis_screen.c | 6 src/mesa/drivers/dri/tdfx/server/tdfx_dri.h | 1 src/mesa/drivers/dri/tdfx/tdfx_screen.c | 7 src/mesa/drivers/dri/trident/trident_context.c | 4 src/mesa/drivers/dri/unichrome/via_screen.c | 21 src/mesa/drivers/windows/gdi/wmesa.c | 13 src/mesa/drivers/x11/xm_api.c | 4 src/mesa/drivers/x11/xm_buffer.c | 6 src/mesa/glapi/Makefile | 4 src/mesa/glapi/dispatch.h | 17 src/mesa/glapi/glX_proto_size.py | 4 src/mesa/glapi/gl_XML.py | 17 src/mesa/glapi/gl_offsets.py | 34 src/mesa/glapi/gl_table.py | 17 src/mesa/glapi/gl_x86-64_asm.py | 6 src/mesa/glapi/gl_x86_asm.py | 6 src/mesa/glapi/glapi.c | 319 ---- src/mesa/glapi/glapi.h | 4 src/mesa/glapi/glapioffsets.h | 416 ++++++ src/mesa/glapi/glthread.c | 2 src/mesa/glapi/glthread.h | 25 src/mesa/main/api_arrayelt.c | 28 src/mesa/main/context.c | 11 src/mesa/main/imports.h | 5 src/mesa/main/mtypes.h | 2 src/mesa/main/pixel.c | 25 src/mesa/main/texenvprogram.c | 1 src/mesa/main/texformat_tmp.h | 53 src/mesa/main/texstate.c | 28 src/mesa/main/version.h | 6 src/mesa/main/vtxfmt.c | 6 src/mesa/main/vtxfmt_tmp.h | 1 src/mesa/math/m_debug_util.h | 6 src/mesa/shader/slang/slang_execute.c | 35 src/mesa/shader/slang/slang_utility.h | 5 src/mesa/tnl/t_save_api.c | 14 src/mesa/tnl/t_vb_arbprogram.c | 8 src/mesa/tnl/t_vp_build.c | 1 src/mesa/x86-64/glapi_x86-64.S | 1636 ++++++++++++------------ src/mesa/x86/glapi_x86.S | 6 135 files changed, 5157 insertions(+), 2138 deletions(-) ---